@bitkyc08/opencodex 2.100.1 → 2.100.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (624) hide show
  1. package/README.md +1 -1
  2. package/bin/ocx.mjs +32 -18
  3. package/gui/dist/assets/{App-COo8Yopd.css → App-BGP8I0V4.css} +1 -1
  4. package/gui/dist/assets/App-Dnb6VMsP.js +59 -0
  5. package/gui/dist/assets/Tray-BV4ms9U9.js +1 -0
  6. package/gui/dist/assets/{brand-mark-nr3ziR-T.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/index-DQtCRNAw.css +2 -0
  9. package/gui/dist/assets/{segment-thumb-features-DKCVUUTi.js → segment-thumb-features-DXSidY6D.js} +1 -1
  10. package/gui/dist/classic/assets/App-DA-scMPq.js +58 -0
  11. package/gui/dist/classic/assets/{Tray-BedmOsE7.js → Tray-BrHaVRAq.js} +1 -1
  12. package/gui/dist/classic/assets/index-BqOaGLf5.js +105 -0
  13. package/gui/dist/classic/assets/quota-summary-Dy5_wfTT.js +1 -0
  14. package/gui/dist/classic/index.html +1 -1
  15. package/gui/dist/index.html +2 -2
  16. package/native/ocx-child/Cargo.toml +9 -0
  17. package/native/ocx-child/src/cli.rs +402 -20
  18. package/native/ocx-child/src/codex_home.rs +98 -14
  19. package/native/ocx-child/src/daemon.rs +2 -1
  20. package/native/ocx-child/src/lib.rs +3 -0
  21. package/native/ocx-child/src/link_ws.rs +2598 -0
  22. package/native/ocx-child/src/link_ws_advert.rs +346 -0
  23. package/native/ocx-child/src/link_ws_frame.rs +749 -0
  24. package/native/ocx-child/src/parity.rs +5 -1
  25. package/native/ocx-child/src/platform.rs +152 -6
  26. package/native/ocx-child/src/relay.rs +150 -19
  27. package/package.json +3 -3
  28. package/src/adapters/anthropic/advisor-tool.ts +176 -0
  29. package/src/adapters/anthropic/beta-body-pairs.ts +6 -0
  30. package/src/adapters/anthropic/client-identity.ts +3 -1
  31. package/src/adapters/anthropic/passthrough.ts +9 -3
  32. package/src/adapters/anthropic.ts +31 -14
  33. package/src/adapters/client-fingerprint.ts +6 -4
  34. package/src/adapters/cursor/discovery.ts +17 -0
  35. package/src/adapters/cursor/native-exec-desktop.ts +2 -1
  36. package/src/adapters/cursor/native-exec-shell.ts +2 -1
  37. package/src/adapters/cursor/native-exec.ts +3 -2
  38. package/src/adapters/cursor/protobuf-request.ts +8 -8
  39. package/src/adapters/cursor/tool-guidance.ts +3 -3
  40. package/src/adapters/cursor/tool-wording.ts +10 -1
  41. package/src/adapters/cursor.ts +7 -6
  42. package/src/adapters/devin/cloud-direct/tool-schema.ts +20 -2
  43. package/src/adapters/google-antigravity-wire.ts +15 -6
  44. package/src/adapters/google-truncation.ts +4 -2
  45. package/src/adapters/google-wire-compiler.ts +2 -2
  46. package/src/adapters/google.ts +17 -4
  47. package/src/adapters/kiro/payload.ts +7 -4
  48. package/src/adapters/kiro/reasoning.ts +44 -1
  49. package/src/adapters/kiro/structured-output.ts +10 -8
  50. package/src/adapters/kiro-tools.ts +61 -15
  51. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  52. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  53. package/src/adapters/openai-chat/tool-schema.ts +9 -0
  54. package/src/adapters/openai-responses/tool-schema.ts +18 -4
  55. package/src/adapters/run-turn-queue.ts +139 -5
  56. package/src/adapters/upstream-http-error.ts +4 -2
  57. package/src/adapters/zed.ts +3 -0
  58. package/src/advisor/consult.ts +15 -4
  59. package/src/advisor/context.ts +12 -3
  60. package/src/advisor/runtime.ts +35 -5
  61. package/src/advisor/settings.ts +8 -0
  62. package/src/advisor/synthetic-tool.ts +21 -8
  63. package/src/bridge/response-json.ts +11 -2
  64. package/src/bridge/sse.ts +51 -9
  65. package/src/claude/auth-detect.ts +21 -33
  66. package/src/claude/chat-tool-dispatch.ts +233 -0
  67. package/src/claude/desktop-3p.ts +11 -5
  68. package/src/claude/desktop-gateway-state.ts +2 -0
  69. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  70. package/src/claude/desktop-remote-store.ts +24 -4
  71. package/src/claude/inbound-content-options.ts +31 -16
  72. package/src/claude/inbound-tool-loading.ts +42 -17
  73. package/src/claude/outbound.ts +13 -3
  74. package/src/cli/account-api.ts +23 -1
  75. package/src/cli/account-auth.ts +54 -21
  76. package/src/cli/account-extended.ts +60 -6
  77. package/src/cli/account-key-quota.ts +56 -7
  78. package/src/cli/account.ts +5 -3
  79. package/src/cli/advisor.ts +7 -4
  80. package/src/cli/alias.ts +38 -1
  81. package/src/cli/capabilities-access-remote.ts +137 -2
  82. package/src/cli/capabilities-accounts.ts +3 -3
  83. package/src/cli/capabilities-agents-routing.ts +17 -10
  84. package/src/cli/capabilities-base.ts +43 -18
  85. package/src/cli/capabilities-integrations.ts +2 -2
  86. package/src/cli/capabilities-provider-models.ts +18 -2
  87. package/src/cli/capabilities-route-to.ts +43 -0
  88. package/src/cli/capabilities.ts +2 -0
  89. package/src/cli/capability-contracts.ts +1 -1
  90. package/src/cli/claude-desktop.ts +30 -11
  91. package/src/cli/claude.ts +36 -17
  92. package/src/cli/codex-launcher.ts +3 -1
  93. package/src/cli/codex-shim-autorestore.ts +5 -42
  94. package/src/cli/config-command.ts +38 -2
  95. package/src/cli/config-root-startup.ts +34 -0
  96. package/src/cli/connect.ts +124 -19
  97. package/src/cli/desktop-runtime-guidance.ts +1 -1
  98. package/src/cli/disconnect-runtime.ts +168 -0
  99. package/src/cli/dispatch.ts +54 -12
  100. package/src/cli/export-command.ts +1 -1
  101. package/src/cli/gui-pair-client.ts +29 -5
  102. package/src/cli/gui.ts +10 -5
  103. package/src/cli/help-catalog.ts +11 -0
  104. package/src/cli/help.ts +5 -4
  105. package/src/cli/hub.ts +18 -1
  106. package/src/cli/index.ts +83 -92
  107. package/src/cli/inspect.ts +11 -2
  108. package/src/cli/integrations.ts +26 -1
  109. package/src/cli/link-capture.ts +64 -0
  110. package/src/cli/link-child-ops.ts +314 -0
  111. package/src/cli/link-cleanup.ts +8 -5
  112. package/src/cli/link-diagnostics.ts +67 -0
  113. package/src/cli/link-enrollment.ts +158 -12
  114. package/src/cli/link-operations.ts +52 -0
  115. package/src/cli/link-recover.ts +152 -0
  116. package/src/cli/link-routes.ts +87 -0
  117. package/src/cli/link-status-child.ts +137 -0
  118. package/src/cli/link-status-traffic.ts +34 -0
  119. package/src/cli/link.ts +327 -37
  120. package/src/cli/message-command.ts +1 -1
  121. package/src/cli/message-mcp-command.ts +23 -10
  122. package/src/cli/models-runtime.ts +3 -3
  123. package/src/cli/opencode.ts +3 -1
  124. package/src/cli/pi-sync.ts +35 -0
  125. package/src/cli/preflight-exemptions.ts +46 -0
  126. package/src/cli/registry.ts +29 -12
  127. package/src/cli/restart-failure.ts +5 -2
  128. package/src/cli/root.ts +5 -1
  129. package/src/cli/route-to.ts +172 -0
  130. package/src/cli/runtime-api.ts +5 -8
  131. package/src/cli/status.ts +3 -1
  132. package/src/cli/stop-approval.ts +66 -19
  133. package/src/cli/stop-report.ts +23 -0
  134. package/src/cli/stop-windows-checked.ts +304 -0
  135. package/src/cli/sync-command.ts +70 -13
  136. package/src/cli/sync-fanout.ts +81 -99
  137. package/src/cli/sync-flags.ts +40 -3
  138. package/src/cli/sync-link-status.ts +18 -2
  139. package/src/cli/sync-update-guard.ts +7 -2
  140. package/src/cli/system-restart-client.ts +3 -2
  141. package/src/cli/uninstall-plan.ts +77 -5
  142. package/src/cli/uninstall-stop.ts +152 -0
  143. package/src/cli/v2-input.ts +10 -6
  144. package/src/cli/v2-local-output.ts +3 -2
  145. package/src/cli/v2-runtime.ts +10 -3
  146. package/src/cli/v2.ts +22 -7
  147. package/src/client/connect.ts +321 -34
  148. package/src/client/link-home-features.ts +27 -0
  149. package/src/client/link-home.ts +92 -4
  150. package/src/client/link-ingress.ts +21 -3
  151. package/src/client/link-join.ts +12 -2
  152. package/src/client/link-parity-reporter.ts +60 -6
  153. package/src/client/link-readiness.ts +16 -6
  154. package/src/client/link-relay-transport.ts +161 -36
  155. package/src/client/link-relay.ts +150 -6
  156. package/src/client/link-request-compression.ts +84 -0
  157. package/src/client/link-state.ts +11 -5
  158. package/src/client/link-status.ts +39 -1
  159. package/src/client/link-teardown.ts +1 -0
  160. package/src/client/link-tunnel-status.ts +76 -0
  161. package/src/client/link-tunnel.ts +56 -5
  162. package/src/client/link-websocket-limits.ts +89 -0
  163. package/src/client/link-websocket.ts +586 -0
  164. package/src/client/link-ws-advertisement.ts +100 -0
  165. package/src/client/link-ws-framer.ts +241 -0
  166. package/src/client/link-ws-transport.ts +177 -0
  167. package/src/client/machine-api.ts +13 -2
  168. package/src/client/machine-listener.ts +48 -7
  169. package/src/client/route-intent-apply.ts +293 -0
  170. package/src/client/route-intent-file-originals.ts +97 -0
  171. package/src/client/route-intent-native-originals.ts +201 -0
  172. package/src/client/route-intent-watch.ts +141 -0
  173. package/src/client/runtime-restart.ts +127 -5
  174. package/src/client/runtime.ts +61 -15
  175. package/src/client/state.ts +30 -0
  176. package/src/client/sync-expectation.ts +36 -2
  177. package/src/client/sync-runtime.ts +7 -0
  178. package/src/clients/config-export/alias-selectors.ts +63 -40
  179. package/src/clients/config-export/contracts.ts +2 -0
  180. package/src/clients/config-export/nested-selectors.ts +42 -0
  181. package/src/clients/config-export.ts +36 -4
  182. package/src/codex/account-resume-health.ts +41 -0
  183. package/src/codex/account-store.ts +12 -3
  184. package/src/codex/account-usability.ts +13 -0
  185. package/src/codex/auth-api/account-list.ts +29 -3
  186. package/src/codex/auth-api/login-flow.ts +6 -0
  187. package/src/codex/auth-api/routes.ts +35 -2
  188. package/src/codex/auth-collision.ts +23 -22
  189. package/src/codex/auth-context.ts +21 -6
  190. package/src/codex/catalog/gather-capture.ts +10 -2
  191. package/src/codex/catalog/parsing.ts +7 -3
  192. package/src/codex/catalog/provider-models.ts +67 -23
  193. package/src/codex/catalog/retained-sync.ts +2 -1
  194. package/src/codex/catalog/routed-gather.ts +1 -1
  195. package/src/codex/catalog-auto-refresh.ts +11 -0
  196. package/src/codex/cli-update-job.ts +35 -13
  197. package/src/codex/convergence-types.ts +2 -0
  198. package/src/codex/convergence.ts +2 -2
  199. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  200. package/src/codex/features.ts +2 -2
  201. package/src/codex/history-provider.ts +31 -0
  202. package/src/codex/inject/multi-agent-v2.ts +9 -3
  203. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  204. package/src/codex/inject/plan.ts +20 -2
  205. package/src/codex/inject.ts +2 -0
  206. package/src/codex/journal-config-restore.ts +217 -0
  207. package/src/codex/journal.ts +75 -6
  208. package/src/codex/main-account.ts +23 -30
  209. package/src/codex/native-main-auth-file.ts +104 -0
  210. package/src/codex/native-profile-manager.ts +4 -3
  211. package/src/codex/native-profile-store.ts +3 -61
  212. package/src/codex/orca-import.ts +10 -1
  213. package/src/codex/quota-history.ts +13 -0
  214. package/src/codex/quota-window-conflict.ts +103 -0
  215. package/src/codex/quota.ts +134 -7
  216. package/src/codex/subagent-model-fallback.ts +3 -1
  217. package/src/codex/websocket-activity.ts +171 -16
  218. package/src/codex/websocket-registry.ts +11 -4
  219. package/src/combos/cooldown-store.ts +228 -0
  220. package/src/combos/failover.ts +760 -35
  221. package/src/config/dashboard-trusted-proxy.ts +83 -0
  222. package/src/config/diagnostics.ts +28 -0
  223. package/src/config/feature-flags.ts +9 -0
  224. package/src/config/live-reconcile.ts +10 -1
  225. package/src/config/load-degrade.ts +12 -1
  226. package/src/config/multi-agent-surface.ts +28 -5
  227. package/src/config/pending-teardown.ts +60 -3
  228. package/src/config/process-state.ts +175 -4
  229. package/src/config/provider-validation.ts +4 -4
  230. package/src/config/salvage.ts +1 -0
  231. package/src/config/schema/config-schema.ts +12 -3
  232. package/src/config/schema/leaf-validators.ts +43 -14
  233. package/src/config/windows-process-command-line.ts +107 -0
  234. package/src/generated/compatibility-version.json +1077 -429
  235. package/src/generated/model-metadata.ts +1 -1
  236. package/src/images/loop.ts +3 -0
  237. package/src/integrations/model-name-guard.ts +25 -0
  238. package/src/integrations/route-intent-catalog.ts +26 -0
  239. package/src/integrations/route-intent-connected.ts +262 -0
  240. package/src/integrations/route-intent-contract.ts +55 -0
  241. package/src/integrations/route-intent-disconnect.ts +109 -0
  242. package/src/integrations/route-intent-initial.ts +64 -0
  243. package/src/integrations/route-intent-state.ts +117 -0
  244. package/src/integrations/route-intent-tick.ts +65 -0
  245. package/src/integrations/route-intent.ts +212 -0
  246. package/src/integrations/writer.ts +44 -11
  247. package/src/lib/catalog-etag.ts +10 -0
  248. package/src/lib/client-error-body.ts +15 -0
  249. package/src/lib/client-retry-after.ts +29 -0
  250. package/src/lib/config-ownership.ts +13 -0
  251. package/src/lib/context-overflow-verdict.ts +266 -9
  252. package/src/lib/desktop-gui-origin.ts +28 -0
  253. package/src/lib/errors.ts +1 -1
  254. package/src/lib/failure-detail.ts +72 -3
  255. package/src/lib/gui-pair-capability.ts +2 -1
  256. package/src/lib/hard-refusal.ts +259 -0
  257. package/src/lib/messages-error-body.ts +4 -1
  258. package/src/lib/outbound-credential-registry.ts +362 -4
  259. package/src/lib/paced-stream.ts +34 -0
  260. package/src/lib/passive-key-fetch-proof.ts +30 -0
  261. package/src/lib/passive-read.ts +5 -0
  262. package/src/lib/process-control.ts +76 -12
  263. package/src/lib/redact.ts +84 -8
  264. package/src/lib/state-store-registrations.ts +11 -0
  265. package/src/lib/state-store-sweeper.ts +4 -0
  266. package/src/lib/supervisor-markers.ts +18 -0
  267. package/src/lib/terminal-safe-text.ts +58 -0
  268. package/src/lib/translator-budget.ts +3 -2
  269. package/src/lib/upstream-retry.ts +14 -4
  270. package/src/link/alias-lock.ts +119 -0
  271. package/src/link/child-activity.ts +83 -0
  272. package/src/link/child-binary-cache-fill.d.mts +50 -0
  273. package/src/link/child-binary-cache-fill.mjs +494 -0
  274. package/src/link/child-binary-cache-start.ts +73 -0
  275. package/src/link/child-binary-source.ts +12 -5
  276. package/src/link/child-catalog-freshness.ts +149 -0
  277. package/src/link/child-gated-ocx.ts +135 -0
  278. package/src/link/child-observations.ts +206 -0
  279. package/src/link/child-observe.ts +121 -0
  280. package/src/link/child-ops-engine.ts +230 -0
  281. package/src/link/child-ops-host.ts +138 -0
  282. package/src/link/child-ops-runners.ts +319 -0
  283. package/src/link/child-ops-scheduler.ts +207 -0
  284. package/src/link/child-ops-types.ts +89 -0
  285. package/src/link/child-parity.ts +23 -4
  286. package/src/link/child-policy.ts +93 -0
  287. package/src/link/child-update-contract.ts +174 -0
  288. package/src/link/codex-settings.ts +1 -1
  289. package/src/link/compatibility.ts +18 -1
  290. package/src/link/diagnostics-read.ts +163 -0
  291. package/src/link/diagnostics.ts +20 -7
  292. package/src/link/explicit-route.ts +209 -0
  293. package/src/link/link-recover.ts +113 -0
  294. package/src/link/management-routes.ts +3 -1
  295. package/src/link/operation-recovery-slot.ts +44 -0
  296. package/src/link/operations-journal.ts +408 -0
  297. package/src/link/paths.ts +5 -0
  298. package/src/link/peer-report.ts +1 -1
  299. package/src/link/relay-auth.ts +14 -0
  300. package/src/link/remote-plant.ts +152 -14
  301. package/src/link/remote-platform.ts +21 -10
  302. package/src/link/remote-probe.ts +11 -3
  303. package/src/link/remote-windows.ts +88 -12
  304. package/src/link/request-compression.ts +30 -0
  305. package/src/link/residual-recovery.ts +54 -0
  306. package/src/link/retirement.ts +128 -0
  307. package/src/link/route-intent-watch.ts +41 -0
  308. package/src/link/route-intent.ts +209 -0
  309. package/src/link/route-proof.ts +82 -0
  310. package/src/link/route-rounds.ts +579 -0
  311. package/src/link/route-select.ts +95 -0
  312. package/src/link/route-trust.ts +96 -0
  313. package/src/link/ssh-argv.ts +285 -43
  314. package/src/link/ssh-capture-redact.ts +253 -0
  315. package/src/link/ssh-capture.ts +497 -0
  316. package/src/link/ssh-runner.ts +141 -14
  317. package/src/link/status-projection.ts +160 -0
  318. package/src/link/store.ts +54 -1
  319. package/src/link/supervisor.ts +543 -55
  320. package/src/link/sync-fanout-classify.ts +114 -0
  321. package/src/link/sync-then-restart.ts +65 -0
  322. package/src/link/tombstones.ts +209 -0
  323. package/src/link/traffic.ts +178 -0
  324. package/src/link/tunnel-state.ts +10 -4
  325. package/src/link/ws-activity-holds.ts +474 -0
  326. package/src/local-credentials/publication-fence.ts +20 -1
  327. package/src/messaging/mcp-queue-rpc.ts +3 -2
  328. package/src/messaging/mcp-queue-server.ts +21 -1
  329. package/src/messaging/mcp-reply-tools.ts +24 -9
  330. package/src/messaging/mcp-reply-wait.ts +70 -0
  331. package/src/messaging/mcp-resume-tools.ts +25 -0
  332. package/src/messaging/remote-enrollment.ts +3 -3
  333. package/src/messaging/remote-tunnels.ts +2 -2
  334. package/src/messaging/resume-permissions.ts +27 -0
  335. package/src/messaging/rpc.ts +46 -2
  336. package/src/oauth/account-resume-health.ts +60 -0
  337. package/src/oauth/anthropic-continuity.ts +23 -7
  338. package/src/oauth/anthropic-routing.ts +5 -2
  339. package/src/oauth/anthropic.ts +22 -2
  340. package/src/oauth/claude-keychain-read.ts +78 -68
  341. package/src/oauth/index.ts +25 -6
  342. package/src/oauth/local-token-detect.ts +8 -29
  343. package/src/oauth/login-cli-errors.ts +5 -1
  344. package/src/oauth/login-cli.ts +33 -18
  345. package/src/oauth/login-flow-state.ts +26 -3
  346. package/src/oauth/meta-muse.ts +1 -1
  347. package/src/oauth/store.ts +51 -1
  348. package/src/oauth/xai.ts +248 -14
  349. package/src/protocols/contract.ts +4 -0
  350. package/src/protocols/encoders/messages.ts +1 -0
  351. package/src/providers/alias-template.ts +48 -0
  352. package/src/providers/anthropic-billing-ownership.ts +2 -0
  353. package/src/providers/anthropic-output-caps.ts +46 -0
  354. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  355. package/src/providers/antigravity-effort-families.ts +11 -3
  356. package/src/providers/antigravity-models.ts +32 -9
  357. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  358. package/src/providers/api-key-pause-state.ts +23 -0
  359. package/src/providers/api-key-pause.ts +71 -10
  360. package/src/providers/api-key-resolve.ts +49 -7
  361. package/src/providers/api-key-response-ownership.ts +2 -0
  362. package/src/providers/api-key-selection-capture.ts +3 -1
  363. package/src/providers/api-key-selection.ts +54 -11
  364. package/src/providers/api-keys.ts +24 -7
  365. package/src/providers/cache-affinity-identity.ts +73 -0
  366. package/src/providers/cache-affinity.ts +256 -0
  367. package/src/providers/claude-cli-usage-state.ts +11 -6
  368. package/src/providers/claude-cli-usage.ts +27 -9
  369. package/src/providers/codex-capacity.ts +11 -2
  370. package/src/providers/default-aliases.ts +98 -20
  371. package/src/providers/google-vertex-model-discovery.ts +510 -0
  372. package/src/providers/key-failover.ts +136 -14
  373. package/src/providers/key-store.ts +3 -3
  374. package/src/providers/kiro-models.ts +3 -5
  375. package/src/providers/label.ts +31 -5
  376. package/src/providers/mistral-transport.ts +17 -4
  377. package/src/providers/model-discovery-config.ts +31 -0
  378. package/src/providers/model-discovery-diagnostic.ts +34 -3
  379. package/src/providers/model-discovery.ts +43 -7
  380. package/src/providers/model-rename-fields.ts +5 -0
  381. package/src/providers/muse-key-quota.ts +14 -6
  382. package/src/providers/new-model-policy-runtime.ts +17 -4
  383. package/src/providers/new-model-policy.ts +30 -4
  384. package/src/providers/openai-sidecar.ts +15 -2
  385. package/src/providers/passive-key-observation.ts +252 -0
  386. package/src/providers/provider-id-rewrite.ts +3 -0
  387. package/src/providers/quota/account-cache.ts +53 -34
  388. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  389. package/src/providers/quota/anthropic-usage-windows.ts +19 -9
  390. package/src/providers/quota/passive-key-limits.ts +272 -0
  391. package/src/providers/quota/passive-wire-model.ts +126 -0
  392. package/src/providers/quota/report-cache.ts +112 -5
  393. package/src/providers/quota/vendor-probes-key.ts +73 -0
  394. package/src/providers/quota/vendor-probes-oauth.ts +57 -3
  395. package/src/providers/quota-key-accounts.ts +22 -10
  396. package/src/providers/quota-mistral-budget.ts +18 -0
  397. package/src/providers/quota-types.ts +43 -0
  398. package/src/providers/quota.ts +31 -32
  399. package/src/providers/reasoning-metadata.ts +1051 -12
  400. package/src/providers/registry/entries-core.ts +34 -16
  401. package/src/providers/registry/entries-extended.ts +32 -0
  402. package/src/providers/registry/model-seeds.ts +35 -0
  403. package/src/providers/resolved-model-policy.ts +7 -0
  404. package/src/providers/routed-config.ts +8 -3
  405. package/src/providers/xai-transport.ts +3 -0
  406. package/src/quota/reset-observer.ts +4 -2
  407. package/src/quota/reset-seen-store.ts +9 -0
  408. package/src/quota/window-mapping.ts +1 -0
  409. package/src/quota-pool/assemble.ts +4 -1
  410. package/src/remote/features.ts +17 -0
  411. package/src/responses/anthropic-progress.ts +10 -4
  412. package/src/responses/citation-markers.ts +231 -0
  413. package/src/responses/hosted-tool-policy.ts +56 -12
  414. package/src/responses/spill-store.ts +5 -1
  415. package/src/responses/state/replay-input.ts +50 -0
  416. package/src/responses/state/replay-owner.ts +24 -0
  417. package/src/responses/state/snapshot-codec.ts +9 -0
  418. package/src/responses/state/spill-queue.ts +1 -0
  419. package/src/responses/state.ts +42 -60
  420. package/src/router.ts +4 -2
  421. package/src/routing/home-route-capture.ts +123 -0
  422. package/src/routing/home-route-intent.ts +200 -0
  423. package/src/routing/route-intent-state.ts +178 -0
  424. package/src/routing/route-to-live-settings.ts +35 -0
  425. package/src/routing/route-to-local.ts +145 -0
  426. package/src/routing/route-to-status.ts +94 -0
  427. package/src/routing/route-to-sync-child.ts +32 -0
  428. package/src/server/adapter-resolve.ts +21 -1
  429. package/src/server/admitted-http-turn.ts +3 -0
  430. package/src/server/auth-cors.ts +109 -8
  431. package/src/server/bare-upstream-error.ts +220 -0
  432. package/src/server/catalog-download.ts +3 -5
  433. package/src/server/chat-native.ts +25 -7
  434. package/src/server/claude-messages.ts +8 -5
  435. package/src/server/codex-model-list.ts +2 -1
  436. package/src/server/configured-credentials.ts +37 -5
  437. package/src/server/gui-desktop-authorization.ts +36 -0
  438. package/src/server/gui-pair-delivery.ts +6 -3
  439. package/src/server/gui-session.ts +10 -1
  440. package/src/server/images.ts +41 -13
  441. package/src/server/inbound-body-admission.ts +17 -4
  442. package/src/server/index/link-listener.ts +203 -11
  443. package/src/server/index/link-management.ts +15 -1
  444. package/src/server/index/link-relay-sessions.ts +128 -8
  445. package/src/server/index/link-websocket-limits.ts +136 -0
  446. package/src/server/index/link-websocket.ts +692 -0
  447. package/src/server/index/optional-listeners.ts +115 -7
  448. package/src/server/index/route-intent-watch.ts +47 -0
  449. package/src/server/index/serve-contract.ts +86 -0
  450. package/src/server/index/serve-options.ts +35 -86
  451. package/src/server/index/startup-warnings.ts +8 -2
  452. package/src/server/index/websocket-handler.ts +26 -4
  453. package/src/server/index.ts +12 -2
  454. package/src/server/inference/client-encoder-delivery.ts +2 -0
  455. package/src/server/inspection-tee.ts +39 -2
  456. package/src/server/lifecycle.ts +2 -0
  457. package/src/server/link-turn.ts +137 -0
  458. package/src/server/management/advisor-routes.ts +10 -2
  459. package/src/server/management/agent-settings-routes.ts +50 -16
  460. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  461. package/src/server/management/config-routes.ts +7 -1
  462. package/src/server/management/context.ts +9 -2
  463. package/src/server/management/desktop-authorization.ts +41 -0
  464. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  465. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  466. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  467. package/src/server/management/home-integration-decision.ts +89 -0
  468. package/src/server/management/integration-routes.ts +208 -81
  469. package/src/server/management/link-child-ops-routes.ts +218 -0
  470. package/src/server/management/link-child-preflight.ts +31 -0
  471. package/src/server/management/link-diagnostics-route.ts +29 -0
  472. package/src/server/management/link-enrollment.ts +199 -47
  473. package/src/server/management/link-operation.ts +609 -0
  474. package/src/server/management/link-recover-route.ts +103 -0
  475. package/src/server/management/link-route-edit.ts +173 -0
  476. package/src/server/management/link-route-request.ts +62 -0
  477. package/src/server/management/link-route-state.ts +92 -6
  478. package/src/server/management/link-routes.ts +563 -51
  479. package/src/server/management/link-traffic-status.ts +13 -0
  480. package/src/server/management/model-routes.ts +122 -36
  481. package/src/server/management/model-rows.ts +2 -1
  482. package/src/server/management/native-integration-routes.ts +176 -70
  483. package/src/server/management/oauth-account-routes.ts +69 -17
  484. package/src/server/management/protocol-routes.ts +7 -0
  485. package/src/server/management/provider-completion-test.ts +4 -4
  486. package/src/server/management/provider-overwrite-carry.ts +39 -3
  487. package/src/server/management/provider-routes.ts +80 -72
  488. package/src/server/management/provider-routing-quota.ts +45 -0
  489. package/src/server/management/route-registry.ts +25 -3
  490. package/src/server/management/route-to-routes.ts +257 -0
  491. package/src/server/management/system-restart.ts +4 -2
  492. package/src/server/management/usage-aggregate-cache.ts +101 -66
  493. package/src/server/management-api.ts +17 -3
  494. package/src/server/management-auth.ts +13 -1
  495. package/src/server/messages-native-preflight.ts +27 -4
  496. package/src/server/messages-native.ts +22 -5
  497. package/src/server/persistent-gui-session.ts +6 -3
  498. package/src/server/proxy-liveness.ts +33 -6
  499. package/src/server/relay-eager.ts +36 -12
  500. package/src/server/relay.ts +183 -116
  501. package/src/server/request-body-facts.ts +48 -0
  502. package/src/server/request-decompress.ts +65 -2
  503. package/src/server/request-log-account-rotation.ts +6 -0
  504. package/src/server/request-log-attempt-usage.ts +69 -0
  505. package/src/server/request-log-cache-affinity.ts +60 -0
  506. package/src/server/request-log-conversation.ts +45 -2
  507. package/src/server/request-log-failure-detail.ts +59 -1
  508. package/src/server/request-log-terminal-status.ts +210 -24
  509. package/src/server/request-log.ts +71 -79
  510. package/src/server/responses/adapter-continuation.ts +2 -1
  511. package/src/server/responses/adapter-delivery.ts +2 -0
  512. package/src/server/responses/adapter-dispatch.ts +40 -51
  513. package/src/server/responses/advisor-plan-slot.ts +33 -1
  514. package/src/server/responses/advisor-question.ts +21 -0
  515. package/src/server/responses/advisor-slot.ts +10 -3
  516. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  517. package/src/server/responses/buffered-sse-json.ts +9 -3
  518. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  519. package/src/server/responses/codex-tool-catalog.ts +156 -0
  520. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  521. package/src/server/responses/combo-stream-preflight.ts +701 -81
  522. package/src/server/responses/compact.ts +47 -12
  523. package/src/server/responses/context-overflow.ts +58 -2
  524. package/src/server/responses/core-codex-account.ts +17 -3
  525. package/src/server/responses/core-combo-failure.ts +37 -4
  526. package/src/server/responses/core-combo-native.ts +3 -1
  527. package/src/server/responses/core-combo.ts +62 -7
  528. package/src/server/responses/core-errors.ts +8 -3
  529. package/src/server/responses/core-lifetime.ts +3 -2
  530. package/src/server/responses/core-normalize.ts +3 -1
  531. package/src/server/responses/core-opaque-recovery.ts +45 -2
  532. package/src/server/responses/core-options.ts +18 -0
  533. package/src/server/responses/core.ts +2 -0
  534. package/src/server/responses/fetch-helpers.ts +15 -10
  535. package/src/server/responses/native-replay-guard.ts +57 -0
  536. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  537. package/src/server/responses/outbound-request-body.ts +29 -0
  538. package/src/server/responses/passthrough-completion.ts +105 -8
  539. package/src/server/responses/passthrough-delivery.ts +31 -11
  540. package/src/server/responses/passthrough-dispatch.ts +99 -106
  541. package/src/server/responses/policy-fallback.ts +13 -1
  542. package/src/server/responses/request-prepare.ts +50 -6
  543. package/src/server/responses/request-transport.ts +53 -17
  544. package/src/server/responses/reset-replay.ts +104 -4
  545. package/src/server/responses/run-turn-execution.ts +58 -30
  546. package/src/server/responses/sidecar-execution.ts +14 -0
  547. package/src/server/responses/terminal-error-redaction.ts +222 -25
  548. package/src/server/responses/ws-upstream.ts +2 -2
  549. package/src/server/sse-payload-rewrite.ts +3 -2
  550. package/src/server/stop-service-route.ts +85 -0
  551. package/src/server/system-env-shell.ts +12 -1
  552. package/src/server/system-env.ts +5 -3
  553. package/src/server/windows-tcp-drop.ts +21 -4
  554. package/src/server/workflow-refusal.ts +8 -0
  555. package/src/server/ws-bridge.ts +191 -12
  556. package/src/service/cli-windows-stop.ts +189 -0
  557. package/src/service/cli.ts +41 -12
  558. package/src/service/disconnected-client-restart.ts +60 -0
  559. package/src/service/guarded-manager-target.ts +18 -1
  560. package/src/service/health.ts +99 -6
  561. package/src/service/launchd.ts +84 -31
  562. package/src/service/orchestration.ts +418 -91
  563. package/src/service/repair.ts +223 -6
  564. package/src/service/restart-proxy-stop.ts +79 -0
  565. package/src/service/service-child-ownership.ts +6 -2
  566. package/src/service/windows-checked-stop-live.ts +467 -0
  567. package/src/service/windows-checked-stop.ts +435 -0
  568. package/src/service/windows-command-line-token.ts +23 -0
  569. package/src/service/windows-guarded-manager.ts +77 -34
  570. package/src/service/windows-ops.ts +38 -56
  571. package/src/service/windows-process-evidence.ts +292 -0
  572. package/src/service/windows-process-native.ts +262 -0
  573. package/src/service/windows-service-stop.ts +321 -0
  574. package/src/service/windows-stop-binding.ts +187 -0
  575. package/src/service/windows-stop-budget.ts +123 -0
  576. package/src/service/windows-stop-confirm.ts +158 -0
  577. package/src/service/windows-stop-deadline.ts +56 -0
  578. package/src/service.ts +2 -2
  579. package/src/types/claude-tool-loading.ts +48 -0
  580. package/src/types/config.ts +47 -53
  581. package/src/types/link.ts +20 -0
  582. package/src/types/multi-agent.ts +13 -0
  583. package/src/types/provider.ts +68 -2
  584. package/src/types/request.ts +4 -0
  585. package/src/types.ts +4 -0
  586. package/src/update/guarded-runtime-ops.ts +5 -7
  587. package/src/update/index.ts +25 -10
  588. package/src/update/install-detection.mjs +3 -1
  589. package/src/update/job-pinned-start.ts +2 -0
  590. package/src/update/job-windows-restart.ts +19 -32
  591. package/src/update/job.ts +12 -5
  592. package/src/update/npm-install.d.mts +11 -0
  593. package/src/update/npm-install.mjs +44 -7
  594. package/src/update/orchestrated-entry.ts +1 -1
  595. package/src/update/orchestrated-node-driver.mjs +3 -2
  596. package/src/update/orchestrated-pnpm.d.mts +4 -0
  597. package/src/update/orchestrated-pnpm.mjs +50 -6
  598. package/src/update/orchestrated-session.d.mts +3 -1
  599. package/src/update/orchestrated-session.mjs +21 -6
  600. package/src/update/pnpm-global-install.d.mts +21 -3
  601. package/src/update/pnpm-global-install.mjs +322 -19
  602. package/src/update/pnpm-store-layout.mjs +46 -0
  603. package/src/update/sync-update-mutex.d.mts +3 -2
  604. package/src/update/sync-update-mutex.mjs +57 -8
  605. package/src/update/transactional-install.d.mts +3 -1
  606. package/src/update/transactional-install.mjs +545 -12
  607. package/src/update/windows-installer-marker.d.mts +1 -0
  608. package/src/update/windows-installer-marker.mjs +44 -0
  609. package/src/usage/expected-prices.ts +8 -0
  610. package/src/usage/filter-index.ts +326 -77
  611. package/src/usage/ledger-scanner.ts +15 -0
  612. package/src/usage/link-log-fields.ts +48 -0
  613. package/src/usage/log.ts +43 -2
  614. package/src/usage/request-body.ts +37 -0
  615. package/src/web-search/loop.ts +3 -0
  616. package/src/web-search/parse.ts +21 -2
  617. package/gui/dist/assets/App-g3Cm2xhZ.js +0 -59
  618. package/gui/dist/assets/Tray-BMDkAiXy.js +0 -1
  619. package/gui/dist/assets/index-Bziu8gTy.css +0 -2
  620. package/gui/dist/assets/index-OYzhQUNP.js +0 -94
  621. package/gui/dist/classic/assets/App-CgPBKUP-.js +0 -58
  622. package/gui/dist/classic/assets/index-BR-HhNrp.js +0 -94
  623. package/gui/dist/classic/assets/quota-summary-CXKhvSmQ.js +0 -1
  624. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -48,6 +48,12 @@ export interface CodexAccountUsabilityOptions {
48
48
  * owns the cooled subscription -- follow a main the operator never chose.
49
49
  */
50
50
  requestOwnedMainCredential?: boolean;
51
+ /**
52
+ * The caller named this account explicitly (an account-qualified route). Explicit selectors are
53
+ * an operator choice outside the pool-only policy; every automatic path omits this, so a path
54
+ * that forgets it still keeps native main out of Pool rotation.
55
+ */
56
+ explicitAccountSelector?: boolean;
51
57
  }
52
58
 
53
59
  /**
@@ -57,6 +63,7 @@ export interface CodexAccountUsabilityOptions {
57
63
  */
58
64
  export type CodexAccountUnusableReason =
59
65
  | "model_not_entitled"
66
+ | "pool_only"
60
67
  | "main_hard_locked"
61
68
  | "main_traffic_blocked"
62
69
  | "legacy_pool_sentinel"
@@ -68,6 +75,11 @@ export type CodexAccountUnusableReason =
68
75
  | "validation_pending"
69
76
  | "duplicate_main";
70
77
 
78
+ /** `codexPool.poolOnly` (#7410): automatic Pool resolution never serves native main. */
79
+ export function codexPoolOnlyExcludesMain(config: Pick<OcxConfig, "codexPool"> | undefined): boolean {
80
+ return config?.codexPool?.poolOnly === true;
81
+ }
82
+
71
83
  /**
72
84
  * The single source of truth for both selection and its explanation. `isCodexAccountUsable()` is
73
85
  * this function's boolean projection rather than a parallel copy of the same branches, so a reason
@@ -82,6 +94,7 @@ export function codexAccountUnusableReason(
82
94
  return "model_not_entitled";
83
95
  }
84
96
  if (accountId === MAIN_CODEX_ACCOUNT_ID) {
97
+ if (codexPoolOnlyExcludesMain(config) && options.explicitAccountSelector !== true) return "pool_only";
85
98
  if (isMainAccountHardLocked(config)) return "main_hard_locked";
86
99
  // Startup recovery owns the physical auth/vault boundary. Never parse or select
87
100
  // native __main__ while an encrypted switch journal is pending or inconclusive.
@@ -2,8 +2,8 @@ import { getMainAccountExternalUsageWarning, type MainAccountExternalUsageWarnin
2
2
  import { codexCreditsDtoField, hasCodexCreditsObservation, pruneCodexCredits } from "../credits";
3
3
  import type { CodexCredits } from "../credits";
4
4
  import { codexAccountLogLabel } from "../account-label";
5
- import { poolQuotaHistoryIdentity, getCodexAccountCredential, getValidCodexToken, isCodexAccountGenerationLive, readCodexAccountRecord } from "../account-store";
6
- import { getAccountQuota, isCodexQuotaExhausted, setAccountQuotaFromParsed, withoutRetiredCodexQuota } from "../quota";
5
+ import { codexAccountRecordFromSnapshot, loadCodexAccountRecordSnapshot, poolQuotaHistoryIdentity, poolQuotaHistoryIdentityOf, getCodexAccountCredential, getValidCodexToken, isCodexAccountGenerationLive, readCodexAccountRecord } from "../account-store";
6
+ import { getAccountQuota, getAccountWeeklyQuotaConflicts, isCodexQuotaExhausted, setAccountQuotaFromParsed, withoutRetiredCodexQuota } from "../quota";
7
7
  import type { StoredAccountQuota } from "../quota";
8
8
  import { ConfigMutationLockError, mutatePersistedConfig } from "../../config";
9
9
  import { reconcileMainCodexAccountRuntimeState } from "../account-lifecycle";
@@ -23,6 +23,7 @@ import { getMainAccountHardLockStatus } from "../main-account-hard-lock";
23
23
  import type { MainAccountHardLockStatus } from "../main-account-hard-lock";
24
24
  import { emailMaskingEnabled, projectEmail } from "../../lib/privacy";
25
25
  import type { CodexAccount, OcxConfig } from "../../types";
26
+ import type { CodexAccountCredentialRecord } from "../../types";
26
27
  import { oauthAccountHealthFields, projectCodexAccountHealth } from "../../oauth/health";
27
28
  import type { OAuthAccountHealth, OAuthHealthLabel } from "../../oauth/health";
28
29
  import { isSelectableCodexPoolAccount } from "../account-id";
@@ -105,6 +106,15 @@ export type CodexAccountReauthReason =
105
106
  | "unauthorized"
106
107
  | "forbidden";
107
108
 
109
+ /** One store read for a lone row; same fail-closed shape as `poolQuotaHistoryIdentity`. */
110
+ function readPoolRecordOnce(accountId: string): CodexAccountCredentialRecord | null {
111
+ try {
112
+ return codexAccountRecordFromSnapshot(loadCodexAccountRecordSnapshot(), accountId);
113
+ } catch {
114
+ return null;
115
+ }
116
+ }
117
+
108
118
  export function poolAccountDto(
109
119
  config: OcxConfig,
110
120
  account: CodexAccount,
@@ -114,6 +124,11 @@ export function poolAccountDto(
114
124
  priority: number,
115
125
  maskEmails: boolean,
116
126
  upstreamAccountKey?: string,
127
+ /**
128
+ * This account's credential record from the caller's one store snapshot. A roster listing
129
+ * passes it so the row costs no store read; a lone caller omits it and the row reads once.
130
+ */
131
+ storeRecord?: CodexAccountCredentialRecord | null,
117
132
  ): CodexAuthAccountDto {
118
133
  const plan = codexPlanValue(account.plan);
119
134
  const quota = quotaForPlan(quotaResult.quota, plan);
@@ -139,6 +154,8 @@ export function poolAccountDto(
139
154
  // account took their model away and why, so name the cause they actually have to act on.
140
155
  const reauthReason: CodexAccountReauthReason | undefined = rawReauthReason ?? (health.status === "reauth_required" ? health.reason : undefined);
141
156
  const duplicateMain = configuredCodexMainDuplicate(config, account.id);
157
+ const record = storeRecord !== undefined ? storeRecord : readPoolRecordOnce(account.id);
158
+ const weeklyQuotaConflicts = getAccountWeeklyQuotaConflicts(account.id, record);
142
159
  return {
143
160
  id: account.id,
144
161
  slotId: account.id,
@@ -156,7 +173,8 @@ export function poolAccountDto(
156
173
  creditsAfterLimit: codexAccountUsesCreditsAfterLimit(config, account.id),
157
174
  useRemainingQuota: codexAccountUsesRemainingQuota(config, account.id),
158
175
  quota: quota ? { ...quota } : null,
159
- ...codexCreditsDtoField(config, account.id, poolQuotaHistoryIdentity(account.id) ?? null),
176
+ ...(weeklyQuotaConflicts.length > 0 ? { weeklyQuotaConflicts } : {}),
177
+ ...codexCreditsDtoField(config, account.id, poolQuotaHistoryIdentityOf(record) ?? null),
160
178
  needsReauth: needsReauth || health.status === "reauth_required",
161
179
  ...(reauthReason !== undefined ? { reauthReason } : {}),
162
180
  ...(duplicateMain ? {
@@ -194,6 +212,8 @@ export interface CodexAuthAccountDto {
194
212
  creditsAfterLimit?: boolean;
195
213
  useRemainingQuota?: boolean;
196
214
  quota: (StoredAccountQuota | (Omit<StoredAccountQuota, "updatedAt"> & { updatedAt: number })) | null;
215
+ /** Live weekly windows this account reported in contradiction (#8574); display only. */
216
+ weeklyQuotaConflicts?: import("../quota-window-conflict").WeeklyWindowConflict[];
197
217
  credits?: CodexCredits;
198
218
  needsReauth?: boolean;
199
219
  /**
@@ -352,6 +372,9 @@ export async function listCodexAuthAccountsSnapshot(
352
372
  });
353
373
  reconcileFreshPoolAccountPlans(runtimeConfig, planUpdates);
354
374
 
375
+ // One store snapshot for every row's history identity and credential generation, read after
376
+ // the probes settle so a refresh during them is already visible.
377
+ const storeRecords = loadCodexAccountRecordSnapshot();
355
378
  const withQuota = refreshedPool.flatMap(({ accountId, quotaResult }) => {
356
379
  const currentAccount = configuredPoolAccount(runtimeConfig, accountId);
357
380
  if (!currentAccount) return [];
@@ -365,6 +388,8 @@ export async function listCodexAuthAccountsSnapshot(
365
388
  isCodexAccountPaused(runtimeConfig, accountId),
366
389
  getCodexAccountPriority(runtimeConfig, accountId),
367
390
  maskEmails,
391
+ undefined,
392
+ codexAccountRecordFromSnapshot(storeRecords, accountId),
368
393
  )];
369
394
  }
370
395
  const resultGeneration = quotaResult.credentialGeneration ?? quotaResult.freshCredentialGeneration;
@@ -392,6 +417,7 @@ export async function listCodexAuthAccountsSnapshot(
392
417
  maskEmails,
393
418
  codexUpstreamAccountKey(identitySecret, verifiedAccountId,
394
419
  user.conflict ? undefined : user.userId),
420
+ codexAccountRecordFromSnapshot(storeRecords, accountId),
395
421
  )];
396
422
  });
397
423
  const projectSnapshot = (mainRefreshRefused = false): CodexAuthAccountsSnapshot => {
@@ -1,4 +1,5 @@
1
1
  import { withCodexAccountLogLabel } from "../account-label";
2
+ import { isCodexAccountPaused, setCodexAccountPaused } from "../account-pause";
2
3
  import { getCodexAccountCredential, markCodexAccountValidated, readCodexAccountRecord, saveCodexAccountCredential, CodexCredentialRefreshLockTimeoutError, CodexCredentialRefreshBusyError, CodexCredentialRefreshStaleError } from "../account-store";
3
4
  import { clearAccountQuota, isCodexQuotaExhausted, parseUsageQuota, poolWhamPolicyObservation, setAccountQuotaFromParsed } from "../quota";
4
5
  import type { StoredAccountQuota, WhamUsageResponse } from "../quota";
@@ -404,6 +405,11 @@ export async function handleCodexAuthLoginStart(req: Request, config: OcxConfig,
404
405
  isMain: false,
405
406
  }, accounts);
406
407
  latestConfig.codexAccounts = accounts;
408
+ // A successful login replaced the credential an automatic pause described (#8398);
409
+ // an operator pause carries no details and stays.
410
+ if (isCodexAccountPaused(latestConfig, accountId) && latestConfig.codexAccountPauseState?.[accountId]?.details) {
411
+ setCodexAccountPaused(latestConfig, accountId, false);
412
+ }
407
413
  saveRuntimeConfig(config, latestConfig);
408
414
  } else {
409
415
  const addedAccount = withCodexAccountLogLabel({ id: accountId, email, plan, isMain: false }, accounts);
@@ -28,6 +28,7 @@ import { getRuntimeConfig, saveRuntimeConfig, configuredPoolAccount } from "./ru
28
28
  import { captureConfigTopLevelRollback } from "../../config/rebase-provenance";
29
29
  import { getEffectiveCodexAutoSwitchThreshold, isCodexAccountAutoSwitchThresholdKey, parseCodexAutoSwitchThreshold, setCodexAccountAutoSwitchThresholdOverride } from "../account-auto-switch";
30
30
  import { withCodexAccountPauseGroup } from "./account-pause-group";
31
+ import { PERMANENT_PAUSE_REASONS } from "../../oauth/account-resume-health";
31
32
 
32
33
  export async function handleCodexAuthAPI(
33
34
  req: Request,
@@ -99,20 +100,52 @@ export async function handleCodexAuthAPI(
99
100
  }
100
101
 
101
102
  if (url.pathname === "/api/codex-auth/accounts/pause" && req.method === "PUT") {
102
- const body = await req.json().catch(() => ({})) as { id?: unknown; paused?: unknown };
103
+ const body = await req.json().catch(() => ({})) as { id?: unknown; paused?: unknown; ifHealthy?: unknown };
103
104
  const id = typeof body.id === "string" ? body.id.trim() : "";
104
105
  if (id !== MAIN_CODEX_ACCOUNT_ID && !isValidCodexAccountId(id)) {
105
106
  return jsonResponse({ error: "Invalid account id format" }, 400);
106
107
  }
107
108
  if (typeof body.paused !== "boolean") return jsonResponse({ error: "paused must be a boolean" }, 400);
109
+ if (body.ifHealthy !== undefined && typeof body.ifHealthy !== "boolean") return jsonResponse({ error: "ifHealthy must be a boolean" }, 400);
110
+ if (body.ifHealthy === true && body.paused !== false) return jsonResponse({ error: "ifHealthy applies only to a resume (paused: false)" }, 400);
108
111
 
109
- const runtimeConfig = getRuntimeConfig(config);
112
+ let runtimeConfig = getRuntimeConfig(config);
110
113
  const exists = id === MAIN_CODEX_ACCOUNT_ID
111
114
  || (runtimeConfig.codexAccounts ?? []).some(account => isSelectableCodexPoolAccount(account) && account.id === id);
112
115
  if (!exists) return jsonResponse({ error: "Account not found" }, 404);
116
+ let healthPauseRevision: string | undefined;
117
+ if (body.ifHealthy === true) {
118
+ // Explicit resume gated on a forced pool quota read (#8398); the read can take a while, so
119
+ // the pause is committed against the configuration as it is after the read.
120
+ const { checkCodexResumeHealth } = await import("../account-resume-health");
121
+ const verdict = await checkCodexResumeHealth(runtimeConfig, id);
122
+ runtimeConfig = getRuntimeConfig(config);
123
+ const refusal = verdict && !verdict.ok ? verdict.reason
124
+ : verdict && (!isCodexAccountPaused(runtimeConfig, id) || runtimeConfig.codexAccountPauseState?.[id]?.revision !== verdict.pauseRevision)
125
+ ? "account_changed" : undefined;
126
+ if (refusal) return jsonResponse({ error: `account was not resumed: ${refusal}`, code: "resume_refused", reason: refusal, id }, 409);
127
+ // Not paused when checked: a no-op that never enters the pause group.
128
+ if (!verdict) return jsonResponse({ ok: true, id, paused: false, unchanged: true, activeCodexAccountId: getEffectiveActiveCodexAccountId(runtimeConfig) ?? null });
129
+ if (verdict.ok) healthPauseRevision = verdict.pauseRevision;
130
+ }
113
131
 
114
132
  const paused = body.paused;
115
133
  return withCodexAccountPauseGroup(runtimeConfig, id, accountIds => {
134
+ if (body.ifHealthy === true) {
135
+ // Recheck right before the write: the pause-group claim above can wait, and an operator
136
+ // re-pause meanwhile must not be overwritten by this health-gated resume.
137
+ runtimeConfig = getRuntimeConfig(config);
138
+ if (!isCodexAccountPaused(runtimeConfig, id) || runtimeConfig.codexAccountPauseState?.[id]?.revision !== healthPauseRevision) {
139
+ return jsonResponse({ error: "account was not resumed: account_changed", code: "resume_refused", reason: "account_changed", id }, 409);
140
+ }
141
+ }
142
+ // A linked account resumes with the named one, so a permanent reason on any of them refuses (#8398).
143
+ if (body.ifHealthy === true && accountIds.some(accountId => {
144
+ const reason = runtimeConfig.codexAccountPauseState?.[accountId]?.details?.reason;
145
+ return reason !== undefined && PERMANENT_PAUSE_REASONS.has(reason);
146
+ })) {
147
+ return jsonResponse({ error: "account was not resumed: pause_not_remote_clearable", code: "resume_refused", reason: "pause_not_remote_clearable", id }, 409);
148
+ }
116
149
  // Publish every exclusion before reconciling: a duplicate must never become the fallback.
117
150
  for (const accountId of accountIds) setCodexAccountPaused(runtimeConfig, accountId, paused);
118
151
  if (paused) {
@@ -1,4 +1,3 @@
1
- import { readFileSync } from "node:fs";
2
1
  import { join } from "node:path";
3
2
  import { getCodexAccountCredential } from "./account-store";
4
3
  import { loadConfig } from "../config";
@@ -7,7 +6,7 @@ import { extractAccountId } from "../oauth/chatgpt";
7
6
  import { isSelectableCodexPoolAccount, MAIN_CODEX_ACCOUNT_ID } from "./account-id";
8
7
  import { codexPlanKey } from "./plan";
9
8
  import { getObservedMainCodexCollisionIdentity, sameCodexCollisionIdentity, type CodexCollisionIdentity } from "./collision-identity";
10
- import { MAX_AUTH_BYTES, readBounded } from "./native-profile-store";
9
+ import { readNativeMainAuthBytes } from "./native-main-auth-file";
11
10
 
12
11
  export interface CodexTokens {
13
12
  access_token: string;
@@ -25,6 +24,25 @@ export type CodexTokenReadResult =
25
24
  | { status: "ok"; tokens: CodexTokens }
26
25
  | { status: "missing" | "invalid" | "unreadable" };
27
26
 
27
+ function parseCodexTokens(raw: string): CodexTokenReadResult {
28
+ try {
29
+ const j = JSON.parse(raw) as {
30
+ tokens?: { access_token?: string; account_id?: string; id_token?: string };
31
+ };
32
+ if (!j?.tokens?.access_token) return { status: "invalid" };
33
+ return {
34
+ status: "ok",
35
+ tokens: {
36
+ access_token: j.tokens.access_token,
37
+ account_id: j.tokens.account_id ?? "",
38
+ id_token: j.tokens.id_token,
39
+ },
40
+ };
41
+ } catch {
42
+ return { status: "invalid" };
43
+ }
44
+ }
45
+
28
46
  function hasErrnoCode(error: unknown, code: string): boolean {
29
47
  return typeof error === "object" && error !== null && "code" in error
30
48
  && (error as { code?: unknown }).code === code;
@@ -45,28 +63,11 @@ export function readCodexTokensResult(
45
63
  ): CodexTokenReadResult {
46
64
  let raw: string;
47
65
  try {
48
- raw = options?.bounded === true
49
- ? readBounded(authPath, MAX_AUTH_BYTES).toString("utf-8")
50
- : readFileSync(authPath, "utf-8");
66
+ raw = readNativeMainAuthBytes(authPath, options?.bounded === true ? "bounded" : "plain").toString("utf-8");
51
67
  } catch (error) {
52
68
  return { status: hasErrnoCode(error, "ENOENT") ? "missing" : "unreadable" };
53
69
  }
54
- try {
55
- const j = JSON.parse(raw) as {
56
- tokens?: { access_token?: string; account_id?: string; id_token?: string };
57
- };
58
- if (!j?.tokens?.access_token) return { status: "invalid" };
59
- return {
60
- status: "ok",
61
- tokens: {
62
- access_token: j.tokens.access_token,
63
- account_id: j.tokens.account_id ?? "",
64
- id_token: j.tokens.id_token,
65
- },
66
- };
67
- } catch {
68
- return { status: "invalid" };
69
- }
70
+ return parseCodexTokens(raw);
70
71
  }
71
72
 
72
73
  /**
@@ -132,7 +133,7 @@ export function readMainAuth(authPath = join(resolveCodexHomeDir(), "auth.json")
132
133
  const main = readCodexTokensResult(authPath, { bounded: true });
133
134
  if (main.status !== "invalid") return main;
134
135
  try {
135
- const j: unknown = JSON.parse(readBounded(authPath, MAX_AUTH_BYTES).toString("utf-8"));
136
+ const j: unknown = JSON.parse(readNativeMainAuthBytes(authPath, "bounded").toString("utf-8"));
136
137
  if (j === null || typeof j !== "object" || Array.isArray(j)) return main;
137
138
  const envelope = j as { auth_mode?: unknown; OPENAI_API_KEY?: unknown; tokens?: unknown };
138
139
  const apiKeyOnly = envelope.tokens == null
@@ -25,7 +25,7 @@ import {
25
25
  import { isAccountNeedsReauth, markAccountNeedsReauth } from "./account-runtime-state";
26
26
  import { ConfigMutationLockError } from "../config";
27
27
  import { NativeProfileError } from "./native-profile-types";
28
- import { codexAccountUnusableReason, isCodexAccountUsable } from "./account-usability";
28
+ import { codexAccountUnusableReason, codexPoolOnlyExcludesMain, isCodexAccountUsable } from "./account-usability";
29
29
  import { reconcileMainCodexAccountRuntimeState } from "./account-lifecycle";
30
30
  import {
31
31
  MAIN_CODEX_ACCOUNT_ID,
@@ -1109,6 +1109,10 @@ async function resolveCodexAuthContextUnannotated(
1109
1109
  throw new CodexReserveUnavailableError();
1110
1110
  }
1111
1111
  const fixedAccountId = reserve ? MAIN_CODEX_ACCOUNT_ID : options.accountId;
1112
+ // #7410: automatic Pool resolution under `codexPool.poolOnly` never serves native main. Explicit
1113
+ // selectors (fixed account, Reserve) and Direct mode are operator choices outside the policy.
1114
+ // Read from the routing config, the same object the shared usability decision reads.
1115
+ const poolOnlyApplies = mode === "pool" && fixedAccountId === undefined && codexPoolOnlyExcludesMain(config);
1112
1116
  const quotaScope = codexQuotaScopeForModel(options.modelId);
1113
1117
  // Pool pins and fallback must not resurrect an observed main credential that is cooling
1114
1118
  // down. Unrelated caller-owned credentials and explicit Direct keep their own policy.
@@ -1226,7 +1230,7 @@ async function resolveCodexAuthContextUnannotated(
1226
1230
  // is the one exception where that exclusion is selection evidence in the opposite direction.
1227
1231
  // Validate the caller's own gated-model roster before using it, and fall through to a Pool model
1228
1232
  // detour when it lacks the grant. This branch performs no physical-main credential read.
1229
- if (preserveRequestOwnedMainPin()) {
1233
+ if (!poolOnlyApplies && preserveRequestOwnedMainPin()) {
1230
1234
  const callerEntitled = !options.modelId
1231
1235
  || !ACCOUNT_GATED_NATIVE_OPENAI_MODELS.has(options.modelId)
1232
1236
  || await (
@@ -1306,6 +1310,7 @@ async function resolveCodexAuthContextUnannotated(
1306
1310
  // A fileless login can change identity even while its previous expiry observation is usable.
1307
1311
  // The selector discovers it before identity-bound quota or hard-lock policy; dispatch still revalidates it.
1308
1312
  if (selectionAdmission && !nativeMainReadsForbidden && !options.isMainAccountTokenLive
1313
+ && !poolOnlyApplies
1309
1314
  && (fixedAccountId === undefined || fixedAccountId === MAIN_CODEX_ACCOUNT_ID)
1310
1315
  && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
1311
1316
  && !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
@@ -1317,7 +1322,7 @@ async function resolveCodexAuthContextUnannotated(
1317
1322
  } catch (cause) { mainDiscoveryFailure = cause; }
1318
1323
  options.signal?.throwIfAborted();
1319
1324
  }
1320
- const excludeAccountIds = nativeMainReadsForbidden
1325
+ const excludeAccountIds = nativeMainReadsForbidden || poolOnlyApplies
1321
1326
  ? new Set([MAIN_CODEX_ACCOUNT_ID])
1322
1327
  : undefined;
1323
1328
  const mainModelGrantUnobserved = excludeAccountIds?.has(MAIN_CODEX_ACCOUNT_ID) === true;
@@ -1354,6 +1359,8 @@ async function resolveCodexAuthContextUnannotated(
1354
1359
  );
1355
1360
  eligibility.deniedModelAccountIds = deniedModelAccountIds;
1356
1361
  const selectionOptions = {
1362
+ // A fixed selector (exact account, Reserve) is outside the pool-only policy (#7410).
1363
+ explicitAccountSelector: fixedAccountId !== undefined,
1357
1364
  // Temporary switch drain keeps the candidate until the atomic claim rejects
1358
1365
  // it. Retained recovery makes main wholly ineligible so pool routing continues.
1359
1366
  nativeMainSelectionOnly,
@@ -1416,6 +1423,11 @@ async function resolveCodexAuthContextUnannotated(
1416
1423
  const selected = resolution.status === "selected" ? resolution.accountId : null;
1417
1424
  affinityDecision = selected ? honestAffinityDecision(resolution.affinity, affinityKey, selected, quotaScope, options.modelId, requestScopedMainCredential && config.codexPool?.requestOwnedAffinity !== true) : resolution.affinity;
1418
1425
  transientProbe = resolution.status === "selected" ? resolution.transientProbe : undefined;
1426
+ // Every selector that can still name main (sentinels, preserved actives) ends here.
1427
+ if (selected === MAIN_CODEX_ACCOUNT_ID && poolOnlyApplies) {
1428
+ releaseTransientProbeGrant();
1429
+ throw new CodexPoolAuthenticationError();
1430
+ }
1419
1431
  // Main now takes part in ordering when the request carries its own main bearer (#5019), so
1420
1432
  // selection can name it outright rather than only through the no-candidate fallback below.
1421
1433
  // Serve that selection from the credential the request arrived with: the read fence above
@@ -1441,6 +1453,7 @@ async function resolveCodexAuthContextUnannotated(
1441
1453
  if (
1442
1454
  requestScopedMainCredential
1443
1455
  && fixedAccountId === undefined
1456
+ && !poolOnlyApplies
1444
1457
  && !(callerMatchesObservedMain(headers) && policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID))
1445
1458
  && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
1446
1459
  ) {
@@ -1471,7 +1484,7 @@ async function resolveCodexAuthContextUnannotated(
1471
1484
  if (nativeMainReadsForbidden && !options.excludeAccountId) {
1472
1485
  throw new CodexMainProfileDrainingError();
1473
1486
  }
1474
- if (!nativeMainReadsForbidden && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
1487
+ if (!nativeMainReadsForbidden && !poolOnlyApplies && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
1475
1488
  && !policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID)
1476
1489
  && (!modelEligibleAccountIds || modelEligibleAccountIds.has(MAIN_CODEX_ACCOUNT_ID))) {
1477
1490
  assertMainAccountPolicy(policy);
@@ -1607,7 +1620,7 @@ async function resolveCodexAuthContextUnannotated(
1607
1620
  // The selector can retain the configured Pool account when no stored
1608
1621
  // alternate is eligible. A validated caller may still serve this request,
1609
1622
  // just as it can after an upstream rejection, without changing Pool state.
1610
- if (requestScopedMainCredential && fixedAccountId === undefined
1623
+ if (requestScopedMainCredential && fixedAccountId === undefined && !poolOnlyApplies
1611
1624
  && !(callerMatchesObservedMain(headers) && policy.pausedCodexAccountIds?.includes(MAIN_CODEX_ACCOUNT_ID))
1612
1625
  && options.excludeAccountId !== MAIN_CODEX_ACCOUNT_ID
1613
1626
  && !callerIsCooledPoolAccount(headers, config, accountId)) {
@@ -1931,6 +1944,8 @@ export function headersForCodexAuthContext(
1931
1944
 
1932
1945
  export function isCodexAuthContextUsable(ctx: CodexAuthContext, config: OcxConfig): boolean {
1933
1946
  if (ctx.kind === "main") return true;
1934
- if (ctx.kind === "main-pool") return isCodexAccountUsable(config, ctx.accountId);
1947
+ if (ctx.kind === "main-pool") {
1948
+ return isCodexAccountUsable(config, ctx.accountId, ctx.fixedAccount === true ? { explicitAccountSelector: true } : undefined);
1949
+ }
1935
1950
  return isCodexAccountUsable(config, ctx.accountId) && isCodexAccountGenerationLive(ctx.accountId, ctx.generation);
1936
1951
  }
@@ -33,6 +33,7 @@ import {
33
33
  } from "../../oauth";
34
34
  import { getAccountSet } from "../../oauth/store";
35
35
  import { mayResolveModelsOAuth } from "../../oauth/model-discovery-auth";
36
+ import { buildVertexProviderModelsRequest } from "../../providers/google-vertex-model-discovery";
36
37
  import type { OcxConfig, OcxProviderConfig } from "../../types";
37
38
  import { modelInList } from "../../types";
38
39
  import { CODEX_REASONING_LEVELS, codexEffortRank, configuredReasoningEfforts, modelRecordValue, sanitizeCodexReasoningEfforts } from "../../reasoning-effort";
@@ -129,6 +130,8 @@ export interface ModelsAuthResolution {
129
130
  readonly oauthGeneration?: string;
130
131
  readonly oauthApiBaseUrl?: string;
131
132
  readonly oauthProjectId?: string;
133
+ /** Vertex discovery credential bound to its authority (passive gathers). */
134
+ readonly vertexAuth?: import("../../providers/google-vertex-model-discovery").VertexDiscoveryAuth;
132
135
  }
133
136
 
134
137
  export type ModelsAuthResolver =
@@ -332,6 +335,7 @@ export function captureTrustedOpenAiApiPolicy(
332
335
  });
333
336
  }
334
337
 
338
+ /** Capture credential-free and sentinel-bearing model discovery requests for flight deduplication. */
335
339
  export function captureModelsRequest(
336
340
  name: string,
337
341
  provider: OcxProviderConfig,
@@ -339,8 +343,10 @@ export function captureModelsRequest(
339
343
  workbuddy?: import("../../oauth/types").WorkBuddyOAuthMetadata,
340
344
  ): CapturedModelsRequest {
341
345
  const observed = { oauthApiBaseUrl, workbuddy };
342
- const withoutCredential = buildModelsRequest(provider, undefined, name, observed);
343
- const withCredential = buildModelsRequest(provider, REQUEST_CREDENTIAL_SENTINEL, name, observed);
346
+ const withoutCredential = buildVertexProviderModelsRequest(name, provider, undefined)
347
+ ?? buildModelsRequest(provider, undefined, name, observed);
348
+ const withCredential = buildVertexProviderModelsRequest(name, provider, REQUEST_CREDENTIAL_SENTINEL)
349
+ ?? buildModelsRequest(provider, REQUEST_CREDENTIAL_SENTINEL, name, observed);
344
350
  const method = withoutCredential.method ?? "GET";
345
351
  if (withoutCredential.url !== withCredential.url || method !== (withCredential.method ?? "GET")) {
346
352
  throw new TypeError(`Provider model discovery URL for ${name} depends on credential bytes.`);
@@ -414,6 +420,7 @@ export function captureProviderGather(
414
420
  ...(resolved.spec ? { spec: resolved.spec } : {}),
415
421
  maxResponseBytes: resolved.maxResponseBytes,
416
422
  maxModels: resolved.maxModels,
423
+ ...(resolved.skipInvalidRows ? { skipInvalidRows: true as const } : {}),
417
424
  });
418
425
  const trustedOpenAiApi = captureTrustedOpenAiApiPolicy(name, registryTransportMatch);
419
426
  const policy = detachedFrozen({
@@ -431,6 +438,7 @@ export function captureProviderGather(
431
438
  preferFirst: capturedField(discovery.spec, "preferFirst"),
432
439
  maxResponseBytes: discovery.maxResponseBytes,
433
440
  maxModels: discovery.maxModels,
441
+ skipInvalidRows: discovery.skipInvalidRows === true,
434
442
  trustedOpenAiApi,
435
443
  });
436
444
  const effectiveAlias = effectiveProviderAliasDecision(name, configured, config);
@@ -1,4 +1,6 @@
1
1
  import type { VendorContextInference } from "./vendor-context";
2
+ import type { MultiAgentMode } from "../../types/multi-agent";
3
+ export type { MultiAgentMode } from "../../types/multi-agent";
2
4
  import { retainedNativeInheritanceTemplate } from "./native-template";
3
5
  export { findSupportedNativeTemplate } from "./native-template";
4
6
  import { isCodexControlPlaneModel } from "../control-plane-models";
@@ -594,8 +596,6 @@ export function ensureStrictCatalogFields(
594
596
  return ensureAutoCompactTokenLimit(entry);
595
597
  }
596
598
 
597
- export type MultiAgentMode = "v1" | "default" | "v2";
598
-
599
599
  export interface MultiAgentModeOptions {
600
600
  /** Caller-owned source metadata already defines the default for these projected rows. */
601
601
  preserveDefaultMultiAgentVersion?: (entry: RawEntry) => boolean;
@@ -665,6 +665,9 @@ export function applyRoutedCodexToolMode(
665
665
  * `keepNativeChatGptOnV1` only applies when `mode === "v2"`. It leaves Sol/Terra
666
666
  * (and other ChatGPT-native rows) on v1 so a native parent can still spawn a
667
667
  * routed child. See issue #92.
668
+ *
669
+ * `"v2-plaintext"` stamps every row v2, ChatGPT-native rows included -- the mode is
670
+ * the plaintext-delivery opt-in, so no native/routed split applies.
668
671
  */
669
672
  export function applyMultiAgentMode(
670
673
  entries: RawEntry[],
@@ -743,9 +746,10 @@ export function applyMultiAgentMode(
743
746
  }
744
747
  return entries;
745
748
  }
749
+ const forcedVersion = mode === "v2-plaintext" ? "v2" : mode;
746
750
  for (const entry of entries) {
747
751
  recordMultiAgentOrigin(entry);
748
- entry.multi_agent_version = mode;
752
+ entry.multi_agent_version = forcedVersion;
749
753
  }
750
754
  return entries;
751
755
  }