@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
@@ -214,12 +214,18 @@ export function beginAnthropicResetOperation(
214
214
  writeJournal(filePath, journal, now);
215
215
  return { kind: "execute", attempt: existing.attempts };
216
216
  }
217
+ // One unresolved claim per account, whatever grant it names: the dashboard lets the
218
+ // user pick a grant, and a stale view must not open a second claim while the first
219
+ // one's outcome is unknown. Name the newest open one, as pendingAnthropicResetOperation does.
220
+ let prior: { operationId: string; createdAt: number } | null = null;
217
221
  for (const [operationId, record] of Object.entries(journal.operations)) {
218
- if (record.status === "open" && record.accountId === identity.accountId && record.grantId === identity.grantId
219
- && record.orgDigest === identity.orgDigest && now - record.createdAt < ANTHROPIC_RESET_RETRY_WINDOW_MS) {
220
- return { kind: "unresolved-prior", operationId };
222
+ if (record.status === "open" && record.accountId === identity.accountId
223
+ && record.orgDigest === identity.orgDigest && now - record.createdAt < ANTHROPIC_RESET_RETRY_WINDOW_MS
224
+ && (!prior || record.createdAt > prior.createdAt)) {
225
+ prior = { operationId, createdAt: record.createdAt };
221
226
  }
222
227
  }
228
+ if (prior) return { kind: "unresolved-prior", operationId: prior.operationId };
223
229
  if (Object.keys(journal.operations).length >= MAX_OPERATIONS) return { kind: "capacity" };
224
230
  journal.operations[identity.operationId] = {
225
231
  accountId: identity.accountId,
@@ -7,16 +7,24 @@ export interface AntigravityEffortFamilyRow {
7
7
  provider: string;
8
8
  custom?: boolean;
9
9
  catalogKind?: string;
10
- antigravityEffortWireModelIds?: Partial<Record<"low" | "medium" | "high", string>>;
10
+ antigravityEffortWireModelIds?: Partial<Record<"low" | "medium" | "high" | "xhigh", string>>;
11
11
  }
12
12
 
13
13
  const FAMILY_EFFORTS = ["low", "medium", "high"] as const;
14
14
 
15
+ /**
16
+ * The exact wire ids of a complete discovered family: low/medium/high, plus the optional xhigh
17
+ * tier when discovery mapped it (Gemini 4 Hydrogen). Selection projection, public collapse and
18
+ * disabled-tier inheritance all read this list, so an xhigh-only selection or disable carries
19
+ * over to the collapsed base exactly as a low/medium/high one does.
20
+ */
15
21
  export function antigravityEffortFamilyIds(row: AntigravityEffortFamilyRow): string[] | undefined {
16
22
  if (row.custom || row.catalogKind === "custom-model-v1" || !row.antigravityEffortWireModelIds) return undefined;
23
+ const map = row.antigravityEffortWireModelIds;
17
24
  const ids = FAMILY_EFFORTS.map(effort => `${row.id}-${effort}`);
18
- return FAMILY_EFFORTS.every((effort, index) => row.antigravityEffortWireModelIds![effort] === ids[index])
19
- ? ids : undefined;
25
+ if (!FAMILY_EFFORTS.every((effort, index) => map[effort] === ids[index])) return undefined;
26
+ if (map.xhigh === undefined) return ids;
27
+ return map.xhigh === `${row.id}-xhigh` ? [...ids, map.xhigh] : undefined;
20
28
  }
21
29
 
22
30
  /** Retained wire targets stay routable internally; only the public list collapses. */
@@ -114,11 +114,11 @@ const ANTIGRAVITY_WIRE_IDS_BY_PICKER_MODEL: Record<string, string[]> = Object.en
114
114
  }, {});
115
115
 
116
116
  const ANTIGRAVITY_DISCOVERY_EFFORTS = ["low", "medium", "high"] as const;
117
- type AntigravityDiscoveryEffort = typeof ANTIGRAVITY_DISCOVERY_EFFORTS[number];
117
+ type AntigravityDiscoveryEffort = typeof ANTIGRAVITY_DISCOVERY_EFFORTS[number] | "xhigh";
118
118
  type AntigravityEffortWireModelIds = Partial<Record<AntigravityDiscoveryEffort, string>>;
119
119
 
120
120
  function isAntigravityDiscoveryEffort(value: string): value is AntigravityDiscoveryEffort {
121
- return (ANTIGRAVITY_DISCOVERY_EFFORTS as readonly string[]).includes(value);
121
+ return [...ANTIGRAVITY_DISCOVERY_EFFORTS, "xhigh"].includes(value as AntigravityDiscoveryEffort);
122
122
  }
123
123
 
124
124
  function pickerModelIdForDiscoveredWireId(
@@ -144,7 +144,7 @@ function pickerModelIdForDiscoveredWireId(
144
144
  if (isKnownAntigravityPickerModelId(baseId)) return baseId;
145
145
  }
146
146
 
147
- const effortMatch = /^(.*)-(low|medium|high)$/.exec(wireId);
147
+ const effortMatch = /^(.*)-(low|medium|high|xhigh)$/.exec(wireId);
148
148
  if (effortMatch) {
149
149
  const baseId = effortMatch[1]!;
150
150
  if (isValidModelDiscoveryModelId(baseId)
@@ -278,7 +278,7 @@ function completeDiscoveredEffortWireModelIds(
278
278
  const explicitEffortMap = Object.hasOwn(ANTIGRAVITY_EFFORT_WIRE_MAP, pickerId)
279
279
  ? ANTIGRAVITY_EFFORT_WIRE_MAP[pickerId] : undefined;
280
280
  if (explicitEffortMap && Object.values(explicitEffortMap).every(wireId => available.has(wireId))) {
281
- return { ...explicitEffortMap };
281
+ return { ...explicitEffortMap, ...(available.has(`${pickerId}-xhigh`) ? { xhigh: `${pickerId}-xhigh` } : {}) };
282
282
  }
283
283
 
284
284
  if (!isValidModelDiscoveryModelId(pickerId)) return undefined;
@@ -288,9 +288,28 @@ function completeDiscoveredEffortWireModelIds(
288
288
  if (!available.has(wireId)) return undefined;
289
289
  suffixEffortMap[effort] = wireId;
290
290
  }
291
+ if (available.has(`${pickerId}-xhigh`)) suffixEffortMap.xhigh = `${pickerId}-xhigh`;
291
292
  return suffixEffortMap;
292
293
  }
293
294
 
295
+ /**
296
+ * Default rung for a model known only from live discovery. Gemini 4 Hydrogen defaults to high:
297
+ * its low/medium/high/xhigh ladder and high default were verified on Vertex AI by #8583's author
298
+ * (2026-11-13). On CCA it is entitlement-gated: an account whose discovery listed the four
299
+ * `gemini-4-hydrogen-*` tiers answered an xhigh request with 200 (2026-11-12), so this applies only
300
+ * once that account's CCA discovery lists the family. Other discovered families keep medium when they have it.
301
+ */
302
+ const ANTIGRAVITY_DISCOVERED_DEFAULT_EFFORT: Record<string, string> = {
303
+ "gemini-4-hydrogen": "high",
304
+ };
305
+
306
+ /** Default effort the catalog publishes, and routing applies, for a discovered effort family. */
307
+ export function discoveredAntigravityDefaultEffort(modelId: string, hasMedium: boolean): string {
308
+ return Object.hasOwn(ANTIGRAVITY_DISCOVERED_DEFAULT_EFFORT, modelId)
309
+ ? ANTIGRAVITY_DISCOVERED_DEFAULT_EFFORT[modelId]!
310
+ : hasMedium ? "medium" : "high";
311
+ }
312
+
294
313
  // ── Default effort per Gemini base model ──
295
314
  const ANTIGRAVITY_DEFAULT_EFFORT: Record<string, string> = {
296
315
  // Google's documented thinking_level default, and the tier CCA marks `recommended`.
@@ -327,8 +346,11 @@ function pickerToWireId(pickerId: string): string {
327
346
  return ANTIGRAVITY_PICKER_TO_WIRE[pickerId] ?? pickerId;
328
347
  }
329
348
 
349
+ /** Requested efforts above `high`: they select a discovered xhigh tier when one exists, else `high`. */
350
+ const ANTIGRAVITY_ABOVE_HIGH_EFFORTS = new Set(["xhigh", "max", "ultra"]);
351
+
330
352
  function resolveAntigravityThinkingLevel(effort: string): string | undefined {
331
- if (effort === "xhigh" || effort === "max" || effort === "ultra") return "high";
353
+ if (ANTIGRAVITY_ABOVE_HIGH_EFFORTS.has(effort)) return "high";
332
354
  return ANTIGRAVITY_THINKING_LEVELS.has(effort) ? effort : undefined;
333
355
  }
334
356
 
@@ -517,7 +539,7 @@ export function registerAntigravityDiscoveredWireModels(
517
539
  const families: Record<string, AntigravitySuffixMap> = Object.create(null);
518
540
  for (const model of models) {
519
541
  if (ANTIGRAVITY_DISCOVERY_EFFORTS.every(effort => model.effortWireModelIds?.[effort] === `${model.id}-${effort}`)) {
520
- families[model.id] = { low: `${model.id}-low`, medium: `${model.id}-medium`, high: `${model.id}-high` };
542
+ families[model.id] = { low: `${model.id}-low`, medium: `${model.id}-medium`, high: `${model.id}-high`, ...(model.effortWireModelIds?.xhigh === `${model.id}-xhigh` ? { xhigh: `${model.id}-xhigh` } : {}) };
521
543
  }
522
544
  }
523
545
  writeAntigravityWireSnapshot(key, { version: 1, provider: generation.provider, families });
@@ -575,14 +597,14 @@ function discoveredAntigravityEffortWireModelId(
575
597
  const effortMap = discoveredAntigravityMapping(baseUrl)?.effortModels.get(modelId);
576
598
  if (!effortMap) return undefined;
577
599
 
578
- const requestedEffort = effort ? resolveAntigravityThinkingLevel(effort) : undefined;
600
+ const requestedEffort = effort && ANTIGRAVITY_ABOVE_HIGH_EFFORTS.has(effort) && effortMap.xhigh ? "xhigh" : effort ? resolveAntigravityThinkingLevel(effort) : undefined;
579
601
  if (requestedEffort && isAntigravityDiscoveryEffort(requestedEffort) && effortMap[requestedEffort]) {
580
602
  return effortMap[requestedEffort];
581
603
  }
582
604
 
583
605
  const defaultEffort = ANTIGRAVITY_DEFAULT_EFFORT[modelId]
584
606
  ?? ANTIGRAVITY_THINKING_LEVEL_MODELS[modelId]
585
- ?? "medium";
607
+ ?? discoveredAntigravityDefaultEffort(modelId, !!effortMap.medium);
586
608
  if (defaultEffort && isAntigravityDiscoveryEffort(defaultEffort) && effortMap[defaultEffort]) {
587
609
  return effortMap[defaultEffort];
588
610
  }
@@ -837,7 +859,8 @@ export function resolveAntigravityEffortWireModel(
837
859
  if (effortMap) {
838
860
  const suffixTiered = ANTIGRAVITY_SUFFIX_TIER_MODELS.has(modelId);
839
861
  // Normalize FIRST for suffix-tiered models. The discovery path clamps max/xhigh/ultra to
840
- // `high` before its own lookup, so a static path that skipped the clamp answered `medium`
862
+ // `high` for a family without a discovered xhigh tier (a family that has one selects it, see
863
+ // ANTIGRAVITY_ABOVE_HIGH_EFFORTS), so a static path that skipped the clamp answered `medium`
841
864
  // for the same request: one input, two tiers, decided by whether discovery happened to run.
842
865
  const requested = suffixTiered && effort
843
866
  ? resolveAntigravityThinkingLevel(effort) ?? effort
@@ -6,7 +6,7 @@ import { getConfigDir } from "../config/paths";
6
6
  import { isValidProviderName } from "../config/provider-name";
7
7
  import { isValidModelDiscoveryModelId, MODEL_DISCOVERY_MAX_MODELS, MODEL_DISCOVERY_MAX_RESPONSE_BYTES } from "./model-discovery-limits";
8
8
 
9
- export type AntigravitySuffixMap = Record<"low" | "medium" | "high", string>;
9
+ export type AntigravitySuffixMap = Record<"low" | "medium" | "high", string> & Partial<Record<"xhigh", string>>;
10
10
  export interface AntigravityWireSnapshot {
11
11
  version: 1;
12
12
  provider: string;
@@ -31,7 +31,8 @@ function validatedSnapshot(value: unknown): AntigravityWireSnapshot | undefined
31
31
  if (!isValidModelDiscoveryModelId(base) || !candidate || typeof candidate !== "object" || Array.isArray(candidate)) return undefined;
32
32
  const map = candidate as Record<string, unknown>;
33
33
  if (!EFFORTS.every(effort => map[effort] === `${base}-${effort}` && isValidModelDiscoveryModelId(map[effort]))) return undefined;
34
- families[base] = { low: `${base}-low`, medium: `${base}-medium`, high: `${base}-high` };
34
+ if (map.xhigh !== undefined && (map.xhigh !== `${base}-xhigh` || !isValidModelDiscoveryModelId(map.xhigh))) return undefined;
35
+ families[base] = { low: `${base}-low`, medium: `${base}-medium`, high: `${base}-high`, ...(map.xhigh ? { xhigh: `${base}-xhigh` } : {}) };
35
36
  }
36
37
  return { version: 1, provider: row.provider, families };
37
38
  }
@@ -0,0 +1,23 @@
1
+ import { OAuthAccountPausedError } from "../oauth";
2
+ import type { OcxProviderConfig } from "../types";
3
+
4
+ export class ProviderApiKeyPausedError extends OAuthAccountPausedError {
5
+ constructor() {
6
+ super();
7
+ this.message = "API key is paused. Resume it in account settings and retry.";
8
+ this.name = "ProviderApiKeyPausedError";
9
+ }
10
+ }
11
+
12
+ export function isProviderApiKeyPaused(provider: OcxProviderConfig | undefined): boolean {
13
+ if (!provider || provider.authMode === "oauth" || provider.authMode === "forward" || provider.authMode === "local") {
14
+ return false;
15
+ }
16
+ const pool = provider.apiKeyPool;
17
+ if (!pool?.length) return false;
18
+ if (pool.every(entry => entry.disabled === true)) return true;
19
+ const ref = provider._apiKeyAttempt?.reference ?? provider.apiKey;
20
+ if (!ref?.trim()) return false;
21
+ return pool.some(entry => entry.disabled === true && entry.key === ref)
22
+ && !pool.some(entry => !entry.disabled && entry.key === ref);
23
+ }
@@ -1,32 +1,93 @@
1
1
  import { accountAutoPauseFenceMatchesDisk, type AccountAutoPauseFence } from "../config/account-auto-pause-revisions";
2
2
  import { randomUUID } from "node:crypto";
3
+ import { clearModelCache } from "../codex/model-cache";
3
4
  import type { OcxConfig } from "../types";
4
5
  import type { ProviderApiKeySelection } from "../types/provider";
5
6
  import type { AccountPauseDetails } from "../types/account-auto-pause";
7
+ import { ProviderApiKeyPausedError, isProviderApiKeyPaused } from "./api-key-pause-state";
6
8
  import { apiKeyPoolEntryId } from "./api-keys";
9
+ import { clearKeyCooldowns } from "./api-key-cooldowns";
7
10
  import { resolveProviderApiKey } from "./api-key-resolve";
8
- import { commitProviderApiKeySelection } from "./api-key-selection";
11
+ import { captureProviderApiKeySelection, commitProviderApiKeySelection } from "./api-key-selection";
12
+ import { forgetApiKeyRotationCursor } from "./key-failover";
13
+ import { clearProviderQuotaCacheFor } from "./quota/report-cache";
14
+ import { clearPassiveKeyAccount } from "./passive-key-observation";
9
15
 
10
- export function setProviderApiKeyPaused(config: OcxConfig, name: string, id: string, paused: boolean,
11
- automatic?: { fence: AccountAutoPauseFence; selection: ProviderApiKeySelection; pauseRevision?: string; resolvedKey?: string; details: AccountPauseDetails }): boolean {
16
+ export { ProviderApiKeyPausedError, isProviderApiKeyPaused } from "./api-key-pause-state";
17
+
18
+ export interface ProviderApiKeyPauseResult {
19
+ ok: boolean;
20
+ activeAccountId: string | null;
21
+ activeAccountChanged: boolean;
22
+ }
23
+
24
+ export function setProviderApiKeyPausedWithResult(config: OcxConfig, name: string, id: string, paused: boolean,
25
+ automatic?: { fence: AccountAutoPauseFence; selection: ProviderApiKeySelection; pauseRevision?: string; resolvedKey?: string; details: AccountPauseDetails }): ProviderApiKeyPauseResult {
26
+ let activeKeyChanged = false;
12
27
  const result = commitProviderApiKeySelection(config, name, provider => {
13
- if (automatic && !accountAutoPauseFenceMatchesDisk(name, automatic.fence)) return { changed: false, value: false };
28
+ if (automatic && !accountAutoPauseFenceMatchesDisk(name, automatic.fence)) {
29
+ return { changed: false, value: { ok: false, activeAccountId: null, activeAccountChanged: false } };
30
+ }
14
31
  const pool = provider.apiKeyPool?.length ? provider.apiKeyPool
15
32
  : provider.apiKey ? [{ id: apiKeyPoolEntryId(provider.apiKey), key: provider.apiKey }] : [];
33
+ const currentActiveAccountId = () => captureProviderApiKeySelection({ ...provider, apiKeyPool: pool }).entryId ?? null;
34
+ const beforeActiveAccountId = currentActiveAccountId();
35
+ const resultForCurrentSelection = (ok: boolean): ProviderApiKeyPauseResult => {
36
+ const activeAccountId = currentActiveAccountId();
37
+ return { ok, activeAccountId, activeAccountChanged: beforeActiveAccountId !== activeAccountId };
38
+ };
16
39
  const entry = pool.find(e => e.id === id);
17
40
  if (!entry || automatic && (entry.disabled || entry.key !== automatic.selection.reference || entry.pauseRevision !== automatic.pauseRevision
18
- || provider.accountAutoPause?.enabled !== true || resolveProviderApiKey(entry.key) !== automatic.resolvedKey)) return { changed: false, value: false };
41
+ || provider.accountAutoPause?.enabled !== true || resolveProviderApiKey(entry.key) !== automatic.resolvedKey)) {
42
+ return { changed: false, value: resultForCurrentSelection(false) };
43
+ }
44
+ const beforeApiKey = provider.apiKey;
19
45
  provider.apiKeyPool = pool;
46
+ const idx = pool.indexOf(entry);
47
+ const ordered = idx >= 0 ? [...pool.slice(idx + 1), ...pool.slice(0, idx)] : pool;
48
+ const hasEnabledActiveReference = () => pool.some(e => !e.disabled && e.key === provider.apiKey);
49
+ const activeDisabled = () => !provider.apiKey
50
+ || (pool.some(e => e.disabled && e.key === provider.apiKey) && !pool.some(e => !e.disabled && e.key === provider.apiKey));
51
+ if (!automatic && paused && entry.disabled) {
52
+ if (provider.apiKey === entry.key && !hasEnabledActiveReference()) {
53
+ const next = ordered.find(e => !e.disabled);
54
+ if (next) provider.apiKey = next.key;
55
+ else delete provider.apiKey;
56
+ activeKeyChanged = beforeApiKey !== provider.apiKey;
57
+ return { changed: true, selectionChanged: true, value: resultForCurrentSelection(true) };
58
+ }
59
+ return { changed: false, value: resultForCurrentSelection(true) };
60
+ }
20
61
  entry.disabled = paused;
21
62
  entry.pauseRevision = randomUUID();
22
63
  if (automatic) entry.pauseDetails = automatic.details;
23
64
  else delete entry.pauseDetails;
24
- if (paused && provider.apiKey === entry.key) {
25
- const next = provider.apiKeyPool?.find(e => !e.disabled);
65
+ if (paused && provider.apiKey === entry.key && !hasEnabledActiveReference()) {
66
+ const next = ordered.find(e => !e.disabled);
26
67
  if (next) provider.apiKey = next.key;
27
68
  else delete provider.apiKey;
28
- } else if (!paused && !provider.apiKey) provider.apiKey = entry.key;
29
- return { changed: true, selectionChanged: true, value: true };
69
+ } else if (!paused && activeDisabled()) provider.apiKey = entry.key;
70
+ activeKeyChanged = beforeApiKey !== provider.apiKey;
71
+ return { changed: true, selectionChanged: true, value: resultForCurrentSelection(true) };
30
72
  }, automatic?.selection);
31
- return result.status === "committed" && result.value;
73
+ const response = result.status === "committed"
74
+ ? result.value
75
+ : { ok: false, activeAccountId: null, activeAccountChanged: false };
76
+ const ok = response.ok;
77
+ if (ok && !automatic) {
78
+ clearKeyCooldowns(name);
79
+ forgetApiKeyRotationCursor(name);
80
+ if (activeKeyChanged) {
81
+ clearModelCache(name);
82
+ clearProviderQuotaCacheFor(name);
83
+ }
84
+ }
85
+ // A pause changes which credential may own a passive observation.
86
+ if (ok) clearPassiveKeyAccount(name, id);
87
+ return response;
88
+ }
89
+
90
+ export function setProviderApiKeyPaused(config: OcxConfig, name: string, id: string, paused: boolean,
91
+ automatic?: { fence: AccountAutoPauseFence; selection: ProviderApiKeySelection; pauseRevision?: string; resolvedKey?: string; details: AccountPauseDetails }): boolean {
92
+ return setProviderApiKeyPausedWithResult(config, name, id, paused, automatic).ok;
32
93
  }
@@ -45,25 +45,57 @@ let entryFactory: ProviderKeychainEntryFactory = defaultEntryFactory;
45
45
  const resolvedCache = new Map<string, string>();
46
46
  const warnedAccounts = new Set<string>();
47
47
  let resolutionGeneration = 0;
48
+ // A digest and incarnation token retain passive ownership without retaining another secret copy.
49
+ // Only a routing read can establish this proof; passive paths never read or populate the keychain.
50
+ const passiveProofs = new Map<string, { digest: string; generation: number }>();
51
+ let nextPassiveGeneration = 0;
52
+ const MAX_PASSIVE_PROOFS = 512;
53
+
54
+ function credentialDigest(value: string): string {
55
+ return new Bun.CryptoHasher("sha256").update(value).digest("hex");
56
+ }
57
+
58
+ /** Return the observed account incarnation, optionally requiring a match to the wire key. */
59
+ export function passiveKeychainGeneration(reference: string, key?: string): number | undefined {
60
+ if (!isKeychainReference(reference)) return undefined;
61
+ const account = keychainAccount(reference);
62
+ const proof = passiveProofs.get(account);
63
+ if (!resolvedCache.has(account)) return undefined;
64
+ return proof && (key === undefined || proof.digest === credentialDigest(key)) ? proof.generation : undefined;
65
+ }
66
+
67
+ function rememberPassiveProof(account: string, value: string): void {
68
+ const digest = credentialDigest(value), previous = passiveProofs.get(account);
69
+ passiveProofs.delete(account);
70
+ passiveProofs.set(account, previous?.digest === digest ? previous : { digest, generation: ++nextPassiveGeneration });
71
+ if (passiveProofs.size > MAX_PASSIVE_PROOFS) passiveProofs.delete(passiveProofs.keys().next().value!);
72
+ }
48
73
 
49
74
  /** Advances whenever cached secrets may have changed, so derived snapshots can rebuild. */
50
75
  export function providerKeyResolutionGeneration(): number {
51
76
  return resolutionGeneration;
52
77
  }
53
78
 
79
+ /** Inspect a resolved routing credential without reading the OS, modifying the cache or publishing evidence. */
80
+ export function peekResolvedProviderKey(value: string): string | undefined {
81
+ return isKeychainReference(value) ? resolvedCache.get(keychainAccount(value)) : undefined;
82
+ }
83
+
54
84
  /** Test seam: swap the OS entry for an in-memory one and drop caches. */
55
85
  export function setProviderKeychainEntryFactoryForTests(factory: ProviderKeychainEntryFactory | null): void {
56
86
  entryFactory = factory ?? defaultEntryFactory;
57
87
  invalidateDecisionKeyQuotas();
58
88
  resolvedCache.clear();
89
+ passiveProofs.clear();
59
90
  resolutionGeneration++;
60
91
  warnedAccounts.clear();
61
92
  }
62
93
 
63
94
  /** Write-path seam: a store/restore mutated secrets, so cached reads and warnings are stale. */
64
- export function invalidateResolvedProviderKeyCache(): void {
95
+ export function invalidateResolvedProviderKeyCache(options?: { preservePassiveKeychainProofs: true }): void {
65
96
  invalidateDecisionKeyQuotas();
66
97
  resolvedCache.clear();
98
+ if (!options?.preservePassiveKeychainProofs) passiveProofs.clear();
67
99
  resolutionGeneration++;
68
100
  warnedAccounts.clear();
69
101
  }
@@ -95,16 +127,16 @@ export function providerKeychainEntry(account: string): ProviderKeychainEntry {
95
127
  };
96
128
  return {
97
129
  getPassword: () => entry.getPassword(),
98
- setPassword: password => publishCredentialSync(() => entry.setPassword(password), {
130
+ setPassword: password => publishCredentialSync(() => { passiveProofs.delete(account); entry.setPassword(password); }, {
99
131
  accounts: [account], absent: completed => completed ? [] : absent(),
100
132
  }),
101
133
  // Registered before the attempt, so a deletion that fails keeps the secret counted.
102
- deletePassword: () => publishCredentialSync(() => entry.deletePassword(), { accounts: [account], absent }),
134
+ deletePassword: () => publishCredentialSync(() => { passiveProofs.delete(account); return entry.deletePassword(); }, { accounts: [account], absent }),
103
135
  };
104
136
  }
105
137
 
106
- function readKeychain(account: string, quiet = false): string | undefined {
107
- const cached = resolvedCache.get(account);
138
+ function readKeychain(account: string, quiet = false, useCache = true): string | undefined {
139
+ const cached = useCache ? resolvedCache.get(account) : undefined;
108
140
  if (cached !== undefined) return cached;
109
141
  let value: string | null = null;
110
142
  try {
@@ -113,10 +145,14 @@ function readKeychain(account: string, quiet = false): string | undefined {
113
145
  // fall through to the single warning below
114
146
  }
115
147
  if (typeof value === "string" && value.trim()) {
116
- if (isGcpCredentialMaterial(value)) throw new Error("GCP credential JSON cannot be used as a literal API key; select a gcp-sa reference");
117
- resolvedCache.set(account, value);
148
+ if (isGcpCredentialMaterial(value)) {
149
+ if (useCache) passiveProofs.delete(account);
150
+ throw new Error("GCP credential JSON cannot be used as a literal API key; select a gcp-sa reference");
151
+ }
152
+ if (useCache) { resolvedCache.set(account, value); rememberPassiveProof(account, value); }
118
153
  return value;
119
154
  }
155
+ if (useCache) passiveProofs.delete(account);
120
156
  if (!quiet && !warnedAccounts.has(account)) {
121
157
  warnedAccounts.add(account);
122
158
  console.warn(`[opencodex] provider key reference keychain:${account} could not be read from the OS keychain; requests for this provider have no credential until the keychain is available (no plaintext fallback)`);
@@ -135,6 +171,12 @@ export function resolveProviderApiKey(value: string | undefined): string | undef
135
171
  return resolved;
136
172
  }
137
173
 
174
+ /** Resolve current display ownership without touching routing's cache, evidence, or warnings. */
175
+ export function resolveProviderApiKeyPassively(value: string | undefined): string | undefined {
176
+ if (!value) return undefined;
177
+ return isKeychainReference(value) ? readKeychain(keychainAccount(value), true, false) : resolveEnvValue(value);
178
+ }
179
+
138
180
  /** The same resolution without the unreadable-reference warning, for observe-only callers. */
139
181
  export function resolveProviderApiKeyQuietly(value: string | undefined): string | undefined {
140
182
  if (!value) return undefined;
@@ -1,5 +1,6 @@
1
1
  import type { OcxConfig, OcxProviderConfig } from "../types";
2
2
  import { isEgressTransparentExecutor, markEgressTransparentExecutor } from "../lib/provider-egress";
3
+ import { inheritPassiveKeyProof } from "../lib/passive-key-fetch-proof";
3
4
  import { isNonReplayableResponse } from "../lib/upstream-retry";
4
5
  import { providerApiKeySelectionOwnsFailure } from "./api-key-selection";
5
6
  import { recordDistributedKeyFailure } from "./key-failover";
@@ -33,6 +34,7 @@ export function distributedKeyPhysicalFetch(
33
34
  owners.set(response, owners.has(response) ? null : owner);
34
35
  return response;
35
36
  }) as typeof globalThis.fetch;
37
+ inheritPassiveKeyProof(wrapped, physicalFetch);
36
38
  return isEgressTransparentExecutor(physicalFetch) ? markEgressTransparentExecutor(wrapped) : wrapped;
37
39
  }
38
40
 
@@ -2,8 +2,10 @@ import type { OcxProviderConfig } from "../types";
2
2
  import type { ProviderApiKeySelection } from "../types/provider";
3
3
 
4
4
  export function captureProviderApiKeySelection(provider: OcxProviderConfig): ProviderApiKeySelection {
5
+ const activeReference = provider.apiKeyPool?.find(entry => entry.key === provider.apiKey && !entry.disabled)
6
+ ?? provider.apiKeyPool?.find(entry => entry.key === provider.apiKey);
5
7
  return {
6
- entryId: provider.apiKeyPool?.find(entry => entry.key === provider.apiKey)?.id,
8
+ entryId: activeReference?.id,
7
9
  reference: provider.apiKey,
8
10
  revision: provider.apiKeySelectionRevision,
9
11
  };
@@ -10,31 +10,74 @@ import { OPENCODE_GO_SESSION_HEADER } from "./opencode-go-transport";
10
10
  import { resolveProviderTransport, XAI_GROK_COMPATIBILITY, type OcxProviderTransport } from "./xai-transport";
11
11
  import { captureProviderApiKeySelection } from "./api-key-selection-capture";
12
12
  import { vertexEnvironmentKeyIsCurrent } from "./vertex-environment-authority";
13
+ import { cacheAffinityApplies } from "./cache-affinity";
14
+ import { currentCacheAffinityIdentity } from "./cache-affinity-identity";
13
15
 
14
16
  export { captureProviderApiKeySelection } from "./api-key-selection-capture";
15
17
 
16
- function matchesSelection(provider: OcxProviderConfig, expected: ProviderApiKeySelection): boolean {
17
- if (expected.distributed) return provider.apiKeySelectionRevision === expected.revision
18
+ export function affinitySelectionIsCurrent(name: string, provider: OcxProviderConfig, expected: ProviderApiKeySelection): boolean {
19
+ return !!expected.cacheAffinityGeneration && !!expected.entryId
20
+ && expected.cacheAffinityGeneration === currentCacheAffinityIdentity(name, provider, expected.entryId);
21
+ }
22
+
23
+ /** A stale affinity generation cannot authorize paced readmission onto another credential. */
24
+ export function providerAffinityGenerationIsCurrent(config: OcxConfig, name: string, routed: OcxProviderConfig): boolean {
25
+ const selection = routed._apiKeyAttempt;
26
+ return !selection?.cacheAffinity || !!config.providers[name]
27
+ && affinitySelectionIsCurrent(name, config.providers[name]!, selection);
28
+ }
29
+
30
+ function matchesSelection(name: string, provider: OcxProviderConfig, expected: ProviderApiKeySelection): boolean {
31
+ if (expected.distributed && !expected.cacheAffinity) return provider.apiKeySelectionRevision === expected.revision
18
32
  && provider.requestPacing?.enabled === true && provider.requestPacing.keySelection === "round-robin"
19
33
  && !!provider.apiKeyPool?.some(entry => !entry.disabled && entry.id === expected.entryId && entry.key === expected.reference);
34
+ if (expected.cacheAffinity === true) {
35
+ // Affinity picks are fenced on credential/destination generation, not selection revision.
36
+ // commitProviderApiKeySelection bumps the revision on EVERY committed key
37
+ // change — automatic rotation included — so a revision fence cannot tell
38
+ // an operator's re-selection from another conversation's rotation, and
39
+ // telling them apart is not affinity's job: the conversation keeps its
40
+ // credential while its generation lives, and the provider's cacheAffinity mode
41
+ // is the operator's override. (Ordinary captured selections keep the
42
+ // revision fence below: a permit for the previously committed key must
43
+ // not dispatch after a manual replacement.)
44
+ return cacheAffinityApplies(provider) && affinitySelectionIsCurrent(name, provider, expected) && !!expected.entryId && !!expected.reference
45
+ && (provider.apiKeyPool ?? []).some(entry => !entry.disabled && entry.id === expected.entryId && entry.key === expected.reference);
46
+ }
20
47
  const current = captureProviderApiKeySelection(provider);
21
- return current.entryId === expected.entryId && current.reference === expected.reference
22
- && current.revision === expected.revision;
48
+ if (current.revision !== expected.revision) return false;
49
+ return current.entryId === expected.entryId && current.reference === expected.reference;
23
50
  }
24
51
 
25
52
  function currentKeyProvider(config: OcxConfig, name: string, selection?: ProviderApiKeySelection, allowCooling = false): OcxProviderConfig | null {
26
53
  const configured = config.providers[name];
27
54
  if (!configured || configured.disabled) return null;
55
+ if (selection?.cacheAffinity && !cacheAffinityApplies(configured)) return null;
56
+ if (selection?.cacheAffinity && !affinitySelectionIsCurrent(name, configured, selection)) return null;
28
57
  let row = configured;
29
58
  if (selection?.distributed) {
30
59
  const entry = configured.apiKeyPool?.find(key => key.id === selection.entryId && key.key === selection.reference);
31
- if (!entry || entry.disabled || (!allowCooling && isKeyInCooldown(name, entry.id)) || configured.apiKeySelectionRevision !== selection.revision
60
+ if (!entry || entry.disabled || (!allowCooling && isKeyInCooldown(name, entry.id)) || (!selection.cacheAffinity && configured.apiKeySelectionRevision !== selection.revision)
32
61
  || !configured.requestPacing?.enabled || configured.requestPacing.keySelection !== "round-robin") return null;
33
62
  row = { ...configured, apiKey: entry.key, _apiKeyAttempt: selection };
34
63
  }
35
- if (row.apiKeyPool?.some(entry => entry.disabled && entry.key === row.apiKey)
36
- || row.apiKeyPool?.length && row.apiKeyPool.every(entry => entry.disabled)) return null;
37
- const current = routedProviderConfig(name, { ...row, _apiKeyAttempt: selection?.distributed ? selection : undefined });
64
+ else if (selection?.cacheAffinity && selection.entryId && selection.reference) {
65
+ // A request-captured pool selection (cache affinity picks one without
66
+ // committing it globally) survives this re-read while its generation is live:
67
+ // present with the captured key, enabled, and out of cooldown. It is
68
+ // deliberately NOT fenced on the selection revision — that revision bumps
69
+ // on every committed change, automatic rotation included, so it cannot
70
+ // supersede a pick whose whole purpose is to outlast committed movement.
71
+ // An invalidated captured pick cannot authorize a different credential.
72
+ const entry = configured.apiKeyPool?.find(key => key.id === selection.entryId && key.key === selection.reference);
73
+ if (entry && !entry.disabled && (allowCooling || !isKeyInCooldown(name, entry.id))) {
74
+ row = { ...configured, apiKey: entry.key, _apiKeyAttempt: selection };
75
+ } else return null;
76
+ }
77
+ const hasPausedActiveReference = row.apiKeyPool?.some(entry => entry.disabled && entry.key === row.apiKey)
78
+ && !row.apiKeyPool?.some(entry => !entry.disabled && entry.key === row.apiKey);
79
+ if (hasPausedActiveReference || row.apiKeyPool?.length && row.apiKeyPool.every(entry => entry.disabled)) return null;
80
+ const current = routedProviderConfig(name, { ...row, _apiKeyAttempt: row === configured ? undefined : selection });
38
81
  if (current.authMode === "oauth" || current.authMode === "forward") return null;
39
82
  if (current.authMode === "key" && !current.keyOptional && !current.apiKey?.trim()
40
83
  && !(current.adapter === "google" && current.googleMode === "vertex")) return null;
@@ -64,7 +107,7 @@ function matchesConfiguredSelection(
64
107
  const current = currentKeyProvider(config, name, expected, allowCooling);
65
108
  return current !== null && expected !== undefined
66
109
  && vertexEnvironmentKeyIsCurrent(expected, current)
67
- && (expected.distributed === true || matchesSelection(config.providers[name]!, expected))
110
+ && (expected.distributed === true || matchesSelection(name, config.providers[name]!, expected))
68
111
  && current.apiKey === routedProvider.apiKey
69
112
  && current.authMode === routedProvider.authMode
70
113
  && current.baseUrl === routedProvider.baseUrl
@@ -82,7 +125,7 @@ export function resolveCurrentProviderApiKeyTransport(
82
125
  // A permit acquired for one key cannot authorize a different key after a manual edit.
83
126
  if (routedProvider.requestPacing?.enabled && routedProvider.requestPacing.keys
84
127
  && routedProvider._apiKeyAttempt && config.providers[name]
85
- && !routedProvider._apiKeyAttempt.distributed && !matchesSelection(config.providers[name]!, routedProvider._apiKeyAttempt)) return null;
128
+ && !routedProvider._apiKeyAttempt.distributed && !matchesSelection(name, config.providers[name]!, routedProvider._apiKeyAttempt)) return null;
86
129
  const current = currentKeyProvider(config, name, routedProvider._apiKeyAttempt);
87
130
  if (!current) return null;
88
131
  const runtime = routedProvider as OcxProviderTransport;
@@ -121,7 +164,7 @@ export function commitProviderApiKeySelection<T>(
121
164
  if (!provider || provider.authMode === "oauth" || provider.authMode === "forward") {
122
165
  return { changed: false, value: { status: "unavailable" } };
123
166
  }
124
- if (expectedSelection && !matchesSelection(provider, expectedSelection)) {
167
+ if (expectedSelection && !matchesSelection(name, provider, expectedSelection)) {
125
168
  return { changed: false, value: { status: "superseded", provider: structuredClone(provider) } };
126
169
  }
127
170
  const before = provider.apiKey;