@bitkyc08/opencodex 2.100.2 → 2.100.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (644) hide show
  1. package/AGENTS_INSTALL.md +23 -1
  2. package/README.md +1 -1
  3. package/bin/ocx.mjs +40 -19
  4. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  5. package/gui/dist/assets/App-DcpyI78f.js +60 -0
  6. package/gui/dist/assets/{Tray-BcaI-VCr.js → Tray-CzjPJprT.js} +1 -1
  7. package/gui/dist/assets/brand-mark-BTIi7e69.js +1 -0
  8. package/gui/dist/assets/index-DJxM-imn.css +2 -0
  9. package/gui/dist/assets/index-DVgU6S3y.js +138 -0
  10. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.js → segment-thumb-features-Bn6Y-g3R.js} +1 -1
  11. package/gui/dist/classic/assets/App-eYJAyNHM.js +59 -0
  12. package/gui/dist/classic/assets/{Tray-DT146AhS.js → Tray-xHMYxLkV.js} +1 -1
  13. package/gui/dist/classic/assets/index-DSaVRW4F.js +138 -0
  14. package/gui/dist/classic/assets/quota-summary-DyzHlkFl.js +1 -0
  15. package/gui/dist/classic/index.html +1 -1
  16. package/gui/dist/index.html +2 -2
  17. package/native/ocx-child/Cargo.toml +9 -0
  18. package/native/ocx-child/src/cli.rs +404 -20
  19. package/native/ocx-child/src/codex_home.rs +99 -14
  20. package/native/ocx-child/src/daemon.rs +2 -1
  21. package/native/ocx-child/src/lib.rs +3 -0
  22. package/native/ocx-child/src/link_ws.rs +2598 -0
  23. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  24. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  25. package/native/ocx-child/src/parity.rs +5 -1
  26. package/native/ocx-child/src/platform.rs +152 -6
  27. package/native/ocx-child/src/relay.rs +150 -19
  28. package/package.json +3 -3
  29. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  30. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  31. package/src/adapters/anthropic/client-identity.ts +3 -1
  32. package/src/adapters/anthropic/passthrough.ts +9 -3
  33. package/src/adapters/anthropic/per-message-effort.ts +296 -0
  34. package/src/adapters/anthropic.ts +34 -14
  35. package/src/adapters/claude-cli/adapter.ts +1 -0
  36. package/src/adapters/client-fingerprint.ts +3 -3
  37. package/src/adapters/cursor/discovery.ts +17 -0
  38. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  39. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  40. package/src/adapters/cursor/protobuf-request.ts +8 -8
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/chat.ts +71 -14
  43. package/src/adapters/google-antigravity-wire.ts +7 -5
  44. package/src/adapters/google-errors.ts +14 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +9 -2
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/qoder/adapter.ts +9 -1
  54. package/src/adapters/zed.ts +7 -2
  55. package/src/advisor/consult.ts +15 -4
  56. package/src/advisor/context.ts +12 -3
  57. package/src/advisor/runtime.ts +35 -5
  58. package/src/advisor/settings.ts +8 -0
  59. package/src/advisor/synthetic-tool.ts +21 -8
  60. package/src/bridge/response-json.ts +11 -2
  61. package/src/bridge/sse.ts +43 -8
  62. package/src/claude/auth-detect.ts +21 -33
  63. package/src/claude/desktop-3p.ts +11 -5
  64. package/src/claude/desktop-gateway-state.ts +2 -0
  65. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  66. package/src/claude/desktop-remote-store.ts +82 -12
  67. package/src/claude/inbound-content-options.ts +31 -16
  68. package/src/claude/outbound.ts +13 -3
  69. package/src/cli/account-api.ts +21 -1
  70. package/src/cli/account-auth.ts +83 -22
  71. package/src/cli/account-extended.ts +33 -2
  72. package/src/cli/account-key-quota.ts +34 -5
  73. package/src/cli/account.ts +4 -2
  74. package/src/cli/advisor.ts +7 -4
  75. package/src/cli/alias.ts +38 -1
  76. package/src/cli/capabilities-access-remote.ts +128 -3
  77. package/src/cli/capabilities-accounts.ts +6 -6
  78. package/src/cli/capabilities-agents-routing.ts +17 -10
  79. package/src/cli/capabilities-base.ts +49 -19
  80. package/src/cli/capabilities-integrations.ts +2 -2
  81. package/src/cli/capabilities-observe-system.ts +2 -2
  82. package/src/cli/capabilities-provider-models.ts +18 -2
  83. package/src/cli/capabilities-route-to.ts +43 -0
  84. package/src/cli/capabilities.ts +2 -0
  85. package/src/cli/capability-contracts.ts +1 -1
  86. package/src/cli/claude-desktop.ts +30 -11
  87. package/src/cli/claude.ts +17 -3
  88. package/src/cli/codex-launcher.ts +3 -1
  89. package/src/cli/codex-shim-autorestore.ts +5 -42
  90. package/src/cli/config-command.ts +14 -1
  91. package/src/cli/config-root-startup.ts +34 -0
  92. package/src/cli/connect.ts +88 -16
  93. package/src/cli/desktop-runtime-guidance.ts +1 -1
  94. package/src/cli/disconnect-runtime.ts +178 -0
  95. package/src/cli/dispatch.ts +61 -13
  96. package/src/cli/export-command.ts +1 -1
  97. package/src/cli/gui-pair-client.ts +6 -3
  98. package/src/cli/gui.ts +10 -5
  99. package/src/cli/help-catalog.ts +11 -0
  100. package/src/cli/help.ts +4 -3
  101. package/src/cli/index.ts +85 -94
  102. package/src/cli/inspect.ts +11 -2
  103. package/src/cli/integrations.ts +26 -1
  104. package/src/cli/link-apply-restart.ts +4 -2
  105. package/src/cli/link-capture.ts +64 -0
  106. package/src/cli/link-child-ops.ts +218 -40
  107. package/src/cli/link-cleanup.ts +8 -5
  108. package/src/cli/link-diagnostics.ts +67 -0
  109. package/src/cli/link-enrollment.ts +158 -12
  110. package/src/cli/link-operations.ts +52 -0
  111. package/src/cli/link-recover.ts +152 -0
  112. package/src/cli/link-routes.ts +90 -0
  113. package/src/cli/link-status-child.ts +44 -1
  114. package/src/cli/link-status-traffic.ts +34 -0
  115. package/src/cli/link.ts +315 -37
  116. package/src/cli/message-command.ts +1 -1
  117. package/src/cli/message-mcp-command.ts +23 -10
  118. package/src/cli/models-runtime.ts +3 -3
  119. package/src/cli/opencode.ts +3 -1
  120. package/src/cli/pi-sync.ts +35 -0
  121. package/src/cli/preflight-exemptions.ts +49 -0
  122. package/src/cli/registry.ts +33 -14
  123. package/src/cli/resolve.ts +23 -8
  124. package/src/cli/restart-failure.ts +15 -2
  125. package/src/cli/root.ts +5 -1
  126. package/src/cli/route-to.ts +172 -0
  127. package/src/cli/runtime-api.ts +9 -8
  128. package/src/cli/status.ts +7 -2
  129. package/src/cli/stop-approval.ts +66 -19
  130. package/src/cli/stop-report.ts +23 -0
  131. package/src/cli/stop-windows-checked.ts +304 -0
  132. package/src/cli/sync-command.ts +70 -15
  133. package/src/cli/sync-fanout.ts +74 -19
  134. package/src/cli/sync-flags.ts +40 -3
  135. package/src/cli/sync-link-status.ts +18 -2
  136. package/src/cli/sync-update-guard.ts +7 -2
  137. package/src/cli/system-command.ts +1 -1
  138. package/src/cli/system-restart-client.ts +10 -3
  139. package/src/cli/system-settings-parity.ts +2 -1
  140. package/src/cli/uninstall-plan.ts +77 -5
  141. package/src/cli/uninstall-stop.ts +152 -0
  142. package/src/cli/v2-input.ts +10 -6
  143. package/src/cli/v2-local-output.ts +3 -2
  144. package/src/cli/v2-runtime.ts +10 -3
  145. package/src/cli/v2.ts +22 -7
  146. package/src/client/connect.ts +376 -35
  147. package/src/client/desktop-refusal.ts +38 -0
  148. package/src/client/lifecycle-lock.ts +29 -4
  149. package/src/client/link-home-features.ts +27 -0
  150. package/src/client/link-home.ts +92 -4
  151. package/src/client/link-ingress.ts +21 -3
  152. package/src/client/link-join.ts +12 -2
  153. package/src/client/link-parity-reporter.ts +60 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel.ts +56 -5
  161. package/src/client/link-websocket-limits.ts +89 -0
  162. package/src/client/link-websocket.ts +586 -0
  163. package/src/client/link-ws-advertisement.ts +100 -0
  164. package/src/client/link-ws-framer.ts +241 -0
  165. package/src/client/link-ws-transport.ts +177 -0
  166. package/src/client/machine-api.ts +13 -2
  167. package/src/client/machine-listener.ts +48 -7
  168. package/src/client/route-intent-apply.ts +293 -0
  169. package/src/client/route-intent-file-originals.ts +97 -0
  170. package/src/client/route-intent-native-originals.ts +201 -0
  171. package/src/client/route-intent-watch.ts +141 -0
  172. package/src/client/runtime-restart.ts +141 -7
  173. package/src/client/runtime.ts +63 -15
  174. package/src/client/state.ts +44 -0
  175. package/src/client/sync-expectation.ts +36 -2
  176. package/src/client/sync-runtime.ts +7 -0
  177. package/src/clients/config-export/alias-selectors.ts +63 -40
  178. package/src/clients/config-export/contracts.ts +2 -0
  179. package/src/clients/config-export/nested-selectors.ts +42 -0
  180. package/src/clients/config-export.ts +22 -3
  181. package/src/codex/account-pause.ts +4 -0
  182. package/src/codex/account-runtime-state.ts +4 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/main-account-probe.ts +3 -1
  187. package/src/codex/auth-api/main-hard-lock-refusal-read.ts +172 -0
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +61 -8
  190. package/src/codex/catalog/build-entries.ts +10 -0
  191. package/src/codex/catalog/derive-entry.ts +7 -0
  192. package/src/codex/catalog/gather-capture.ts +8 -2
  193. package/src/codex/catalog/parsing.ts +7 -3
  194. package/src/codex/catalog/provider-models.ts +54 -15
  195. package/src/codex/catalog/reserve-warn.ts +7 -5
  196. package/src/codex/catalog/reserve.ts +4 -3
  197. package/src/codex/catalog/retained-sync.ts +4 -1
  198. package/src/codex/catalog/routed-defaults.ts +35 -0
  199. package/src/codex/catalog/routed-gather.ts +1 -1
  200. package/src/codex/catalog-auto-refresh.ts +11 -0
  201. package/src/codex/cli-update-job.ts +35 -13
  202. package/src/codex/convergence.ts +4 -2
  203. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  204. package/src/codex/features.ts +2 -2
  205. package/src/codex/history-provider.ts +31 -0
  206. package/src/codex/inject/multi-agent-v2.ts +9 -3
  207. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  208. package/src/codex/inject/plan.ts +20 -2
  209. package/src/codex/inject.ts +2 -0
  210. package/src/codex/journal-config-restore.ts +217 -0
  211. package/src/codex/journal.ts +75 -6
  212. package/src/codex/loopback-target.ts +22 -8
  213. package/src/codex/main-account.ts +109 -57
  214. package/src/codex/native-main-auth-file.ts +118 -0
  215. package/src/codex/native-main-credentials.ts +270 -0
  216. package/src/codex/native-main-owner.ts +3 -0
  217. package/src/codex/native-main-refresh-mode.ts +14 -1
  218. package/src/codex/native-profile-manager.ts +4 -3
  219. package/src/codex/native-profile-store.ts +3 -61
  220. package/src/codex/orca-import.ts +10 -1
  221. package/src/codex/quota-history.ts +13 -0
  222. package/src/codex/quota-window-conflict.ts +103 -0
  223. package/src/codex/quota.ts +86 -15
  224. package/src/codex/subagent-model-fallback.ts +3 -1
  225. package/src/codex/websocket-activity.ts +171 -16
  226. package/src/codex/websocket-registry.ts +11 -4
  227. package/src/combos/cooldown-store.ts +25 -5
  228. package/src/combos/failover.ts +342 -3
  229. package/src/combos/index.ts +5 -0
  230. package/src/combos/resolve.ts +115 -19
  231. package/src/config/dashboard-trusted-proxy.ts +83 -0
  232. package/src/config/diagnostics.ts +31 -0
  233. package/src/config/feature-flags.ts +9 -0
  234. package/src/config/live-reconcile.ts +16 -4
  235. package/src/config/load-degrade.ts +14 -1
  236. package/src/config/multi-agent-surface.ts +28 -5
  237. package/src/config/pending-teardown.ts +60 -3
  238. package/src/config/persisted-mutation.ts +2 -2
  239. package/src/config/persisted-projections.ts +18 -0
  240. package/src/config/process-state.ts +176 -4
  241. package/src/config/provider-validation.ts +4 -4
  242. package/src/config/reserve-capability.ts +96 -0
  243. package/src/config/schema/config-schema.ts +12 -0
  244. package/src/config/schema/leaf-validators.ts +11 -2
  245. package/src/config/schema/routed-catalog-defaults.ts +49 -0
  246. package/src/config/windows-process-command-line.ts +107 -0
  247. package/src/config.ts +7 -7
  248. package/src/desktop-update/acquire.ts +202 -0
  249. package/src/desktop-update/cli.ts +168 -0
  250. package/src/desktop-update/drain.ts +40 -0
  251. package/src/desktop-update/headless.ts +285 -0
  252. package/src/desktop-update/image.ts +85 -0
  253. package/src/desktop-update/install.ts +53 -0
  254. package/src/desktop-update/msi.ts +72 -0
  255. package/src/desktop-update/release.ts +128 -0
  256. package/src/desktop-update/runtime.ts +155 -0
  257. package/src/desktop-update/staging.ts +118 -0
  258. package/src/desktop-update/trust.ts +45 -0
  259. package/src/generated/compatibility-version.json +1114 -442
  260. package/src/generated/model-metadata.ts +1 -1
  261. package/src/images/fulfill-video.ts +3 -3
  262. package/src/images/loop.ts +9 -2
  263. package/src/images/plan.ts +147 -11
  264. package/src/images/types.ts +13 -4
  265. package/src/images/xai-video-client.ts +72 -10
  266. package/src/integrations/model-name-guard.ts +25 -0
  267. package/src/integrations/route-intent-catalog.ts +26 -0
  268. package/src/integrations/route-intent-connected.ts +262 -0
  269. package/src/integrations/route-intent-contract.ts +55 -0
  270. package/src/integrations/route-intent-disconnect.ts +109 -0
  271. package/src/integrations/route-intent-initial.ts +64 -0
  272. package/src/integrations/route-intent-state.ts +117 -0
  273. package/src/integrations/route-intent-tick.ts +65 -0
  274. package/src/integrations/route-intent.ts +212 -0
  275. package/src/integrations/writer.ts +44 -11
  276. package/src/lib/client-retry-after.ts +29 -0
  277. package/src/lib/config-ownership.ts +13 -0
  278. package/src/lib/desktop-gui-origin.ts +28 -0
  279. package/src/lib/errors.ts +1 -1
  280. package/src/lib/gcp-adc.ts +48 -4
  281. package/src/lib/gui-pair-capability.ts +2 -1
  282. package/src/lib/messages-error-body.ts +4 -1
  283. package/src/lib/offline-resend.ts +150 -0
  284. package/src/lib/outbound-credential-registry.ts +362 -4
  285. package/src/lib/paced-stream.ts +34 -0
  286. package/src/lib/passive-key-fetch-proof.ts +30 -0
  287. package/src/lib/passive-read.ts +5 -0
  288. package/src/lib/process-control.ts +76 -12
  289. package/src/lib/provider-outbound.ts +17 -6
  290. package/src/lib/redact.ts +84 -8
  291. package/src/lib/request-failure-model.ts +2 -0
  292. package/src/lib/response-body-inactivity.ts +23 -1
  293. package/src/lib/state-store-registrations.ts +11 -0
  294. package/src/lib/state-store-sweeper.ts +4 -0
  295. package/src/lib/supervisor-markers.ts +18 -0
  296. package/src/lib/terminal-safe-text.ts +58 -0
  297. package/src/lib/translator-budget.ts +3 -2
  298. package/src/lib/upstream-retry.ts +52 -9
  299. package/src/link/alias-lock.ts +119 -0
  300. package/src/link/child-activity.ts +28 -2
  301. package/src/link/child-binary-cache-fill.d.mts +50 -0
  302. package/src/link/child-binary-cache-fill.mjs +494 -0
  303. package/src/link/child-binary-cache-start.ts +73 -0
  304. package/src/link/child-binary-source.ts +12 -5
  305. package/src/link/child-gated-ocx.ts +29 -11
  306. package/src/link/child-observations.ts +2 -1
  307. package/src/link/child-observe.ts +2 -2
  308. package/src/link/child-ops-engine.ts +159 -91
  309. package/src/link/child-ops-host.ts +138 -0
  310. package/src/link/child-ops-runners.ts +319 -0
  311. package/src/link/child-ops-scheduler.ts +207 -0
  312. package/src/link/child-ops-types.ts +89 -0
  313. package/src/link/child-parity.ts +23 -4
  314. package/src/link/child-policy.ts +93 -0
  315. package/src/link/child-update-contract.ts +12 -3
  316. package/src/link/codex-settings.ts +1 -1
  317. package/src/link/compatibility.ts +18 -1
  318. package/src/link/diagnostics-read.ts +163 -0
  319. package/src/link/diagnostics.ts +20 -7
  320. package/src/link/explicit-route.ts +209 -0
  321. package/src/link/link-recover.ts +113 -0
  322. package/src/link/management-routes.ts +3 -1
  323. package/src/link/operation-recovery-slot.ts +44 -0
  324. package/src/link/operations-journal.ts +408 -0
  325. package/src/link/peer-report.ts +1 -1
  326. package/src/link/relay-auth.ts +14 -0
  327. package/src/link/remote-plant.ts +152 -14
  328. package/src/link/remote-platform.ts +21 -10
  329. package/src/link/remote-probe.ts +11 -3
  330. package/src/link/remote-windows.ts +124 -36
  331. package/src/link/request-compression.ts +30 -0
  332. package/src/link/residual-recovery.ts +66 -0
  333. package/src/link/retirement.ts +128 -0
  334. package/src/link/route-intent-watch.ts +41 -0
  335. package/src/link/route-intent.ts +209 -0
  336. package/src/link/route-proof.ts +82 -0
  337. package/src/link/route-rounds.ts +579 -0
  338. package/src/link/route-select.ts +95 -0
  339. package/src/link/route-trust.ts +96 -0
  340. package/src/link/ssh-argv.ts +172 -24
  341. package/src/link/ssh-capture-redact.ts +253 -0
  342. package/src/link/ssh-capture.ts +497 -0
  343. package/src/link/ssh-runner.ts +141 -14
  344. package/src/link/status-projection.ts +87 -0
  345. package/src/link/store.ts +54 -1
  346. package/src/link/supervisor.ts +543 -55
  347. package/src/link/sync-fanout-classify.ts +16 -0
  348. package/src/link/sync-then-restart.ts +65 -0
  349. package/src/link/tombstones.ts +209 -0
  350. package/src/link/traffic.ts +178 -0
  351. package/src/link/ws-activity-holds.ts +474 -0
  352. package/src/local-credentials/publication-fence.ts +20 -1
  353. package/src/messaging/budget.ts +23 -5
  354. package/src/messaging/mcp-queue-rpc.ts +1 -1
  355. package/src/messaging/mcp-queue-server.ts +16 -1
  356. package/src/messaging/mcp-resume-tools.ts +25 -0
  357. package/src/messaging/remote-enrollment.ts +3 -3
  358. package/src/messaging/remote-tunnels.ts +2 -2
  359. package/src/messaging/resume-permissions.ts +27 -0
  360. package/src/messaging/rpc.ts +50 -6
  361. package/src/oauth/anthropic-continuity.ts +23 -7
  362. package/src/oauth/anthropic-routing.ts +5 -2
  363. package/src/oauth/anthropic.ts +22 -2
  364. package/src/oauth/antigravity-risk.ts +126 -0
  365. package/src/oauth/claude-keychain-read.ts +78 -68
  366. package/src/oauth/generic-account-failover.ts +89 -18
  367. package/src/oauth/generic-session-affinity.ts +10 -3
  368. package/src/oauth/index.ts +24 -6
  369. package/src/oauth/local-token-detect.ts +8 -29
  370. package/src/oauth/login-cli-errors.ts +5 -1
  371. package/src/oauth/login-cli.ts +68 -19
  372. package/src/oauth/login-flow-state.ts +26 -3
  373. package/src/oauth/meta-muse.ts +1 -1
  374. package/src/oauth/pool-kernel.ts +3 -3
  375. package/src/oauth/store.ts +7 -0
  376. package/src/oauth/xai.ts +248 -14
  377. package/src/protocols/contract.ts +4 -0
  378. package/src/protocols/encoders/messages.ts +1 -0
  379. package/src/providers/alias-template.ts +48 -0
  380. package/src/providers/anthropic-billing-ownership.ts +2 -0
  381. package/src/providers/anthropic-billing-refusal.ts +27 -3
  382. package/src/providers/anthropic-output-caps.ts +46 -0
  383. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  384. package/src/providers/antigravity-effort-families.ts +11 -3
  385. package/src/providers/antigravity-models.ts +32 -9
  386. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  387. package/src/providers/api-key-pause.ts +3 -0
  388. package/src/providers/api-key-resolve.ts +49 -7
  389. package/src/providers/api-key-response-ownership.ts +2 -0
  390. package/src/providers/api-key-selection.ts +51 -9
  391. package/src/providers/api-keys.ts +6 -2
  392. package/src/providers/cache-affinity-identity.ts +73 -0
  393. package/src/providers/cache-affinity.ts +256 -0
  394. package/src/providers/default-aliases.ts +98 -20
  395. package/src/providers/google-vertex-model-discovery.ts +515 -0
  396. package/src/providers/key-failover.ts +123 -8
  397. package/src/providers/key-store.ts +3 -3
  398. package/src/providers/kiro-models.ts +3 -5
  399. package/src/providers/label.ts +31 -5
  400. package/src/providers/mistral-transport.ts +17 -4
  401. package/src/providers/model-rename-fields.ts +5 -0
  402. package/src/providers/muse-key-quota.ts +14 -6
  403. package/src/providers/new-model-policy-runtime.ts +17 -4
  404. package/src/providers/new-model-policy.ts +30 -4
  405. package/src/providers/passive-key-observation.ts +252 -0
  406. package/src/providers/quota/account-cache.ts +2 -1
  407. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  408. package/src/providers/quota/passive-key-limits.ts +272 -0
  409. package/src/providers/quota/passive-wire-model.ts +126 -0
  410. package/src/providers/quota/report-cache.ts +61 -2
  411. package/src/providers/quota/workbuddy.ts +6 -2
  412. package/src/providers/quota-key-accounts.ts +11 -6
  413. package/src/providers/quota-types.ts +18 -0
  414. package/src/providers/quota.ts +11 -12
  415. package/src/providers/registry/entries-core.ts +34 -16
  416. package/src/providers/registry/entries-extended.ts +32 -0
  417. package/src/providers/registry/model-seeds.ts +35 -0
  418. package/src/providers/resolved-model-policy.ts +7 -0
  419. package/src/providers/routed-config.ts +8 -3
  420. package/src/providers/workbuddy-credit-balance.ts +125 -16
  421. package/src/providers/xai-transport.ts +3 -0
  422. package/src/remote/features.ts +17 -0
  423. package/src/responses/anthropic-progress.ts +10 -4
  424. package/src/responses/citation-markers.ts +231 -0
  425. package/src/responses/effort-history.ts +732 -0
  426. package/src/responses/spill-store.ts +5 -1
  427. package/src/responses/state/replay-input.ts +50 -0
  428. package/src/responses/state/replay-owner.ts +24 -0
  429. package/src/responses/state/snapshot-codec.ts +9 -0
  430. package/src/responses/state/spill-queue.ts +1 -0
  431. package/src/responses/state.ts +42 -60
  432. package/src/router.ts +2 -2
  433. package/src/routing/history/integrity.ts +41 -4
  434. package/src/routing/home-route-capture.ts +123 -0
  435. package/src/routing/home-route-intent.ts +200 -0
  436. package/src/routing/route-intent-state.ts +178 -0
  437. package/src/routing/route-to-live-settings.ts +35 -0
  438. package/src/routing/route-to-local.ts +145 -0
  439. package/src/routing/route-to-status.ts +94 -0
  440. package/src/routing/route-to-sync-child.ts +32 -0
  441. package/src/server/adapter-resolve.ts +21 -1
  442. package/src/server/admitted-http-turn.ts +3 -0
  443. package/src/server/auth-cors.ts +111 -3
  444. package/src/server/bare-upstream-error.ts +220 -0
  445. package/src/server/chat-native.ts +14 -5
  446. package/src/server/claude-messages.ts +6 -4
  447. package/src/server/codex-model-list.ts +4 -2
  448. package/src/server/configured-credentials.ts +37 -5
  449. package/src/server/direct-local-http.ts +26 -3
  450. package/src/server/gui-desktop-authorization.ts +36 -0
  451. package/src/server/gui-pair-delivery.ts +6 -3
  452. package/src/server/gui-session.ts +10 -1
  453. package/src/server/inbound-body-admission.ts +17 -4
  454. package/src/server/index/link-listener.ts +196 -12
  455. package/src/server/index/link-management.ts +15 -1
  456. package/src/server/index/link-relay-sessions.ts +87 -8
  457. package/src/server/index/link-websocket-limits.ts +136 -0
  458. package/src/server/index/link-websocket.ts +692 -0
  459. package/src/server/index/optional-listeners.ts +97 -7
  460. package/src/server/index/route-intent-watch.ts +47 -0
  461. package/src/server/index/serve-contract.ts +86 -0
  462. package/src/server/index/serve-options.ts +36 -86
  463. package/src/server/index/startup-warnings.ts +8 -2
  464. package/src/server/index/websocket-handler.ts +26 -4
  465. package/src/server/index.ts +15 -4
  466. package/src/server/inference/client-encoder-delivery.ts +2 -0
  467. package/src/server/inspection-tee.ts +39 -2
  468. package/src/server/lifecycle.ts +2 -0
  469. package/src/server/link-turn.ts +149 -0
  470. package/src/server/management/advisor-routes.ts +10 -2
  471. package/src/server/management/agent-settings-routes.ts +50 -16
  472. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  473. package/src/server/management/config-routes.ts +39 -3
  474. package/src/server/management/context.ts +9 -2
  475. package/src/server/management/desktop-authorization.ts +41 -0
  476. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  477. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  478. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  479. package/src/server/management/home-integration-decision.ts +89 -0
  480. package/src/server/management/integration-routes.ts +208 -81
  481. package/src/server/management/link-child-ops-routes.ts +145 -43
  482. package/src/server/management/link-child-preflight.ts +31 -0
  483. package/src/server/management/link-diagnostics-route.ts +29 -0
  484. package/src/server/management/link-enrollment.ts +199 -47
  485. package/src/server/management/link-operation.ts +609 -0
  486. package/src/server/management/link-recover-route.ts +103 -0
  487. package/src/server/management/link-route-edit.ts +192 -0
  488. package/src/server/management/link-route-request.ts +62 -0
  489. package/src/server/management/link-route-state.ts +83 -7
  490. package/src/server/management/link-routes.ts +553 -51
  491. package/src/server/management/link-traffic-status.ts +13 -0
  492. package/src/server/management/model-routes.ts +122 -36
  493. package/src/server/management/model-rows.ts +2 -1
  494. package/src/server/management/native-integration-routes.ts +176 -70
  495. package/src/server/management/oauth-account-routes.ts +58 -18
  496. package/src/server/management/protocol-routes.ts +7 -0
  497. package/src/server/management/provider-completion-test.ts +4 -4
  498. package/src/server/management/provider-overwrite-carry.ts +14 -0
  499. package/src/server/management/provider-routes.ts +68 -65
  500. package/src/server/management/provider-routing-quota.ts +45 -0
  501. package/src/server/management/route-registry.ts +22 -3
  502. package/src/server/management/route-to-routes.ts +257 -0
  503. package/src/server/management/static-catalog-probe.ts +33 -0
  504. package/src/server/management/system-restart.ts +4 -2
  505. package/src/server/management/usage-aggregate-cache.ts +101 -66
  506. package/src/server/management-api.ts +17 -3
  507. package/src/server/management-auth.ts +13 -1
  508. package/src/server/messages-native-preflight.ts +27 -4
  509. package/src/server/messages-native.ts +17 -5
  510. package/src/server/persistent-gui-session.ts +6 -3
  511. package/src/server/proxy-liveness.ts +87 -15
  512. package/src/server/relay-eager.ts +36 -12
  513. package/src/server/relay.ts +189 -117
  514. package/src/server/request-body-facts.ts +48 -0
  515. package/src/server/request-decompress.ts +65 -2
  516. package/src/server/request-log-account-rotation.ts +6 -0
  517. package/src/server/request-log-attempt-usage.ts +69 -0
  518. package/src/server/request-log-cache-affinity.ts +60 -0
  519. package/src/server/request-log-conversation.ts +45 -2
  520. package/src/server/request-log-terminal-status.ts +210 -24
  521. package/src/server/request-log.ts +76 -80
  522. package/src/server/reserve-capability-startup.ts +32 -0
  523. package/src/server/responses/adapter-continuation.ts +2 -1
  524. package/src/server/responses/adapter-delivery.ts +4 -0
  525. package/src/server/responses/adapter-dispatch.ts +36 -17
  526. package/src/server/responses/advisor-plan-slot.ts +33 -1
  527. package/src/server/responses/advisor-question.ts +21 -0
  528. package/src/server/responses/advisor-slot.ts +10 -3
  529. package/src/server/responses/antigravity-fault-rotation.ts +24 -0
  530. package/src/server/responses/antigravity-validation-refusal.ts +43 -6
  531. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  532. package/src/server/responses/buffered-sse-json.ts +9 -3
  533. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  534. package/src/server/responses/codex-tool-catalog.ts +156 -0
  535. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  536. package/src/server/responses/combo-selection-keepalive.ts +254 -0
  537. package/src/server/responses/combo-stream-preflight.ts +557 -54
  538. package/src/server/responses/compact.ts +32 -8
  539. package/src/server/responses/core-codex-account.ts +17 -3
  540. package/src/server/responses/core-combo-failure.ts +8 -0
  541. package/src/server/responses/core-combo.ts +55 -12
  542. package/src/server/responses/core-errors.ts +13 -7
  543. package/src/server/responses/core-lifetime.ts +3 -2
  544. package/src/server/responses/core-normalize.ts +3 -1
  545. package/src/server/responses/core-options.ts +14 -0
  546. package/src/server/responses/core.ts +23 -0
  547. package/src/server/responses/estimated-usage.ts +115 -0
  548. package/src/server/responses/fetch-helpers.ts +15 -10
  549. package/src/server/responses/jev-model-invoke.ts +7 -2
  550. package/src/server/responses/native-replay-guard.ts +57 -0
  551. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  552. package/src/server/responses/outbound-request-body.ts +29 -0
  553. package/src/server/responses/passthrough-completion.ts +109 -9
  554. package/src/server/responses/passthrough-delivery.ts +77 -18
  555. package/src/server/responses/passthrough-dispatch.ts +77 -73
  556. package/src/server/responses/policy-fallback.ts +13 -1
  557. package/src/server/responses/request-prepare.ts +59 -11
  558. package/src/server/responses/request-transport.ts +10 -3
  559. package/src/server/responses/reset-replay.ts +46 -2
  560. package/src/server/responses/run-turn-execution.ts +2 -0
  561. package/src/server/responses/sidecar-execution.ts +19 -0
  562. package/src/server/responses/terminal-error-redaction.ts +222 -25
  563. package/src/server/responses/ws-upstream.ts +2 -2
  564. package/src/server/sse-payload-rewrite.ts +3 -2
  565. package/src/server/stop-service-route.ts +85 -0
  566. package/src/server/system-env-shell.ts +12 -1
  567. package/src/server/system-env.ts +5 -3
  568. package/src/server/windows-tcp-drop.ts +21 -4
  569. package/src/server/workflow-refusal.ts +8 -0
  570. package/src/server/ws-bridge.ts +191 -12
  571. package/src/service/cli-windows-stop.ts +189 -0
  572. package/src/service/cli.ts +41 -12
  573. package/src/service/desktop-supervision.d.mts +2 -0
  574. package/src/service/desktop-supervision.mjs +5 -0
  575. package/src/service/disconnected-client-restart.ts +60 -0
  576. package/src/service/guarded-manager-target.ts +18 -1
  577. package/src/service/health.ts +99 -6
  578. package/src/service/launchd.ts +84 -31
  579. package/src/service/orchestration.ts +418 -91
  580. package/src/service/repair.ts +223 -6
  581. package/src/service/restart-proxy-stop.ts +79 -0
  582. package/src/service/service-child-ownership.ts +6 -2
  583. package/src/service/windows-checked-stop-live.ts +467 -0
  584. package/src/service/windows-checked-stop.ts +435 -0
  585. package/src/service/windows-command-line-token.ts +23 -0
  586. package/src/service/windows-guarded-manager.ts +77 -34
  587. package/src/service/windows-ops.ts +38 -56
  588. package/src/service/windows-process-evidence.ts +292 -0
  589. package/src/service/windows-process-native.ts +262 -0
  590. package/src/service/windows-service-stop.ts +321 -0
  591. package/src/service/windows-stop-binding.ts +187 -0
  592. package/src/service/windows-stop-budget.ts +123 -0
  593. package/src/service/windows-stop-confirm.ts +158 -0
  594. package/src/service/windows-stop-deadline.ts +56 -0
  595. package/src/service.ts +2 -2
  596. package/src/stall-timeout.ts +11 -0
  597. package/src/types/config.ts +57 -110
  598. package/src/types/link.ts +20 -0
  599. package/src/types/multi-agent.ts +13 -0
  600. package/src/types/provider.ts +60 -2
  601. package/src/types/request.ts +23 -0
  602. package/src/types/routed-catalog-defaults.ts +17 -0
  603. package/src/types/routing-profile.ts +90 -0
  604. package/src/types.ts +4 -0
  605. package/src/update/guarded-runtime-ops.ts +5 -7
  606. package/src/update/index.ts +26 -11
  607. package/src/update/install-detection.mjs +3 -1
  608. package/src/update/job-pinned-start.ts +2 -0
  609. package/src/update/job-windows-restart.ts +19 -32
  610. package/src/update/job.ts +12 -5
  611. package/src/update/npm-install.d.mts +11 -0
  612. package/src/update/npm-install.mjs +44 -7
  613. package/src/update/orchestrated-entry.ts +1 -1
  614. package/src/update/orchestrated-node-driver.mjs +3 -2
  615. package/src/update/orchestrated-pnpm.d.mts +4 -0
  616. package/src/update/orchestrated-pnpm.mjs +50 -6
  617. package/src/update/orchestrated-session.d.mts +3 -1
  618. package/src/update/orchestrated-session.mjs +21 -6
  619. package/src/update/pnpm-global-install.d.mts +21 -3
  620. package/src/update/pnpm-global-install.mjs +322 -19
  621. package/src/update/pnpm-store-layout.mjs +46 -0
  622. package/src/update/sync-update-mutex.d.mts +3 -2
  623. package/src/update/sync-update-mutex.mjs +57 -8
  624. package/src/update/transactional-install.d.mts +3 -1
  625. package/src/update/transactional-install.mjs +545 -12
  626. package/src/update/windows-installer-marker.d.mts +1 -0
  627. package/src/update/windows-installer-marker.mjs +44 -0
  628. package/src/usage/expected-prices.ts +8 -0
  629. package/src/usage/filter-index.ts +326 -77
  630. package/src/usage/ledger-scanner.ts +15 -0
  631. package/src/usage/link-log-fields.ts +48 -0
  632. package/src/usage/log.ts +57 -6
  633. package/src/usage/request-body.ts +37 -0
  634. package/src/usage/telemetry-contract.ts +1 -0
  635. package/src/web-search/loop.ts +3 -0
  636. package/src/web-search/passthrough-bridge.ts +7 -0
  637. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  638. package/gui/dist/assets/brand-mark-DU-0Vdkr.js +0 -1
  639. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  640. package/gui/dist/assets/index-DJEkIDAi.css +0 -2
  641. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  642. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  643. package/gui/dist/classic/assets/quota-summary-CakPe9Ni.js +0 -1
  644. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -0,0 +1,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") ||
@@ -60,6 +60,19 @@ export function gcpCredentialMarkerAccount(value: string | undefined): string |
60
60
  return account;
61
61
  }
62
62
 
63
+ export type VertexConfiguredCredentialKind = "marker" | "ambient" | "reference" | "api-key";
64
+
65
+ /**
66
+ * Classify a Vertex row's configured `apiKey` text without resolving it, so no caller has to read a
67
+ * keychain or the environment just to learn which kind of credential the row names. The management
68
+ * DTO and the static-catalog connection test share this one rule.
69
+ */
70
+ export function vertexConfiguredCredentialKind(key: string | undefined): VertexConfiguredCredentialKind {
71
+ if (key?.startsWith(GCP_CREDENTIAL_MARKER_PREFIX)) return "marker";
72
+ if (!key?.trim() || key === "N/A" || key.startsWith("<")) return "ambient";
73
+ return key.startsWith("keychain:") || /^\$\{?\w+\}?$/.test(key) ? "reference" : "api-key";
74
+ }
75
+
63
76
  /**
64
77
  * Whether a pasted API-key value is in fact a GCP credential JSON. Used by the save path to
65
78
  * divert JSON material out of the literal-key flow before it reaches `config.json`. Deliberately
@@ -125,6 +138,18 @@ const sourceObservations = new Map<string, { source: string; generation: number
125
138
  let sourceEpoch = 0;
126
139
  let lastReconciledGeneration = 0;
127
140
  let liveSources = new Set<string>();
141
+ // Last token exchange that succeeded, per credential scope. Proof the dashboard can show without a
142
+ // network call; it lapses on its own once the source the next resolve would use changes.
143
+ const verifiedSources = new Map<string, { source: string; generation: number }>();
144
+ const adcScope = (markerAccount: string | undefined) => markerAccount ? `marker:${markerAccount}` : "host";
145
+
146
+ /** True when this process minted a token from the credential source the next request would use. */
147
+ export function vertexAdcCredentialVerified(markerAccount?: string): boolean {
148
+ const verified = verifiedSources.get(adcScope(markerAccount));
149
+ if (!verified) return false;
150
+ const current = observeAdcSource(markerAccount);
151
+ return current.source === verified.source && current.generation === verified.generation;
152
+ }
128
153
 
129
154
  export function sweepExpiredGcpAdcTokens(now = Date.now()): number {
130
155
  const skew = getRefreshSkewMs();
@@ -244,7 +269,7 @@ function currentAdcSourceKey(markerAccount: string | undefined): string {
244
269
 
245
270
  /** Every observed source transition gets a fresh incarnation, including A→B→A. */
246
271
  function observeAdcSource(markerAccount: string | undefined): { source: string; generation: number } {
247
- const scope = markerAccount ? `marker:${markerAccount}` : "host";
272
+ const scope = adcScope(markerAccount);
248
273
  const source = currentAdcSourceKey(markerAccount);
249
274
  const previous = sourceObservations.get(scope);
250
275
  if (previous?.source === source) return previous;
@@ -394,8 +419,13 @@ async function resolveAccessTokenUncached(markerAccount: string | undefined, sig
394
419
  );
395
420
  }
396
421
 
397
- /** Returns a Bearer access token for the `Authorization` header on Vertex AI calls (cached + refreshed). */
398
- export async function getVertexAccessTokenWithAuthority(options?: { signal?: AbortSignal; fetch?: FetchImpl; markerAccount?: string; beforeSend?: () => void }): Promise<VertexTokenAuthority> {
422
+ /**
423
+ * Returns a Bearer access token for the `Authorization` header on Vertex AI calls (cached + refreshed).
424
+ * `forceExchange` skips the completed-token cache so the caller observes a real exchange: the
425
+ * connection test uses it, because a cached token outlives a revoked refresh credential. It still
426
+ * joins an exchange already in flight and refreshes the cache on success; other callers keep the cache.
427
+ */
428
+ export async function getVertexAccessTokenWithAuthority(options?: { signal?: AbortSignal; fetch?: FetchImpl; markerAccount?: string; beforeSend?: () => void; forceExchange?: boolean }): Promise<VertexTokenAuthority> {
399
429
  // The marker travels as an argument, never as process-global state: a module-level "active
400
430
  // marker" written by the router would race across concurrent requests for different providers
401
431
  // and could resolve one provider's Vertex call with another provider's service account. The
@@ -418,7 +448,7 @@ export async function getVertexAccessTokenWithAuthority(options?: { signal?: Abo
418
448
  }
419
449
  const writerGeneration = captureConfigGeneration();
420
450
  for (const [source, cached] of tokenCache) {
421
- if (source === expectedSource && cached.generation === expected.generation && cached.expiresAtMs - skew > now) {
451
+ if (!options?.forceExchange && source === expectedSource && cached.generation === expected.generation && cached.expiresAtMs - skew > now) {
422
452
  return { token: cached.token, source, generation: expected.generation, markerAccount };
423
453
  }
424
454
  if (cached.expiresAtMs - skew <= now) tokenCache.delete(source);
@@ -449,12 +479,25 @@ export async function getVertexAccessTokenWithAuthority(options?: { signal?: Abo
449
479
  if (source !== expectedSource || current.source !== source || current.generation !== expected.generation) {
450
480
  throw new Error("Vertex ADC source changed during token exchange");
451
481
  }
482
+ if (typeof token.access_token !== "string" || !token.access_token) {
483
+ throw new Error("Google OAuth token response has no access_token");
484
+ }
452
485
  const expiresAtMs = Date.now() + Math.max(0, token.expires_in * 1000);
453
486
  if (writerGeneration >= lastReconciledGeneration || liveSources.has(source)) {
454
487
  tokenCache.set(source, { token: token.access_token, expiresAtMs, generation: expected.generation });
455
488
  sweepExpiredOnWrite(Date.now());
456
489
  }
490
+ verifiedSources.set(adcScope(markerAccount), { source, generation: expected.generation });
457
491
  return { token: token.access_token, source, generation: expected.generation, markerAccount };
492
+ } catch (error) {
493
+ // Drop only this exchange's own proof: a newer exchange for a changed source may already
494
+ // have recorded its success under the same scope, and that proof still holds.
495
+ const scope = adcScope(markerAccount);
496
+ const verified = verifiedSources.get(scope);
497
+ if (!controller.signal.aborted && verified?.source === expectedSource && verified.generation === expected.generation) {
498
+ verifiedSources.delete(scope);
499
+ }
500
+ throw error;
458
501
  } finally {
459
502
  owned.settled = true;
460
503
  if (inflight.get(cacheKey) === owned) inflight.delete(cacheKey);
@@ -538,6 +581,7 @@ export function vertexRequestAuthorityIsCurrent(request: object, target?: string
538
581
 
539
582
  /** Test seam: restores complete process-local token and reconciliation state. */
540
583
  export function __resetVertexTokenCache(): void {
584
+ verifiedSources.clear();
541
585
  tokenCache.clear();
542
586
  for (const entry of inflight.values()) entry.controller.abort();
543
587
  inflight.clear();
@@ -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 })));