@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
@@ -28,6 +28,8 @@ import {
28
28
  import { CATALOG_INACTIVE_REASON_FIELD, SPAWN_PRIORITY_FIELD } from "./subagent-roster";
29
29
  import { OCX_NATIVE_SOURCE_PRIORITY_FIELD } from "./native-priority";
30
30
  import { applyRoutedDescription } from "./ownership";
31
+ import { applyRoutedCatalogDefaults } from "./routed-defaults";
32
+ import type { RoutedCatalogDefaults } from "../../config/schema/routed-catalog-defaults";
31
33
 
32
34
  export function finishUpstreamNativeEntry(clone: RawEntry, priority: number, contextCap?: NativeContextLimitsInput): RawEntry {
33
35
  if (priority !== 9) clone.priority = priority;
@@ -99,6 +101,8 @@ function preservePinnedNativeCustomReasoning(model?: CatalogModel): boolean {
99
101
  * Cria uma entrada nativa ou roteada a partir do snapshot upstream, de um clone
100
102
  * do template ou de campos mínimos. Aplica os metadados e limites pertinentes
101
103
  * sem alterar o template nem herdar sua marca de nome ou histórico de prioridade.
104
+ * `routedDefaults` (#6872) only reaches ordinary routed rows, between routed normalization
105
+ * and provider/model metadata; native rows and Codex-forward native aliases ignore it.
102
106
  */
103
107
  export function deriveEntry(
104
108
  template: RawEntry | null,
@@ -108,6 +112,7 @@ export function deriveEntry(
108
112
  model?: CatalogModel,
109
113
  exactComboSlugs: ReadonlySet<string> = new Set(),
110
114
  contextCap?: NativeContextLimitsInput,
115
+ routedDefaults?: Readonly<RoutedCatalogDefaults>,
111
116
  ): RawEntry {
112
117
  const preserveExact = isExactComboCatalogModel(model, exactComboSlugs);
113
118
  // Go exposes model-specific upstream enums; synthetic tiers mislead subagent overrides.
@@ -173,6 +178,7 @@ export function deriveEntry(
173
178
  // native tool/search/responses-lite contract while preserving the routed slug and wire id.
174
179
  if (!codexForwardNativeCapabilityAlias) {
175
180
  normalizeRoutedCatalogEntry(e, model?.parallelToolCalls === true, model?.codexToolMode);
181
+ applyRoutedCatalogDefaults(e, routedDefaults);
176
182
  } else if (model?.codexToolMode !== undefined) {
177
183
  applyRoutedCodexToolMode(e, model.codexToolMode);
178
184
  }
@@ -218,6 +224,7 @@ export function deriveEntry(
218
224
  applyRoutedDescription(entry, desc, model);
219
225
  if (isRouted) {
220
226
  applyRoutedCodexToolMode(entry, model?.codexToolMode);
227
+ if (model?.codexForwardNativeCapabilityAlias !== true) applyRoutedCatalogDefaults(entry, routedDefaults);
221
228
  applyReasoningLevels(
222
229
  entry,
223
230
  model?.reasoningEfforts,
@@ -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.`);
@@ -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
  }
@@ -53,7 +53,7 @@ import {
53
53
  } from "../../providers/service-tier";
54
54
  import type { FastPolicyAuthority } from "../../providers/fastwire";
55
55
  import { effectiveGoogleMode, getProviderRegistryEntry, providerMatchesRegistryTransport, registryEntryForProviderDestination } from "../../providers/registry";
56
- import { parseAntigravityAvailableModels, registerAntigravityDiscoveredWireModels } from "../../providers/antigravity-models";
56
+ import { discoveredAntigravityDefaultEffort, parseAntigravityAvailableModels, registerAntigravityDiscoveredWireModels } from "../../providers/antigravity-models";
57
57
  import { captureAntigravityModelObservation, recordAntigravityAccountRoster } from "../../providers/antigravity-account-roster";
58
58
  import { antigravityActiveAccountCurrent, discoverAntigravitySiblings } from "./antigravity-discovery";
59
59
  import { applyProviderContextCap, providerContextCap, resolveUnknownRoutedContextWindow } from "../../providers/context-cap";
@@ -100,7 +100,16 @@ import {
100
100
  type ProviderModelsApiItem,
101
101
  type ResolvedProviderModelDiscovery,
102
102
  } from "../../providers/model-discovery";
103
- import { extractGoogleAiStudioModelItems } from "../../providers/google-ai-studio-model-discovery";
103
+ import {
104
+ collectVertexPublisherModelPages,
105
+ countDiscoveryResponseBytes,
106
+ extractGoogleNativeModelItems,
107
+ resolveObservedVertexDiscoveryAuth,
108
+ resolveVertexDiscoveryAuth,
109
+ vertexDiscoveryAuthIsCurrent,
110
+ vertexDiscoveryDeadline,
111
+ type VertexDiscoveryAuth,
112
+ } from "../../providers/google-vertex-model-discovery";
104
113
  import { applyConfiguredHeadersLast, fetchOllamaShowEnrichment, ollamaShowEnrichable } from "../../providers/ollama-show";
105
114
  import upstreamModelsSnapshot from "../data/upstream-models.json";
106
115
  import { createAdmissionGate, ResourceAdmissionError, type AdmissionMetrics } from "../../lib/admission";
@@ -144,6 +153,7 @@ export interface ProviderModelsResult {
144
153
  }
145
154
  export const refreshingModelsAuthResolver: ModelsAuthResolver = { kind: "refreshing" };
146
155
 
156
+ /** Build a synchronous non-refreshing credential resolver from a captured auth-store buffer. */
147
157
  export function observedModelsAuthResolver(
148
158
  authStoreBuffer: Uint8Array | null,
149
159
  outcomes: CatalogGatherProviderAuthOutcome[],
@@ -153,7 +163,9 @@ export function observedModelsAuthResolver(
153
163
  resolve(name, provider) {
154
164
  if (provider.authMode === "forward") return { apiKey: undefined, observed: true };
155
165
  if (provider.authMode !== "oauth") {
156
- return { apiKey: resolveProviderApiKey(provider.apiKey), observed: true };
166
+ if (effectiveGoogleMode(name, provider) !== "vertex") return { apiKey: resolveProviderApiKey(provider.apiKey), observed: true };
167
+ const vertexAuth = resolveObservedVertexDiscoveryAuth(provider);
168
+ return { apiKey: vertexAuth?.token, observed: true, ...(vertexAuth ? { vertexAuth } : {}) };
157
169
  }
158
170
 
159
171
  const observation: OAuthActiveTokenObservation = mayResolveModelsOAuth(name, provider)
@@ -274,6 +286,9 @@ export async function fetchProviderModelsWithAuth(
274
286
  }
275
287
  return observed(configured, "authoritative");
276
288
  }
289
+ // One Vertex deadline covers ADC, the first request and every follow-up page.
290
+ const vertexDeadline = effectiveGoogleMode(name, prov) === "vertex" ? vertexDiscoveryDeadline() : undefined;
291
+ let vertexAuth: VertexDiscoveryAuth | undefined;
277
292
  const auth: ModelsAuthResolution = prov.authMode === "oauth" && !mayResolveModelsOAuth(name, prov)
278
293
  ? { apiKey: undefined, observed: resolveAuth.kind === "observed" }
279
294
  : captured.observedAuth ?? (resolveAuth.kind === "refreshing"
@@ -290,9 +305,17 @@ export async function fetchProviderModelsWithAuth(
290
305
  ...(snapshot.projectId ? { oauthProjectId: snapshot.projectId } : {}),
291
306
  }))
292
307
  .catch(() => ({ apiKey: undefined, observed: false }))
293
- : { apiKey: await resolveModelsAuthToken(name, prov), observed: false }
308
+ : {
309
+ apiKey: effectiveGoogleMode(name, prov) === "vertex"
310
+ ? (vertexAuth = await resolveVertexDiscoveryAuth(prov, vertexDeadline))?.token
311
+ : await resolveModelsAuthToken(name, prov),
312
+ observed: false,
313
+ }
294
314
  : resolveAuth.resolve(name, prov));
295
315
  const apiKey = auth.apiKey;
316
+ // A passive gather's Vertex credential (always an API key) arrives already bound to its authority.
317
+ vertexAuth ??= auth.vertexAuth;
318
+ const vertexSendGuard = vertexDeadline !== undefined && prov.authMode !== "oauth";
296
319
  if ((prov.authMode === "oauth" && !apiKey) || isProviderApiKeyPaused(prov)) {
297
320
  return observed(configured, "degraded");
298
321
  }
@@ -681,6 +704,9 @@ export async function fetchProviderModelsWithAuth(
681
704
  "degraded",
682
705
  );
683
706
  }
707
+ if (effectiveGoogleMode(name, prov) === "vertex" && !apiKey) {
708
+ return observed(withConfiguredRetention(withVertexDefaultSeed(configured)), "degraded");
709
+ }
684
710
  // The captured request predates any refresh, so a refreshing gather rebuilds it
685
711
  // from the auth it resolved: the token and its origin, together.
686
712
  const request = resolveAuth.kind === "refreshing" && name !== "anthropic2"
@@ -736,7 +762,9 @@ export async function fetchProviderModelsWithAuth(
736
762
  // name matches any baseUrl by design. Retargeted or renamed custom rows
737
763
  // fetch a different URL and keep the rejection.
738
764
  if (!maySendAnthropicDiscovery()) return observed(withConfiguredRetention(failedDiscoveryConfigured), "degraded");
739
- const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl, beforeSend: maySendAnthropicDiscovery };
765
+ const outboundDependencies = { isCanonicalUrl: isRegistryModelDiscoveryUrl,
766
+ beforeSend: () => maySendAnthropicDiscovery()
767
+ && (!vertexSendGuard || (vertexAuth !== undefined && vertexDiscoveryAuthIsCurrent(prov, vertexAuth, headers))) };
740
768
  const antigravityObservation = cloudCodeAssist ? captureAntigravityModelObservation() : undefined;
741
769
  const res = request.method === "POST"
742
770
  ? await providerOutboundPost(name, prov, url, {
@@ -746,7 +774,7 @@ export async function fetchProviderModelsWithAuth(
746
774
  }, outboundDependencies)
747
775
  : await providerOutboundGet(name, prov, url, {
748
776
  headers,
749
- signal: AbortSignal.timeout(8000),
777
+ signal: vertexDeadline ?? AbortSignal.timeout(8000),
750
778
  }, outboundDependencies);
751
779
  const redirectError = await providerRedirectError(res, url);
752
780
  if (redirectError) {
@@ -771,7 +799,8 @@ export async function fetchProviderModelsWithAuth(
771
799
  const contentType = (
772
800
  res.headers.get("content-type")?.split(";", 1)[0]?.trim().toLowerCase() || "missing"
773
801
  ).slice(0, 80);
774
- const bounded = await readBoundedDiscoveryJson(res, discovery.maxResponseBytes);
802
+ const vertexFirstPage = vertexDeadline ? countDiscoveryResponseBytes(res) : undefined;
803
+ const bounded = await readBoundedDiscoveryJson(vertexFirstPage?.response ?? res, discovery.maxResponseBytes);
775
804
  if (!bounded.ok) {
776
805
  const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
777
806
  const diagnostic = bounded.reason === "response_too_large"
@@ -819,7 +848,7 @@ export async function fetchProviderModelsWithAuth(
819
848
  ...(model.effortWireModelIds ? {
820
849
  antigravityEffortWireModelIds: model.effortWireModelIds,
821
850
  suppressSyntheticMax: true,
822
- defaultReasoningEffort: model.effortWireModelIds.medium ? "medium" : "high",
851
+ defaultReasoningEffort: discoveredAntigravityDefaultEffort(model.id, !!model.effortWireModelIds.medium),
823
852
  } : {}),
824
853
  ...(model.contextWindow ? { contextWindow: model.contextWindow } : {}),
825
854
  ...(model.inputModalities ? { inputModalities: model.inputModalities } : {}),
@@ -844,14 +873,24 @@ export async function fetchProviderModelsWithAuth(
844
873
  markProviderDiscoveryOk(name, live.length);
845
874
  return observed(withConfiguredRetention(azureMetadata ? live : forCache, { warnDrops: true }), "authoritative");
846
875
  }
847
- const googleAiStudio = effectiveGoogleMode(name, prov) === "ai-studio"
848
- ? extractGoogleAiStudioModelItems(bounded.value, discovery.maxModels)
849
- : undefined;
850
- // Native /v1beta/models wins; a google row served by an OpenAI-compatible
876
+ const listing = effectiveGoogleMode(name, prov) === "vertex"
877
+ ? await collectVertexPublisherModelPages(url, bounded.value,
878
+ { ...discovery, firstPageBytes: vertexFirstPage?.bytes(), signal: vertexDeadline },
879
+ (pageUrl, signal) => providerOutboundGet(name, prov, pageUrl, { headers, signal }, outboundDependencies))
880
+ : { ok: true as const, value: bounded.value };
881
+ if (!listing.ok) {
882
+ const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
883
+ if (shouldLog) {
884
+ console.warn(
885
+ `[opencodex] Provider model discovery for "${name}" returned an incomplete paginated listing (${listing.diagnostic}) [status=${res.status}, contentType=${contentType}, urlClass=${urlClass}, fallback=${fallback}].`,
886
+ );
887
+ }
888
+ return observed(models, "degraded");
889
+ }
890
+ const googleNative = extractGoogleNativeModelItems(name, prov, listing.value, discovery.maxModels);
891
+ // Native Google discovery wins; a google row served by an OpenAI-compatible
851
892
  // gateway keeps the generic data[] / top-level-array contract.
852
- const extracted = googleAiStudio?.ok
853
- ? googleAiStudio
854
- : extractProviderModelItems(bounded.value, discovery);
893
+ const extracted = googleNative ?? extractProviderModelItems(listing.value, discovery);
855
894
  if (!extracted.ok) {
856
895
  const { models, fallback, shouldLog } = failedDiscoveryFallback({ reason: "invalid_response" });
857
896
  const diagnostic: Record<ModelDiscoveryResponseFailure, string> = {
@@ -1,5 +1,5 @@
1
1
  import type { OcxConfig } from "../../types";
2
- import { isEffectiveCodexDesktopAuthless } from "../loopback-target";
2
+ import { isEffectiveCodexReserve } from "../loopback-target";
3
3
  import { NATIVE_RESERVE_MODEL } from "./native-models";
4
4
 
5
5
  /**
@@ -14,9 +14,9 @@ import { NATIVE_RESERVE_MODEL } from "./native-models";
14
14
  * inputs that produced the omission are still in scope.
15
15
  *
16
16
  * Deliberately scoped to an operator who asked for the feature. A default install has
17
- * `codexDesktopAuthless` unset, wants no Reserve row, and must not be told about one. An install
18
- * that stores the flag on a bind where it cannot take effect is a different silence, already
19
- * reported as `inertReason` by `describeCodexDesktopSwitches`, and is not repeated here.
17
+ * `codexReserveEnabled` off, wants no Reserve row, and must not be told about one. An install
18
+ * that enables Reserve on a bind where it cannot take effect is a different silence and is not
19
+ * repeated here.
20
20
  */
21
21
  export type ReserveCatalogSuppressionReason =
22
22
  | "no-canonical-openai-provider"
@@ -30,6 +30,8 @@ type ReserveSuppressionConfig = Pick<
30
30
  | "hostname"
31
31
  | "unauthenticatedLoopbackListener"
32
32
  | "codexDesktopAuthless"
33
+ | "codexReserveEnabled"
34
+ | "codexReserveMigration"
33
35
  | "codexAccountNamespaces"
34
36
  | "codexAccountPickerEnabled"
35
37
  >;
@@ -45,7 +47,7 @@ export function reserveCatalogSuppressionReason(
45
47
  config: ReserveSuppressionConfig,
46
48
  input: ReserveSuppressionInput,
47
49
  ): ReserveCatalogSuppressionReason | undefined {
48
- if (!isEffectiveCodexDesktopAuthless(config) || input.mainSelectors.length > 0) return undefined;
50
+ if (!isEffectiveCodexReserve(config) || input.mainSelectors.length > 0) return undefined;
49
51
  if (!input.includeAccountBoundNativeOpenAi) return "no-canonical-openai-provider";
50
52
  // Checked before the empty-map case: when an operator has explicitly turned the picker off,
51
53
  // naming the empty map would send them to hand-author selectors that the opt-in generates.
@@ -1,5 +1,5 @@
1
1
  import type { OcxConfig } from "../../types";
2
- import { isEffectiveCodexDesktopAuthless } from "../loopback-target";
2
+ import { isEffectiveCodexReserve } from "../loopback-target";
3
3
  import { CODEX_ACCOUNT_BOUND_CATALOG_KIND } from "./account-models";
4
4
  import { NATIVE_RESERVE_MODEL } from "./native-models";
5
5
  import type { RawEntry } from "./parsing";
@@ -17,12 +17,13 @@ export interface ReserveCatalogProjection {
17
17
 
18
18
  /** The caller supplies a validated actual observation and an already context-capped Luna pin. */
19
19
  export function createReserveCatalogProjection(
20
- config: Pick<OcxConfig, "runtimeRole" | "hostname" | "unauthenticatedLoopbackListener" | "codexDesktopAuthless">,
20
+ config: Pick<OcxConfig, "runtimeRole" | "hostname" | "unauthenticatedLoopbackListener" | "codexDesktopAuthless"
21
+ | "codexReserveEnabled" | "codexReserveMigration">,
21
22
  mainSelectors: readonly string[],
22
23
  observedSource: RawEntry | null,
23
24
  lunaSource: RawEntry | null,
24
25
  ): ReserveCatalogProjection | undefined {
25
- if (!isEffectiveCodexDesktopAuthless(config) || mainSelectors.length === 0) return undefined;
26
+ if (!isEffectiveCodexReserve(config) || mainSelectors.length === 0) return undefined;
26
27
  const original = observedSource ?? lunaSource;
27
28
  if (!original) return undefined;
28
29
  const source = structuredClone(original);
@@ -4,6 +4,8 @@ import { existsSync, readFileSync } from "node:fs";
4
4
  import { join } from "node:path";
5
5
  import { initializeConfigOwnership } from "../../lib/config-ownership";
6
6
  import { getConfigDir, loadConfig, ultraFastTierEnabled, websocketsEnabled, withConfigMutationLockSync } from "../../config";
7
+ import { resolveMultiAgentMode } from "../../config/multi-agent-surface";
8
+ import { resolveRoutedCatalogDefaults } from "../../config/schema/routed-catalog-defaults";
7
9
  import { shouldSyncCodexOnStart } from "../desired-state";
8
10
  import { legacyCustomModelCatalogSlugs } from "../custom-model-catalog-migration";
9
11
  import { getCodexHome } from "../paths";
@@ -334,7 +336,7 @@ function writeRetainedCatalogSync({
334
336
  catalogModelsForMerge,
335
337
  );
336
338
  const modelPickerOrder = config.modelPickerOrder ?? [];
337
- const multiAgentMode: MultiAgentMode = config.multiAgentMode === "v1" || config.multiAgentMode === "v2" ? config.multiAgentMode : "default";
339
+ const multiAgentMode: MultiAgentMode = resolveMultiAgentMode(config);
338
340
  const exactComboSlugs = exactComboCatalogSlugs(config);
339
341
  const bareEligibleAccountIds = providerCodexAccountMode(
340
342
  OPENAI_CODEX_PROVIDER_ID,
@@ -465,6 +467,7 @@ function writeRetainedCatalogSync({
465
467
  disabledNativeAccountSlugs: new Set(),
466
468
  multiAgentV2Enabled,
467
469
  openaiContextCap,
470
+ routedCatalogDefaults: resolveRoutedCatalogDefaults(config),
468
471
  });
469
472
  // Keep genuine native entries (gpt-*, codex-*) with their real per-model fields and append
470
473
  // routed providers as namespaced slugs. Cursor and other adopted providers can expose model ids
@@ -0,0 +1,35 @@
1
+ import type { RoutedCatalogDefaults } from "../../config/schema/routed-catalog-defaults";
2
+ import type { RawEntry } from "./parsing";
3
+
4
+ /**
5
+ * Project operator `routedCatalogDefaults` (#6872) onto a freshly derived routed row.
6
+ *
7
+ * `deriveEntry` calls this after the inherited template has been normalized for routing and
8
+ * before provider/model metadata is applied, which fixes the precedence: concrete provider/model
9
+ * declarations > these defaults > template values > strict-field fallbacks. The final
10
+ * `ensureStrictCatalogFields` pass still removes `default_verbosity` from a row whose
11
+ * `support_verbosity` ended up false, so a model without verbosity support never advertises an
12
+ * operator default. Verbosity support itself is never set here: it stays the provider's,
13
+ * model's or template's own declaration.
14
+ *
15
+ * Only the four allowlisted serialized fields are written. Values of any other type are ignored,
16
+ * so a caller that bypassed config validation cannot smuggle other row fields through here.
17
+ */
18
+ export function applyRoutedCatalogDefaults(
19
+ entry: RawEntry,
20
+ defaults: Readonly<RoutedCatalogDefaults> | undefined,
21
+ ): void {
22
+ if (!defaults) return;
23
+ if (typeof defaults.includeSkillsUsageInstructions === "boolean") {
24
+ entry.include_skills_usage_instructions = defaults.includeSkillsUsageInstructions;
25
+ }
26
+ if (typeof defaults.includeAppsUsageInstructions === "boolean") {
27
+ entry.include_apps_usage_instructions = defaults.includeAppsUsageInstructions;
28
+ }
29
+ if (typeof defaults.includePluginUsageInstructions === "boolean") {
30
+ entry.include_plugin_usage_instructions = defaults.includePluginUsageInstructions;
31
+ }
32
+ if (defaults.defaultVerbosity === "low" || defaults.defaultVerbosity === "medium" || defaults.defaultVerbosity === "high") {
33
+ entry.default_verbosity = defaults.defaultVerbosity;
34
+ }
35
+ }
@@ -791,7 +791,7 @@ async function gatherRoutedModelsUncached(
791
791
  // ponytail: catalog-scale scan; index ids by provider if catalog growth makes this measurable.
792
792
  const aliasDisplayNames = new Map(activeProviders.flatMap(({ name, provider }) => {
793
793
  const providerModels = models.filter(model => model.provider === name);
794
- const aliases = [...effectiveModelAliases(config, provider, providerModels.map(model => model.id))];
794
+ const aliases = [...effectiveModelAliases(config, provider, providerModels.map(model => model.id), name)];
795
795
  return aliases.flatMap(([id, { alias }]) => {
796
796
  const exact = providerModels.filter(model => model.id === id);
797
797
  const matches = exact.length > 0
@@ -57,6 +57,16 @@ let clientFanout: CatalogChangedClientFanout | null = null;
57
57
  export function setCatalogAutoRefreshClientFanout(fanout: CatalogChangedClientFanout | null): void {
58
58
  clientFanout = fanout;
59
59
  }
60
+ /**
61
+ * Notified after a tick committed a changed catalog. Owned by the link Child-ops scheduler, which registers only while
62
+ * this Home has links, so a Home without links pays one null check. Synchronous and fire-and-forget: the scheduler
63
+ * debounces and does its own work later.
64
+ */
65
+ export type CatalogChangedLinkFanout = () => void;
66
+ let linkFanout: CatalogChangedLinkFanout | null = null;
67
+ export function setCatalogAutoRefreshLinkFanout(fanout: CatalogChangedLinkFanout | null): void {
68
+ linkFanout = fanout;
69
+ }
60
70
 
61
71
  /** Read only a regular file, with a byte limit even if it grows after the stat. */
62
72
  function readBoundedRegularFile(path: string, maxBytes: number): string | null {
@@ -262,6 +272,7 @@ async function tick(): Promise<void> {
262
272
  if (entryGeneration !== generation) return;
263
273
  recordCatalogAutoRefreshOutcome(outcome.catalogRefresh, outcome.changed, reloadRequired);
264
274
  if (outcome.changed) {
275
+ try { linkFanout?.(); } catch { /* the scheduler's 5-minute poll catches the change */ }
265
276
  // Privacy scan: no provider names, model ids, paths, or account identifiers.
266
277
  console.info(reloadRequired
267
278
  ? "[catalog-auto-refresh] served model set changed; running Codex sessions keep the old list until restarted (ocx sync --restart-codex)"
@@ -104,23 +104,45 @@ function parseStoreBody(body: string | null): Store {
104
104
  || typeof job.createdAt !== "string" || typeof job.updatedAt !== "string")) throw new Error("invalid_store");
105
105
  return value;
106
106
  }
107
+ /**
108
+ * Readers take no lock, and writers replace the ledger with a renamed private temp file. A rename that
109
+ * lands after this read's open unlinks the file it opened (no link left) and makes the path name a
110
+ * newer one; either is a concurrent write, so the read starts over. Each attempt applies every check, a
111
+ * hard-linked file is still refused at once, and a store that is still being replaced at the last
112
+ * attempt is refused like any other unsafe store.
113
+ */
114
+ const REPLACED_STORE_READ_ATTEMPTS = 5;
115
+ type StoreReadStage = "opened" | "descriptor-checked";
116
+ let storeReadHookForTests: ((stage: StoreReadStage) => void) | null = null;
117
+ /** Test seam: runs inside each read attempt, after the open and after the descriptor checks. */
118
+ export function setCodexCliJobStoreReadHookForTests(hook: ((stage: StoreReadStage) => void) | null): void {
119
+ storeReadHookForTests = hook;
120
+ }
107
121
  function readStore(configDir?: string): Store {
108
122
  let p: ReturnType<typeof paths>;
109
123
  try { p = prepare(configDir); }
110
124
  catch (error) { if ((error as NodeJS.ErrnoException).code === "ENOENT") return { version: 1, jobs: [] }; throw error; }
111
- let fd: number | undefined;
112
- try {
113
- fd = openSync(p.file, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
114
- const stat = fstatSync(fd);
115
- if (!stat.isFile() || stat.size > CODEX_CLI_JOB_STORE_MAX_BYTES || (stat.mode & 0o077) !== 0
116
- || stat.uid !== process.geteuid?.() || stat.nlink !== 1) throw new Error("unsafe_store");
117
- const lexical = lstatSync(p.file);
118
- if (lexical.isSymbolicLink() || lexical.dev !== stat.dev || lexical.ino !== stat.ino) throw new Error("unsafe_store");
119
- const bytes = Buffer.alloc(CODEX_CLI_JOB_STORE_MAX_BYTES + 1);
120
- const length = readSync(fd, bytes, 0, bytes.length, 0);
121
- if (length > CODEX_CLI_JOB_STORE_MAX_BYTES) throw new Error("unsafe_store");
122
- return parseStoreBody(bytes.subarray(0, length).toString("utf8"));
123
- } finally { if (fd !== undefined) closeSync(fd); }
125
+ for (let attempt = 1; ; attempt++) {
126
+ let fd: number | undefined;
127
+ try {
128
+ fd = openSync(p.file, constants.O_RDONLY | constants.O_NOFOLLOW | constants.O_NONBLOCK);
129
+ storeReadHookForTests?.("opened");
130
+ const stat = fstatSync(fd);
131
+ if (!stat.isFile() || stat.size > CODEX_CLI_JOB_STORE_MAX_BYTES || (stat.mode & 0o077) !== 0
132
+ || stat.uid !== process.geteuid?.() || stat.nlink > 1) throw new Error("unsafe_store");
133
+ storeReadHookForTests?.("descriptor-checked");
134
+ const lexical = lstatSync(p.file);
135
+ if (lexical.isSymbolicLink()) throw new Error("unsafe_store");
136
+ if (stat.nlink === 0 || lexical.dev !== stat.dev || lexical.ino !== stat.ino) {
137
+ if (attempt < REPLACED_STORE_READ_ATTEMPTS) continue;
138
+ throw new Error("unsafe_store");
139
+ }
140
+ const bytes = Buffer.alloc(CODEX_CLI_JOB_STORE_MAX_BYTES + 1);
141
+ const length = readSync(fd, bytes, 0, bytes.length, 0);
142
+ if (length > CODEX_CLI_JOB_STORE_MAX_BYTES) throw new Error("unsafe_store");
143
+ return parseStoreBody(bytes.subarray(0, length).toString("utf8"));
144
+ } finally { if (fd !== undefined) closeSync(fd); }
145
+ }
124
146
  }
125
147
  function rollbackInitializingLock(p: ReturnType<typeof paths>, lockIdentity: { dev: number; ino: number }, ownerIdentity?: { dev: number; ino: number }) {
126
148
  try {
@@ -4,6 +4,7 @@ import { join } from "node:path";
4
4
  import { compareCatalogHealPaths } from "./catalog/heal-observation";
5
5
 
6
6
  import { getConfigDir, saveConfigPreservingClaudeCode, ultraFastTierEnabled, websocketsEnabled, withExpectedConfigGenerationSync } from "../config";
7
+ import { resolveMultiAgentMode } from "../config/multi-agent-surface";
7
8
  import { reconcileSuccessfulModelDiscoveries } from "../providers/new-model-policy";
8
9
  import { pendingModelSelectionProviders } from "../providers/initial-model-selection";
9
10
  import { COMBO_NAMESPACE } from "../combos";
@@ -98,6 +99,7 @@ import {
98
99
  import { ACCOUNT_GATED_NATIVE_OPENAI_MODELS } from "./catalog/native-models";
99
100
  import { providerCodexAccountMode } from "../providers/registry";
100
101
  import { OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers";
102
+ import { resolveRoutedCatalogDefaults } from "../config/schema/routed-catalog-defaults";
101
103
  import { withCatalogWriteSerialization } from "./catalog-write-serialization";
102
104
  import {
103
105
  auditRefusedCatalogReplacement,
@@ -276,8 +278,7 @@ function prepareCatalog(
276
278
  const featured = config.subagentModels ?? [];
277
279
  const ordered = orderForSubagents(enabled, featured);
278
280
  const modelPickerOrder = config.modelPickerOrder ?? [];
279
- const multiAgentMode = config.multiAgentMode === "v1" || config.multiAgentMode === "v2"
280
- ? config.multiAgentMode : "default";
281
+ const multiAgentMode = resolveMultiAgentMode(config);
281
282
  const exactComboSlugs = exactComboCatalogSlugs(config);
282
283
  const bareEligibleAccountIds = providerCodexAccountMode(
283
284
  OPENAI_CODEX_PROVIDER_ID,
@@ -351,6 +352,7 @@ function prepareCatalog(
351
352
  disabledNativeAccountSlugs: new Set(),
352
353
  multiAgentV2Enabled,
353
354
  openaiContextCap,
355
+ routedCatalogDefaults: resolveRoutedCatalogDefaults(config),
354
356
  });
355
357
  const accountBoundEntries = accountSelectors.length === 0
356
358
  ? []
@@ -1,5 +1,5 @@
1
- import { readFileSync, statSync, type BigIntStats } from 'node:fs';
2
1
  import { createHash, randomUUID } from 'node:crypto';
2
+ import { nativeAuthStatStamp, readNativeMainAuthBytesStable } from '../native-main-auth-file';
3
3
  import type { UsageIdentity } from './usage-controller';
4
4
 
5
5
  type Credential = { identity: UsageIdentity; accessToken: string };
@@ -9,14 +9,10 @@ const equal = (a: UsageIdentity, b: UsageIdentity) => a.id === b.id && a.userId
9
9
  /** Local native credentials remain in memory and are never returned by the public reader. */
10
10
  export function createNativeIdentityReader(authPath: string, upstreamFetch: typeof fetch = fetch) {
11
11
  const readerId = randomUUID(); let generation = 0, previousSnapshot: string | undefined;
12
- const stamp = (value: BigIntStats) =>
13
- `${value.dev}:${value.ino}:${value.size}:${value.mtimeNs}:${value.ctimeNs}`;
14
12
  const readCredential = (): Credential => {
15
- const before = statSync(authPath, { bigint: true });
16
- if (before.size > 1048576n) throw new Error('Unexpected native auth size');
17
- const text = readFileSync(authPath, 'utf8'), after = statSync(authPath, { bigint: true });
18
- if (stamp(before) !== stamp(after)) throw new Error('Native credentials changed during read');
19
- const snapshot = `${stamp(after)}:${createHash('sha256').update(text).digest('hex')}`;
13
+ const { bytes, stat: after } = readNativeMainAuthBytesStable(authPath, 1048576n);
14
+ const text = bytes.toString('utf8');
15
+ const snapshot = `${nativeAuthStatStamp(after)}:${createHash('sha256').update(text).digest('hex')}`;
20
16
  if (snapshot !== previousSnapshot) { previousSnapshot = snapshot; generation++; }
21
17
  const auth = JSON.parse(text);
22
18
  if (auth.auth_mode !== 'chatgpt' || typeof auth.tokens?.id_token !== 'string'
@@ -1468,9 +1468,9 @@ function activeThreadComment(content: string, v2Enabled: boolean): string | unde
1468
1468
  let legacy = (entries.find(entry => entry.key === AGENTS_THREAD_LIMIT_KEY) ?? entries[0])?.comment;
1469
1469
  for (const entry of entries) legacy = mergeTrailingComments(legacy, entry.comment) || undefined;
1470
1470
  const dedicated = tomlTableBody(content, "features.multi_agent_v2")
1471
- ?.match(/^\s*max_concurrent_threads_per_session\s*=\s*\d+(\s*#.*)$/m)?.[1];
1471
+ ?.match(/^\s*max_concurrent_threads_per_session\s*=\s*\d+([ \t]*#.*)$/m)?.[1];
1472
1472
  const features = tomlTableBody(content, "features");
1473
- const inlineLine = features?.match(/^\s*multi_agent_v2\s*=\s*\{([^}]*)\}(\s*#.*)$/m);
1473
+ const inlineLine = features?.match(/^\s*multi_agent_v2\s*=\s*\{([^}]*)\}([ \t]*#.*)$/m);
1474
1474
  const inline = inlineLine && /(?:^|,)\s*max_concurrent_threads_per_session\s*=\s*\d+\s*(?:,|$)/.test(inlineLine[1])
1475
1475
  ? inlineLine[2]
1476
1476
  : undefined;
@@ -347,6 +347,14 @@ export const HISTORY_RELABEL_STANDS_DOWN = "history_paginated_requires_native_wr
347
347
  */
348
348
  export const HISTORY_PAGINATED_OPENAI_NEEDS_ROOT_OVERRIDE = "history_paginated_openai_requires_native_writer";
349
349
 
350
+ /**
351
+ * The same paginated `openai` rows, found while the resolved Codex is 0.166 or later (#8191).
352
+ * Those builds resume or list a thread only under the provider it was created with, so the retained
353
+ * root override no longer keeps these rows reachable once the default provider changes. A hard
354
+ * refusal: nothing is relabeled or rewritten, and the transition does not happen.
355
+ */
356
+ export const HISTORY_PAGINATED_OPENAI_PROVIDER_LOCKED = "history_paginated_openai_provider_locked";
357
+
350
358
  function assertLegacyHistoryRecord(line: string): void {
351
359
  let value: unknown;
352
360
  try { value = JSON.parse(line); } catch { throw new CodexHistoryIntegrityError("history_rollout_record_invalid"); }
@@ -482,6 +490,29 @@ export function preflightCodexHistoryInjection(
482
490
  }
483
491
  }
484
492
 
493
+ /**
494
+ * Read-only: does this store hold an `openai`-tagged thread Codex has already paginated (#8191)?
495
+ * For a transition whose preflight scans no rows (client compaction relabels nothing) but which
496
+ * still makes `opencodex` the default provider. Null when the store cannot be read.
497
+ */
498
+ export function hasPaginatedOpenaiThreads(stateDbPath?: string): boolean | null {
499
+ let db: Database | undefined;
500
+ try {
501
+ const resolvedPath = stateDbPath ?? resolveCodexStateDbPath();
502
+ if (!existsSync(resolvedPath)) return false;
503
+ db = openCodexStateForPreflight(resolvedPath);
504
+ const columns = db.query<{ name: string }, []>("PRAGMA table_info(threads)").all();
505
+ if (!columns.some(column => column.name === "history_mode")) return false;
506
+ return db.query<{ hit: number }, []>(
507
+ "SELECT 1 AS hit FROM threads WHERE model_provider = 'openai' AND history_mode = 'paginated' LIMIT 1",
508
+ ).get() !== null;
509
+ } catch {
510
+ return null;
511
+ } finally {
512
+ db?.close();
513
+ }
514
+ }
515
+
485
516
  function integrityFailureResult(error: CodexHistoryIntegrityError): CodexHistorySyncResult {
486
517
  return {
487
518
  rows: error.progress.rows,