@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
@@ -9,9 +9,14 @@
9
9
  * Modelled after src/codex/routing.ts cooldown logic but scoped to plain API-key pools.
10
10
  */
11
11
  import { isKeyInCooldown, getKeyCooldownUntil, setKeyCooldown } from "./api-key-cooldowns";
12
- export { clearKeyCooldowns, getKeyCooldownUntil, sweepExpiredApiKeyCooldowns } from "./api-key-cooldowns";
13
- import { commitProviderApiKeySelection, providerApiKeySelectionIsCurrent } from "./api-key-selection";
14
- import { RequestPacingQueueOverloadError } from "./request-pacing";
12
+ export {
13
+ clearKeyCooldowns,
14
+ getKeyCooldownUntil,
15
+ sweepExpiredApiKeyCooldowns,
16
+ } from "./api-key-cooldowns";
17
+ import { affinitySelectionIsCurrent, commitProviderApiKeySelection, providerApiKeySelectionIsCurrent } from "./api-key-selection";
18
+ import { currentCacheAffinityIdentity } from "./cache-affinity-identity";
19
+ import { providerRequestPacingStatus, REQUEST_PACING_MAX_QUEUE_AGE_MS, RequestPacingQueueOverloadError } from "./request-pacing";
15
20
  import { isCanonicalMistralChat } from "./mistral-transport";
16
21
  import type { ProviderApiKeySelection } from "../types/provider";
17
22
  import { routedProviderConfig } from "./routed-config";
@@ -21,10 +26,13 @@ import type { OcxConfig, OcxProviderConfig, RateLimitRetryPolicy, ResetReplayPol
21
26
  import { OPENCODE_GO_SESSION_HEADER } from "./opencode-go-transport";
22
27
  import { resolveProviderTransport, type OcxProviderTransport } from "./xai-transport";
23
28
  import { sweepExpiredOnWrite } from "../lib/state-store-sweeper";
29
+ import { cacheAffinityApplies, consultProviderCacheAffinity, releaseProviderCacheAffinity } from "./cache-affinity";
30
+ import { ProviderApiKeyPausedError } from "./api-key-pause-state";
24
31
  // quota-key-accounts imports only node:crypto, the key store and the quota types -- NOT
25
32
  // providers/quota.ts -- so the cached reader reaches the dispatch path without dragging the
26
33
  // probe machinery onto it.
27
34
  import { cachedApiKeyQuota } from "./quota-key-accounts";
35
+ import { isDisplayOnlyQuota } from "./quota-types";
28
36
 
29
37
  // ---- cooldown state (in-memory, same as codex/routing.ts) ----
30
38
 
@@ -422,7 +430,7 @@ type ApiKeyPoolEntry = NonNullable<OcxProviderConfig["apiKeyPool"]>[number];
422
430
  */
423
431
  function keyHeadroom(providerName: string, provider: OcxProviderConfig, entry: ApiKeyPoolEntry): number | null {
424
432
  const quota = cachedApiKeyQuota(providerName, provider, entry.id, entry.key);
425
- if (!quota) return null;
433
+ if (!quota || isDisplayOnlyQuota(quota)) return null;
426
434
  const percents = [
427
435
  quota.fiveHourPercent,
428
436
  quota.weeklyPercent,
@@ -459,7 +467,6 @@ function rankKeysByHeadroom(
459
467
  .map(row => row.entry);
460
468
  }
461
469
 
462
-
463
470
  /**
464
471
  * Pick a better key BEFORE the first attempt when the committed one is already cooling.
465
472
  *
@@ -487,12 +494,14 @@ export function selectProactiveApiKey(
487
494
  ): OcxProviderConfig | null {
488
495
  const provider = config.providers?.[providerName];
489
496
  if (!provider) return null;
490
- const strategy = provider.apiKeyPoolStrategy;
491
- if (!strategy) return null;
492
497
  if (!hasKeyPoolFailover(provider)) return null;
493
498
  const pool = provider.apiKeyPool ?? [];
494
499
 
495
- const activeEntry = pool.find(entry => entry.key === provider.apiKey);
500
+ const activeEntry = pool.find(entry => entry.key === provider.apiKey && !entry.disabled)
501
+ ?? pool.find(entry => entry.key === provider.apiKey);
502
+ const activeDisabled = Boolean(activeEntry?.disabled || (!provider.apiKey && pool.some(entry => entry.disabled)));
503
+ const strategy = provider.apiKeyPoolStrategy ?? (activeDisabled ? "fill-first" : undefined);
504
+ if (!strategy) return null;
496
505
  // A healthy committed key wins, whether the operator chose it or a previous rotation did.
497
506
  if (activeEntry && !activeEntry.disabled && !isKeyInCooldown(providerName, activeEntry.id, now)) return null;
498
507
 
@@ -521,7 +530,8 @@ export function selectProactiveApiKey(
521
530
  const target = freshPool.find(entry => entry.id === chosen.id);
522
531
  if (!target || target.disabled) return { changed: false, value: null };
523
532
  if (freshProvider.apiKey === target.key) return { changed: false, value: null };
524
- const freshActive = freshPool.find(entry => entry.key === freshProvider.apiKey);
533
+ const freshActive = freshPool.find(entry => entry.key === freshProvider.apiKey && !entry.disabled)
534
+ ?? freshPool.find(entry => entry.key === freshProvider.apiKey);
525
535
  // Re-check under the lock: a concurrent manual selection may have landed a healthy key.
526
536
  if (freshActive && !freshActive.disabled && !isKeyInCooldown(providerName, freshActive.id, now)) {
527
537
  return { changed: false, value: null };
@@ -537,6 +547,49 @@ export function selectProactiveApiKey(
537
547
  return structuredClone(committed);
538
548
  }
539
549
 
550
+ /** Conversation context for the cache-affinity preference inside proactive selection. */
551
+ export interface ProactiveKeyAffinityContext {
552
+ /** Explicit session lane of the request; absent lanes never bind or consult. */
553
+ lane?: string;
554
+ model?: string;
555
+ /** The request continues the lane's in-progress turn (tool results being returned). */
556
+ continuation?: boolean;
557
+ /** Decision sink (the request log context); only bounded enum strings are written. */
558
+ log?: {
559
+ cacheAffinity?: string;
560
+ cacheAffinityReason?: string;
561
+ cacheAffinityApplicable?: boolean;
562
+ affinityModel?: string;
563
+ affinityKeptEntryId?: string;
564
+ };
565
+ }
566
+
567
+ /**
568
+ * Whether the bound entry is pacing-limited right now: its per-key
569
+ * concurrency bucket is full, or its next permitted start (minimum interval
570
+ * or per-minute cap, as the pacer computes it) is further out than the send
571
+ * queue tolerates before expiring a waiter. Below that bound, queueing is
572
+ * pacing working as designed — ordinary selection queues too — so affinity
573
+ * stands. Only the provider-level keys rule is consulted here; per-model
574
+ * caps still apply at the send queue exactly as they do for ordinary
575
+ * selection.
576
+ */
577
+ function affinityPacingSaturated(
578
+ providerName: string,
579
+ configured: OcxProviderConfig,
580
+ entryId: string,
581
+ now: number,
582
+ ): boolean {
583
+ const pacing = configured.requestPacing;
584
+ if (!pacing?.enabled) return false;
585
+ const key = providerRequestPacingStatus(providerName, configured, now).keys
586
+ ?.find(candidate => candidate.id === entryId);
587
+ if (!key) return false;
588
+ if (key.nextSlotInMs > REQUEST_PACING_MAX_QUEUE_AGE_MS) return true;
589
+ const cap = pacing.keys?.maxConcurrentRequests;
590
+ return cap !== undefined && cap > 0 && key.inFlight >= cap;
591
+ }
592
+
540
593
  /**
541
594
  * Pre-dispatch twin of `rotateProviderTransportOn429`: pick a warm key, then rebuild the
542
595
  * active route from the committed row through the same seam the 429 path uses, so the
@@ -552,11 +605,76 @@ export function selectProactiveApiKeyTransport(
552
605
  routedProvider: OcxProviderTransport,
553
606
  promptCacheKey?: string,
554
607
  now = Date.now(),
608
+ affinity?: ProactiveKeyAffinityContext,
555
609
  ): OcxProviderTransport | null {
556
610
  const configured = config.providers[providerName];
557
- if (configured?.requestPacing?.enabled && configured.requestPacing.keySelection === "round-robin"
558
- && hasKeyPoolFailover(configured)) {
559
- return applyRotatedTransport(providerName, routedProvider, allocateDistributedKey(providerName, configured, now), promptCacheKey);
611
+ // Cache affinity first: a conversation stays on the credential whose upstream
612
+ // prompt cache it built, while that credential is still eligible. The
613
+ // preference never commits a global selection — it rebuilds this request's
614
+ // transport only — and it yields to every eligibility rule the normal paths
615
+ // enforce (entry removed or disabled releases the binding; a cooling or
616
+ // pacing-saturated entry falls through to ordinary selection, and whoever
617
+ // ultimately serves is who the binding is refreshed to at finalization).
618
+ if (affinity?.lane && configured) {
619
+ if (affinity.log) {
620
+ affinity.log.cacheAffinityApplicable = cacheAffinityApplies(configured);
621
+ affinity.log.affinityModel = affinity.model;
622
+ }
623
+ const hit = consultProviderCacheAffinity({
624
+ lane: affinity.lane,
625
+ providerName,
626
+ provider: configured,
627
+ model: affinity.model ?? "",
628
+ continuation: affinity.continuation === true,
629
+ now,
630
+ });
631
+ if (hit) {
632
+ const entry = configured.apiKeyPool?.find((candidate) => candidate.id === hit.entryId);
633
+ if (!entry || entry.disabled) {
634
+ releaseProviderCacheAffinity(affinity.lane, providerName, hit.entryId);
635
+ } else if (
636
+ !isKeyInCooldown(providerName, entry.id, now) &&
637
+ !affinityPacingSaturated(providerName, configured, entry.id, now) &&
638
+ !(configured.apiKeyPoolStrategy === "quota" &&
639
+ (keyHeadroom(providerName, configured, entry) ?? 1) <= 0 &&
640
+ configured.apiKeyPool?.some(candidate => !candidate.disabled &&
641
+ !isKeyInCooldown(providerName, candidate.id, now) &&
642
+ (keyHeadroom(providerName, configured, candidate) ?? 0) > 0))
643
+ ) {
644
+ if (affinity.log) {
645
+ affinity.log.cacheAffinity = "kept";
646
+ affinity.log.cacheAffinityReason = hit.reason;
647
+ affinity.log.affinityKeptEntryId = entry.id;
648
+ }
649
+ const affinityTransport = applyRotatedTransport(
650
+ providerName,
651
+ routedProvider,
652
+ { ...configured, apiKey: entry.key },
653
+ promptCacheKey,
654
+ );
655
+ // Mark the pick as request-local affinity so selection re-reads keep it
656
+ // while the entry stays live, without committing a global selection.
657
+ affinityTransport._apiKeyAttempt = {
658
+ ...affinityTransport._apiKeyAttempt!,
659
+ cacheAffinity: true,
660
+ cacheAffinityGeneration: currentCacheAffinityIdentity(providerName, configured, entry.id),
661
+ distributed: configured.requestPacing?.enabled === true && configured.requestPacing.keySelection === "round-robin",
662
+ };
663
+ return affinityTransport;
664
+ }
665
+ }
666
+ }
667
+ if (
668
+ configured?.requestPacing?.enabled &&
669
+ configured.requestPacing.keySelection === "round-robin" &&
670
+ hasKeyPoolFailover(configured)
671
+ ) {
672
+ return applyRotatedTransport(
673
+ providerName,
674
+ routedProvider,
675
+ allocateDistributedKey(providerName, configured, now),
676
+ promptCacheKey,
677
+ );
560
678
  }
561
679
  const committed = selectProactiveApiKey(config, providerName, now);
562
680
  if (!committed) return null;
@@ -566,6 +684,7 @@ export function selectProactiveApiKeyTransport(
566
684
  const dispatchKeyCursor = new Map<string, string>();
567
685
  function allocateDistributedKey(providerName: string, provider: OcxProviderConfig, now: number): OcxProviderConfig {
568
686
  const pool = (provider.apiKeyPool ?? []).filter(entry => !entry.disabled).filter((entry, index, all) => all.findIndex(other => other.key === entry.key) === index);
687
+ if (pool.length === 0) throw new ProviderApiKeyPausedError();
569
688
  const previous = dispatchKeyCursor.get(providerName);
570
689
  const start = pool.findIndex(entry => entry.id === previous);
571
690
  for (let offset = 1; offset <= pool.length; offset++) {
@@ -718,8 +837,9 @@ export function recordDistributedKeyFailure(
718
837
  ): boolean {
719
838
  const provider = config.providers[providerName];
720
839
  if (!selection?.distributed || !provider || provider.authMode === "oauth" || provider.authMode === "forward") return false;
840
+ if (selection.cacheAffinity && (!cacheAffinityApplies(provider) || !affinitySelectionIsCurrent(providerName, provider, selection))) return false;
721
841
  const failed = provider.apiKeyPool?.find(entry => entry.id === selection.entryId && entry.key === selection.reference);
722
- if (!failed || failed.disabled || provider.apiKeySelectionRevision !== selection.revision) return false;
842
+ if (!failed || failed.disabled || (!selection.cacheAffinity && provider.apiKeySelectionRevision !== selection.revision)) return false;
723
843
  const delay = status === "billing" ? ANTHROPIC_BILLING_COOLDOWN_MS : status === 401 ? MAX_COOLDOWN_MS : quotaResetAt !== undefined
724
844
  ? Math.max(1, quotaResetAt - now) : parseRetryAfterMs(retryAfter, now) ?? DEFAULT_COOLDOWN_MS;
725
845
  for (const entry of provider.apiKeyPool ?? []) if (entry.key === failed.key) {
@@ -771,7 +891,8 @@ function rotateKeyAfterFailure(
771
891
  : pool.find(entry => entry.key === failedKey);
772
892
 
773
893
  if (freshProvider.apiKey !== failedKey) {
774
- const activeEntry = pool.find(entry => entry.key === freshProvider.apiKey);
894
+ const activeEntry = pool.find(entry => entry.key === freshProvider.apiKey && !entry.disabled)
895
+ ?? pool.find(entry => entry.key === freshProvider.apiKey);
775
896
  if (activeEntry && !activeEntry.disabled && !isKeyInCooldown(providerName, activeEntry.id, now)) {
776
897
  return {
777
898
  changed: false,
@@ -798,6 +919,7 @@ function rotateKeyAfterFailure(
798
919
  }, attemptedSelection);
799
920
  if (outcome.status === "unavailable") return null;
800
921
  if (outcome.status === "superseded") {
922
+ if (attemptedSelection?.cacheAffinity) return null;
801
923
  // Billing authority is bound to the sent selection; a newer manual choice grants no replay.
802
924
  if (acceptsFreshProvider) return null;
803
925
  // A newer manual selection (including A→B→A) owns subsequent dispatch. Reusing the
@@ -115,7 +115,7 @@ export function storeProviderKeyInKeychain(config: OcxConfig, name: string): { o
115
115
  return { ok: false, error: `OS keychain write failed: ${error instanceof Error ? error.message : "unknown"}`, status: 503 };
116
116
  }
117
117
  for (const apply of planned) apply();
118
- invalidateResolvedProviderKeyCache();
118
+ invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
119
119
  saveConfigPreservingClaudeCode(config);
120
120
  return { ok: true, moved: written.length };
121
121
  }
@@ -158,11 +158,11 @@ export function restoreProviderKeyFromKeychain(config: OcxConfig, name: string):
158
158
  if (isKeychainReference(entry.key)) entry.key = resolved.get(keychainAccount(entry.key))!;
159
159
  }
160
160
  if (isKeychainReference(provider.apiKey)) provider.apiKey = resolved.get(keychainAccount(provider.apiKey))!;
161
- invalidateResolvedProviderKeyCache();
161
+ invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
162
162
  saveConfigPreservingClaudeCode(config);
163
163
  for (const account of resolved.keys()) {
164
164
  try { providerKeychainEntry(account).deletePassword(); } catch { /* best effort */ }
165
165
  }
166
- invalidateResolvedProviderKeyCache();
166
+ invalidateResolvedProviderKeyCache({ preservePassiveKeychainProofs: true });
167
167
  return { ok: true, restored: resolved.size };
168
168
  }
@@ -12,12 +12,10 @@ export const KIRO_MODELS = [
12
12
  "gpt-6.1-sol",
13
13
  // 261027 preemptive: GPT-6.1 Terra (mirrors Kiro's GPT-6.1 Sol seed; provider listing unverified).
14
14
  "gpt-6.1-terra",
15
- // 260929 preemptive: Claude Sonnet 5.5 added ahead of Kiro's catalog (kiro.dev did not list it on
16
- // 2026-09-29). Mirrors claude-sonnet-5; calls fail upstream until Kiro ships the model.
15
+ // Listed on kiro.dev/docs/models (2026-10-24).
17
16
  "claude-sonnet-5.5",
18
17
  "claude-sonnet-5",
19
- // 260923 preemptive: Claude Opus 5.5 added ahead of Kiro's catalog (kiro.dev did not list it on
20
- // 2026-09-23). Mirrors claude-opus-5; calls fail upstream until Kiro ships the model.
18
+ // Listed on kiro.dev/docs/models (2026-10-24).
21
19
  "claude-opus-5.5",
22
20
  "claude-opus-5",
23
21
  "claude-opus-4.8",
@@ -27,7 +25,7 @@ export const KIRO_MODELS = [
27
25
  "claude-sonnet-4.6",
28
26
  "claude-sonnet-4.5",
29
27
  "claude-sonnet-4.0",
30
- // 261008 preemptive: Haiku 5.5; calls fail upstream until Kiro ships it.
28
+ // Listed on kiro.dev/docs/models (2026-10-24); two-tier pricing above 100K input tokens.
31
29
  "claude-haiku-5.5",
32
30
  "claude-haiku-4.5",
33
31
  "deepseek-3.2",
@@ -1,5 +1,7 @@
1
1
  import { ACCOUNT_LOG_LABEL_RE, CODEX_ACCOUNT_LOG_LABEL_RE, KEY_ACCOUNT_LOG_LABEL_RE, apiKeyAccountLogLabel, oauthAccountLogLabel } from "../codex/account-label";
2
2
  import type { OcxProviderConfig } from "../types";
3
+ import { captureCacheAffinityIdentity } from "./cache-affinity-identity";
4
+ import { isAnthropicInstanceId } from "./anthropic-instance-id";
3
5
 
4
6
  export function canonicalUsageProviderLabel(provider: string): string {
5
7
  return provider === "chatgpt" || provider === "openai-multi" ? "openai" : provider;
@@ -14,14 +16,19 @@ export function usesApiKeyAccount(provider: Pick<OcxProviderConfig, "authMode" |
14
16
 
15
17
  /** Key identity comes from the captured selection, before env/keychain resolution. */
16
18
  export function stampApiKeyAccountLabel(
17
- logCtx: { accountLogLabel?: string },
19
+ logCtx: { accountLogLabel?: string; affinityKeyEntryId?: string; affinityProviderName?: string },
18
20
  providerName: string,
19
- provider: Pick<OcxProviderConfig, "authMode" | "_apiKeyAttempt">,
21
+ provider: OcxProviderConfig,
20
22
  ): void {
23
+ captureCacheAffinityIdentity(logCtx, providerName, provider);
21
24
  if (usesApiKeyAccount(provider)) {
22
25
  logCtx.accountLogLabel = apiKeyAccountLogLabel(providerName, provider._apiKeyAttempt);
23
- } else if (KEY_ACCOUNT_LOG_LABEL_RE.test(logCtx.accountLogLabel ?? "")) {
24
- delete logCtx.accountLogLabel;
26
+ logCtx.affinityKeyEntryId = provider._apiKeyAttempt?.entryId;
27
+ logCtx.affinityProviderName = providerName;
28
+ } else {
29
+ if (KEY_ACCOUNT_LOG_LABEL_RE.test(logCtx.accountLogLabel ?? "")) delete logCtx.accountLogLabel;
30
+ delete logCtx.affinityKeyEntryId;
31
+ delete logCtx.affinityProviderName;
25
32
  }
26
33
  }
27
34
 
@@ -61,6 +68,24 @@ export function baseProviderLabel(provider: string): string {
61
68
  return CODEX_ACCOUNT_LOG_LABEL_RE.test(suffix) ? canonicalUsageProviderLabel(provider.slice(0, cut)) : provider;
62
69
  }
63
70
 
71
+ /**
72
+ * The opaque Anthropic pool account tag (#8383): the `p<hex6>` label `formatAnthropicProviderForLog`
73
+ * already folded into an account-qualified provider such as `anthropic-p2e22d0`. It reuses that
74
+ * label instead of minting a new identifier, and lives in its own `accountTag` field so the
75
+ * `accountLogLabel`-keyed per-account summaries (#2699) do not change. Any other provider has none.
76
+ */
77
+ export function anthropicAccountTag(provider: string | undefined): `p${string}` | undefined {
78
+ const cut = provider?.lastIndexOf("-") ?? -1;
79
+ if (!provider || cut <= 0 || !isAnthropicInstanceId(provider.slice(0, cut))) return undefined;
80
+ const tag = provider.slice(cut + 1);
81
+ return CODEX_ACCOUNT_LOG_LABEL_RE.test(tag) ? tag as `p${string}` : undefined;
82
+ }
83
+
84
+ export function anthropicAccountTagField(provider: string | undefined): { accountTag?: `p${string}` } {
85
+ const accountTag = anthropicAccountTag(provider);
86
+ return accountTag ? { accountTag } : {};
87
+ }
88
+
64
89
  /**
65
90
  * Stamp the per-account usage label for a non-Codex OAuth provider (#2699).
66
91
  *
@@ -73,7 +98,8 @@ export function baseProviderLabel(provider: string): string {
73
98
  *
74
99
  * Two providers are skipped because they already have attribution:
75
100
  * - `openai` produces its own `p`-labels through `codexAuthContextLogLabel`.
76
- * - `anthropic` folds the account into the provider label (`formatAnthropicProviderForLog`).
101
+ * - `anthropic` folds the account into the provider label (`formatAnthropicProviderForLog`);
102
+ * `anthropicAccountTag` exposes that same label as the separate `accountTag` field.
77
103
  *
78
104
  * It lives here rather than in `account-label.ts` because it needs `baseProviderLabel`, and this
79
105
  * module already imports from that one -- the reverse direction would be an import cycle. This
@@ -1,6 +1,7 @@
1
1
  import { createHash } from "node:crypto";
2
2
  import type { OcxProviderConfig } from "../types";
3
3
  import { isEgressTransparentExecutor, markEgressTransparentExecutor } from "../lib/provider-egress";
4
+ import { isPassiveKeyTransparent, markPassiveKeyTransparent, markPassiveKeyDeferred, PASSIVE_KEY_SEND } from "../lib/passive-key-fetch-proof";
4
5
  import { configuredOutboundFetch } from "../lib/proxy-env";
5
6
  import { waitOutsideProviderHeaderDeadline } from "../lib/provider-admission-wait";
6
7
  import { markSameTargetRetryHold, sleepWithAbort } from "../lib/upstream-retry";
@@ -198,19 +199,27 @@ export function resolveMistralTransport(
198
199
  if (!isCanonicalMistralChat(provider) || (provider.fetch && wrapped.has(provider.fetch))) return provider;
199
200
  const baseFetch = provider.fetch
200
201
  ?? markEgressTransparentExecutor(((input, init) => configuredOutboundFetch(input, init)) as typeof globalThis.fetch);
202
+ if (!provider.fetch) markPassiveKeyTransparent(baseFetch);
201
203
  const attemptFetch = (async (input, init) => {
204
+ const send = () => {
205
+ const observe = (init as (RequestInit & { [PASSIVE_KEY_SEND]?: (input: RequestInfo | URL, init: RequestInit) => void }) | undefined)?.[PASSIVE_KEY_SEND];
206
+ if (!observe) return baseFetch(input, init);
207
+ const { [PASSIVE_KEY_SEND]: _hook, ...physicalInit } = init! as RequestInit & { [PASSIVE_KEY_SEND]?: typeof observe };
208
+ observe?.(input, physicalInit);
209
+ return baseFetch(input, physicalInit);
210
+ };
202
211
  const url = new URL(input instanceof Request ? input.url : String(input));
203
212
  if (url.origin !== "https://api.mistral.ai" || url.pathname !== "/v1/chat/completions"
204
213
  || url.search || url.hash || init?.method?.toUpperCase() !== "POST" || typeof init.body !== "string") {
205
- return baseFetch(input, init);
214
+ return send();
206
215
  }
207
216
  // The Chat adapter serializes model first. Read only that bounded prefix rather
208
217
  // than parsing/copying a potentially million-token conversation a second time.
209
218
  const encodedModel = /^\s*\{\s*"model"\s*:\s*("(?:[^"\\]|\\.)*")\s*[,}]/.exec(init.body.slice(0, 4096))?.[1];
210
219
  let model: unknown;
211
- try { model = encodedModel === undefined ? undefined : JSON.parse(encodedModel); } catch { return baseFetch(input, init); }
220
+ try { model = encodedModel === undefined ? undefined : JSON.parse(encodedModel); } catch { return send(); }
212
221
  const authorization = new Headers(init.headers).get("authorization");
213
- if (!authorization || typeof model !== "string" || !model || model.length > 256) return baseFetch(input, init);
222
+ if (!authorization || typeof model !== "string" || !model || model.length > 256) return send();
214
223
  // Bind to the actual send credential, including after pool rotation; keep no raw key.
215
224
  const identity = createHash("sha256").update(JSON.stringify([authorization, model])).digest("hex");
216
225
  const pacing = provider.requestPacing?.enabled !== false && provider.retryOn429?.respectRetryAfter !== false;
@@ -219,7 +228,7 @@ export function resolveMistralTransport(
219
228
  let response: Response;
220
229
  try {
221
230
  init.signal?.throwIfAborted();
222
- response = await baseFetch(input, init);
231
+ response = await send();
223
232
  if (pacing) budgetPacer.observe(identity, response.headers, response.status);
224
233
  } catch (error) { release?.(); throw error; }
225
234
  release?.(response.ok);
@@ -235,6 +244,10 @@ export function resolveMistralTransport(
235
244
  return response;
236
245
  }) as typeof globalThis.fetch;
237
246
  if (isEgressTransparentExecutor(baseFetch)) markEgressTransparentExecutor(attemptFetch);
247
+ if (isPassiveKeyTransparent(baseFetch)) {
248
+ markPassiveKeyTransparent(attemptFetch);
249
+ markPassiveKeyDeferred(attemptFetch);
250
+ }
238
251
  wrapped.add(attemptFetch);
239
252
  return { ...provider, fetch: attemptFetch };
240
253
  }
@@ -0,0 +1,31 @@
1
+ import type { OcxProviderConfig } from "../types";
2
+
3
+ /** Keys a `providers.<name>.modelDiscovery` block may carry (#7910). */
4
+ const PROVIDER_MODEL_DISCOVERY_KEYS = new Set(["skipInvalidRows"]);
5
+
6
+ /**
7
+ * Validate a provider's `modelDiscovery` block at the management write boundary. The loader
8
+ * degrades a malformed block to absent (strict discovery), so this is where a bad value is
9
+ * refused loudly instead of being stored and then ignored.
10
+ */
11
+ export function providerModelDiscoveryConfigError(value: unknown): string | null {
12
+ if (value === undefined) return null;
13
+ if (value === null || typeof value !== "object" || Array.isArray(value)) {
14
+ return "modelDiscovery must be an object such as { \"skipInvalidRows\": true }";
15
+ }
16
+ const record = value as Record<string, unknown>;
17
+ if (Object.keys(record).some(key => !PROVIDER_MODEL_DISCOVERY_KEYS.has(key))) {
18
+ return "modelDiscovery accepts only skipInvalidRows";
19
+ }
20
+ if (record.skipInvalidRows !== undefined && typeof record.skipInvalidRows !== "boolean") {
21
+ return "modelDiscovery.skipInvalidRows must be a boolean";
22
+ }
23
+ return null;
24
+ }
25
+
26
+ /** Whether the provider opted into skipping invalid `/models` rows. Anything but `true` is strict. */
27
+ export function providerSkipsInvalidModelRows(
28
+ provider: Partial<Pick<OcxProviderConfig, "modelDiscovery">>,
29
+ ): boolean {
30
+ return provider.modelDiscovery?.skipInvalidRows === true;
31
+ }
@@ -1,4 +1,35 @@
1
- /** Safe operator guidance for malformed upstream model lists. */
2
- export function invalidModelDiscoveryHint(diagnostic?: string): string {
3
- return `${diagnostic ? ` (${diagnostic})` : ""}. A newly added API-key provider can keep its model selection pending while discovery fails; a static models list with liveModels: false avoids discovery for gateways publishing invalid rows.`;
1
+ /**
2
+ * Safe operator guidance for malformed upstream model lists.
3
+ *
4
+ * A diagnostic is present only for a row-level failure of a generic `/models` envelope, and it
5
+ * already names the first invalid row and how many rows are invalid (never row contents). For those,
6
+ * the guidance names the per-provider `modelDiscovery.skipInvalidRows` opt-in (#7910) next to the
7
+ * static-roster recovery; once the opt-in is on, reaching here means no row survived.
8
+ */
9
+ export function invalidModelDiscoveryHint(diagnostic?: string, skipInvalidRows = false): string {
10
+ const pending = "A newly added API-key provider can keep its model selection pending while discovery fails";
11
+ const staticRoster = "a static models list with liveModels: false avoids discovery for gateways publishing invalid rows.";
12
+ if (!diagnostic) return `. ${pending}; ${staticRoster}`;
13
+ if (skipInvalidRows) {
14
+ return ` (${diagnostic}). modelDiscovery.skipInvalidRows left no usable row, so the listing stays rejected. ${pending}; ${staticRoster}`;
15
+ }
16
+ return ` (${diagnostic}). ${pending}; set modelDiscovery.skipInvalidRows: true on this provider to skip invalid rows and keep the valid ones, or use a static models list with liveModels: false to avoid discovery for gateways publishing invalid rows.`;
17
+ }
18
+
19
+ const skippedRowWarnings = new Map<string, string>();
20
+
21
+ /**
22
+ * Whether a successful listing that skipped invalid rows should be logged. The warning is one-time
23
+ * per provider for an unchanged skipped/received count; a clean listing resets it so a recurrence
24
+ * is reported again. Keyed by provider name, so it is bounded by the configured providers.
25
+ */
26
+ export function shouldWarnSkippedModelRows(provider: string, skipped: number, rawCount: number): boolean {
27
+ if (skipped <= 0) {
28
+ skippedRowWarnings.delete(provider);
29
+ return false;
30
+ }
31
+ const signature = `${skipped}/${rawCount}`;
32
+ if (skippedRowWarnings.get(provider) === signature) return false;
33
+ skippedRowWarnings.set(provider, signature);
34
+ return true;
4
35
  }
@@ -1,5 +1,6 @@
1
1
  import { extractWorkBuddyModels } from "./workbuddy-models";
2
2
  import type { OcxProviderConfig } from "../types";
3
+ import { providerSkipsInvalidModelRows } from "./model-discovery-config";
3
4
  import {
4
5
  isValidModelDiscoveryModelId,
5
6
  MODEL_DISCOVERY_MAX_MODEL_ID_LENGTH,
@@ -31,6 +32,8 @@ export interface ResolvedProviderModelDiscovery {
31
32
  spec?: ProviderModelDiscoverySpec;
32
33
  maxResponseBytes: number;
33
34
  maxModels: number;
35
+ /** Operator opt-in `providers.<name>.modelDiscovery.skipInvalidRows` (#7910); absent means strict. */
36
+ skipInvalidRows?: true;
34
37
  }
35
38
 
36
39
  export type ProviderModelsApiItem = Record<string, unknown> & { id: string };
@@ -46,7 +49,7 @@ export type BoundedDiscoveryJsonResult =
46
49
  | { ok: false; reason: "response_too_large" | "invalid_json" };
47
50
 
48
51
  export type ProviderModelItemsResult =
49
- | { ok: true; items: ProviderModelsApiItem[]; rawCount: number }
52
+ | { ok: true; items: ProviderModelsApiItem[]; rawCount: number; skippedInvalidRows?: number }
50
53
  | { ok: false; reason: "invalid_shape" | "too_many_models"; diagnostic?: string };
51
54
 
52
55
  export type ModelEnvelopeRowsResult =
@@ -162,7 +165,7 @@ export function providerModelDiscoverySpecError(spec: ProviderModelDiscoverySpec
162
165
 
163
166
  export function resolveProviderModelDiscovery(
164
167
  providerName: string,
165
- provider: Pick<OcxProviderConfig, "baseUrl" | "adapter"> & Partial<Pick<OcxProviderConfig, "authMode">>,
168
+ provider: Pick<OcxProviderConfig, "baseUrl" | "adapter"> & Partial<Pick<OcxProviderConfig, "authMode" | "modelDiscovery">>,
166
169
  ): ResolvedProviderModelDiscovery {
167
170
  // The dashboard permits a canonical preset to be saved under a different name. Recover its
168
171
  // registry-owned discovery policy by transport in that case. The destination helper is limited
@@ -177,6 +180,8 @@ export function resolveProviderModelDiscovery(
177
180
  ...(spec ? { spec } : {}),
178
181
  maxResponseBytes: positiveIntegerAtMost(spec?.maxResponseBytes, MODEL_DISCOVERY_MAX_RESPONSE_BYTES),
179
182
  maxModels: positiveIntegerAtMost(spec?.maxModels, MODEL_DISCOVERY_MAX_MODELS),
183
+ // Operator configuration, never registry policy: the registry cannot relax row validation.
184
+ ...(providerSkipsInvalidModelRows(provider) ? { skipInvalidRows: true as const } : {}),
180
185
  };
181
186
  }
182
187
 
@@ -509,6 +514,22 @@ function plainObject(value: unknown): Record<string, unknown> | null {
509
514
  ? value as Record<string, unknown>
510
515
  : null;
511
516
  }
517
+
518
+ /** Why one envelope row cannot become a model, phrased without any row content. */
519
+ function invalidRowReason(raw: unknown, idField: string): string | undefined {
520
+ const row = plainObject(raw);
521
+ if (!row) return "is not an object";
522
+ const id = row[idField];
523
+ if (isValidModelDiscoveryModelId(id)) return undefined;
524
+ return typeof id !== "string" ? "has a non-string id" : !id.trim() ? "has an empty id" : "has an invalid id";
525
+ }
526
+
527
+ /**
528
+ * Strict discovery rejects a listing with any invalid row; `skipInvalidRows` (#7910) drops those rows
529
+ * instead. Every row is still counted against the raw-row ceiling before this runs, and a listing
530
+ * where invalid rows were skipped but nothing was admitted stays malformed: skipping must never turn
531
+ * a broken listing into an authoritative empty roster.
532
+ */
512
533
  export function extractProviderModelItems(
513
534
  value: unknown,
514
535
  discovery: ResolvedProviderModelDiscovery,
@@ -534,12 +555,19 @@ export function extractProviderModelItems(
534
555
  const preferred: ProviderModelsApiItem[] = [];
535
556
  const seen = new Set<string>();
536
557
  const idField = discovery.spec?.idField ?? "id";
558
+ const skipInvalidRows = discovery.skipInvalidRows === true;
559
+ let invalidRows = 0;
560
+ let firstInvalid = "";
537
561
  for (const [index, raw] of data.entries()) {
538
- if (raw === null || typeof raw !== "object" || Array.isArray(raw)) {
539
- return { ok: false, reason: "invalid_shape", diagnostic: `row ${index} is not an object` };
562
+ const invalid = invalidRowReason(raw, idField);
563
+ if (invalid !== undefined) {
564
+ if (invalidRows === 0) firstInvalid = `row ${index} ${invalid}`;
565
+ invalidRows += 1;
566
+ continue;
540
567
  }
541
- const id = (raw as Record<string, unknown>)[idField];
542
- if (!isValidModelDiscoveryModelId(id)) return { ok: false, reason: "invalid_shape", diagnostic: `row ${index} has ${typeof id !== "string" ? "a non-string id" : !id.trim() ? "an empty id" : "an invalid id"}` };
568
+ // A strict listing is already rejected; keep scanning only to count the invalid rows.
569
+ if (invalidRows > 0 && !skipInvalidRows) continue;
570
+ const id = (raw as Record<string, unknown>)[idField] as string;
543
571
  const prefix = discovery.spec?.stripIdPrefix;
544
572
  let finalId = id;
545
573
  if (prefix && finalId.startsWith(prefix)) {
@@ -562,5 +590,13 @@ export function extractProviderModelItems(
562
590
  ? preferred : items;
563
591
  target.push(siblings ? enrichAdmittedModel(item, siblings) : item);
564
592
  }
565
- return { ok: true, items: [...preferred, ...items], rawCount: data.length };
593
+ if (invalidRows > 0 && (!skipInvalidRows || items.length + preferred.length === 0)) {
594
+ return { ok: false, reason: "invalid_shape", diagnostic: `${firstInvalid}; ${invalidRows} of ${data.length} rows invalid` };
595
+ }
596
+ return {
597
+ ok: true,
598
+ items: [...preferred, ...items],
599
+ rawCount: data.length,
600
+ ...(invalidRows > 0 ? { skippedInvalidRows: invalidRows } : {}),
601
+ };
566
602
  }
@@ -6,6 +6,7 @@ type ModelRenameRole = "none" | "record" | "list" | "scalar" | "nested-models";
6
6
  export const PROVIDER_MODEL_RENAME_ROLES = {
7
7
  alias: "none",
8
8
  modelAliases: "record",
9
+ aliasTemplate: "none",
9
10
  modelDisplayNames: "record",
10
11
  defaultAliases: "none",
11
12
  adapter: "none",
@@ -58,6 +59,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
58
59
  defaultModel: "scalar",
59
60
  models: "list",
60
61
  liveModels: "none",
62
+ modelDiscovery: "none",
61
63
  selectedModels: "list",
62
64
  initialModelSelection: "none",
63
65
  retainModels: "list",
@@ -112,6 +114,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
112
114
  zaiResponsesDefaultVersion: "none",
113
115
  supportsResponsesCustomTools: "none",
114
116
  unsupportedHostedTools: "none",
117
+ unsupportedHostedToolsWithClientTools: "none",
115
118
  responsesSnapshotRepair: "none",
116
119
  webSearchBridge: "none",
117
120
  reasoningEffortMap: "none",
@@ -133,6 +136,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
133
136
  foldDeveloperRoleToSystem: "none",
134
137
  singleLeadingSystemMessage: "none",
135
138
  promptCacheKey: "none",
139
+ cacheAffinity: "none",
136
140
  chatServiceTier: "none",
137
141
  responsesItemIdRepair: "none",
138
142
  autoToolChoiceOnlyModels: "list",
@@ -150,6 +154,7 @@ export const PROVIDER_MODEL_RENAME_ROLES = {
150
154
  thinkingBudgetModels: "list",
151
155
  escapeBuiltinToolNames: "none",
152
156
  anthropicEofTolerance: "none",
157
+ forwardAdvisorTool: "none",
153
158
  noVisionModels: "list",
154
159
  googleMode: "none",
155
160
  googleToolSchemaPolicy: "none",