@bitkyc08/opencodex 2.100.2 → 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 (561) 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-BcaI-VCr.js → Tray-BV4ms9U9.js} +1 -1
  6. package/gui/dist/assets/{brand-mark-DU-0Vdkr.js → brand-mark-XOLJbomA.js} +1 -1
  7. package/gui/dist/assets/index-DCdXsMyZ.js +105 -0
  8. package/gui/dist/assets/{index-DJEkIDAi.css → index-DQtCRNAw.css} +1 -1
  9. package/gui/dist/assets/{segment-thumb-features-e9A_FogJ.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-DT146AhS.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-CakPe9Ni.js → quota-summary-Dy5_wfTT.js} +1 -1
  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 +3 -3
  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/protobuf-request.ts +8 -8
  38. package/src/adapters/cursor.ts +7 -6
  39. package/src/adapters/google-antigravity-wire.ts +7 -5
  40. package/src/adapters/google-wire-compiler.ts +2 -2
  41. package/src/adapters/google.ts +9 -2
  42. package/src/adapters/kiro/payload.ts +7 -4
  43. package/src/adapters/kiro/reasoning.ts +44 -1
  44. package/src/adapters/kiro/structured-output.ts +10 -8
  45. package/src/adapters/kiro-tools.ts +61 -15
  46. package/src/adapters/openai-chat/destination-policy.ts +16 -0
  47. package/src/adapters/openai-chat/reasoning-replay.ts +4 -1
  48. package/src/adapters/zed.ts +3 -0
  49. package/src/advisor/consult.ts +15 -4
  50. package/src/advisor/context.ts +12 -3
  51. package/src/advisor/runtime.ts +35 -5
  52. package/src/advisor/settings.ts +8 -0
  53. package/src/advisor/synthetic-tool.ts +21 -8
  54. package/src/bridge/response-json.ts +11 -2
  55. package/src/bridge/sse.ts +43 -8
  56. package/src/claude/auth-detect.ts +21 -33
  57. package/src/claude/desktop-3p.ts +11 -5
  58. package/src/claude/desktop-gateway-state.ts +2 -0
  59. package/src/claude/desktop-remote-store-artifact.ts +14 -3
  60. package/src/claude/desktop-remote-store.ts +24 -4
  61. package/src/claude/inbound-content-options.ts +31 -16
  62. package/src/claude/outbound.ts +13 -3
  63. package/src/cli/account-api.ts +17 -1
  64. package/src/cli/account-auth.ts +54 -21
  65. package/src/cli/account-key-quota.ts +34 -5
  66. package/src/cli/account.ts +4 -2
  67. package/src/cli/advisor.ts +7 -4
  68. package/src/cli/alias.ts +38 -1
  69. package/src/cli/capabilities-access-remote.ts +128 -3
  70. package/src/cli/capabilities-accounts.ts +3 -3
  71. package/src/cli/capabilities-agents-routing.ts +17 -10
  72. package/src/cli/capabilities-base.ts +41 -16
  73. package/src/cli/capabilities-integrations.ts +2 -2
  74. package/src/cli/capabilities-provider-models.ts +18 -2
  75. package/src/cli/capabilities-route-to.ts +43 -0
  76. package/src/cli/capabilities.ts +2 -0
  77. package/src/cli/capability-contracts.ts +1 -1
  78. package/src/cli/claude-desktop.ts +30 -11
  79. package/src/cli/claude.ts +17 -3
  80. package/src/cli/codex-launcher.ts +3 -1
  81. package/src/cli/codex-shim-autorestore.ts +5 -42
  82. package/src/cli/config-command.ts +14 -1
  83. package/src/cli/config-root-startup.ts +34 -0
  84. package/src/cli/connect.ts +88 -16
  85. package/src/cli/desktop-runtime-guidance.ts +1 -1
  86. package/src/cli/disconnect-runtime.ts +168 -0
  87. package/src/cli/dispatch.ts +54 -12
  88. package/src/cli/export-command.ts +1 -1
  89. package/src/cli/gui-pair-client.ts +6 -3
  90. package/src/cli/gui.ts +10 -5
  91. package/src/cli/help-catalog.ts +11 -0
  92. package/src/cli/help.ts +4 -3
  93. package/src/cli/index.ts +83 -92
  94. package/src/cli/inspect.ts +11 -2
  95. package/src/cli/integrations.ts +26 -1
  96. package/src/cli/link-capture.ts +64 -0
  97. package/src/cli/link-child-ops.ts +218 -40
  98. package/src/cli/link-cleanup.ts +8 -5
  99. package/src/cli/link-diagnostics.ts +67 -0
  100. package/src/cli/link-enrollment.ts +158 -12
  101. package/src/cli/link-operations.ts +52 -0
  102. package/src/cli/link-recover.ts +152 -0
  103. package/src/cli/link-routes.ts +87 -0
  104. package/src/cli/link-status-child.ts +44 -1
  105. package/src/cli/link-status-traffic.ts +34 -0
  106. package/src/cli/link.ts +314 -37
  107. package/src/cli/message-command.ts +1 -1
  108. package/src/cli/message-mcp-command.ts +23 -10
  109. package/src/cli/models-runtime.ts +3 -3
  110. package/src/cli/opencode.ts +3 -1
  111. package/src/cli/pi-sync.ts +35 -0
  112. package/src/cli/preflight-exemptions.ts +46 -0
  113. package/src/cli/registry.ts +28 -12
  114. package/src/cli/restart-failure.ts +5 -2
  115. package/src/cli/root.ts +5 -1
  116. package/src/cli/route-to.ts +172 -0
  117. package/src/cli/runtime-api.ts +5 -8
  118. package/src/cli/status.ts +3 -1
  119. package/src/cli/stop-approval.ts +66 -19
  120. package/src/cli/stop-report.ts +23 -0
  121. package/src/cli/stop-windows-checked.ts +304 -0
  122. package/src/cli/sync-command.ts +70 -15
  123. package/src/cli/sync-fanout.ts +74 -19
  124. package/src/cli/sync-flags.ts +40 -3
  125. package/src/cli/sync-link-status.ts +18 -2
  126. package/src/cli/sync-update-guard.ts +7 -2
  127. package/src/cli/system-restart-client.ts +3 -2
  128. package/src/cli/uninstall-plan.ts +77 -5
  129. package/src/cli/uninstall-stop.ts +152 -0
  130. package/src/cli/v2-input.ts +10 -6
  131. package/src/cli/v2-local-output.ts +3 -2
  132. package/src/cli/v2-runtime.ts +10 -3
  133. package/src/cli/v2.ts +22 -7
  134. package/src/client/connect.ts +321 -34
  135. package/src/client/link-home-features.ts +27 -0
  136. package/src/client/link-home.ts +92 -4
  137. package/src/client/link-ingress.ts +21 -3
  138. package/src/client/link-join.ts +12 -2
  139. package/src/client/link-parity-reporter.ts +60 -6
  140. package/src/client/link-relay-transport.ts +161 -36
  141. package/src/client/link-relay.ts +150 -6
  142. package/src/client/link-request-compression.ts +84 -0
  143. package/src/client/link-state.ts +11 -5
  144. package/src/client/link-status.ts +39 -1
  145. package/src/client/link-teardown.ts +1 -0
  146. package/src/client/link-tunnel.ts +56 -5
  147. package/src/client/link-websocket-limits.ts +89 -0
  148. package/src/client/link-websocket.ts +586 -0
  149. package/src/client/link-ws-advertisement.ts +100 -0
  150. package/src/client/link-ws-framer.ts +241 -0
  151. package/src/client/link-ws-transport.ts +177 -0
  152. package/src/client/machine-api.ts +13 -2
  153. package/src/client/machine-listener.ts +48 -7
  154. package/src/client/route-intent-apply.ts +293 -0
  155. package/src/client/route-intent-file-originals.ts +97 -0
  156. package/src/client/route-intent-native-originals.ts +201 -0
  157. package/src/client/route-intent-watch.ts +141 -0
  158. package/src/client/runtime-restart.ts +127 -5
  159. package/src/client/runtime.ts +61 -15
  160. package/src/client/state.ts +30 -0
  161. package/src/client/sync-expectation.ts +36 -2
  162. package/src/client/sync-runtime.ts +7 -0
  163. package/src/clients/config-export/alias-selectors.ts +63 -40
  164. package/src/clients/config-export/contracts.ts +2 -0
  165. package/src/clients/config-export/nested-selectors.ts +42 -0
  166. package/src/clients/config-export.ts +22 -3
  167. package/src/codex/account-store.ts +12 -3
  168. package/src/codex/account-usability.ts +13 -0
  169. package/src/codex/auth-api/account-list.ts +29 -3
  170. package/src/codex/auth-collision.ts +23 -22
  171. package/src/codex/auth-context.ts +21 -6
  172. package/src/codex/catalog/gather-capture.ts +8 -2
  173. package/src/codex/catalog/parsing.ts +7 -3
  174. package/src/codex/catalog/provider-models.ts +54 -15
  175. package/src/codex/catalog/retained-sync.ts +2 -1
  176. package/src/codex/catalog/routed-gather.ts +1 -1
  177. package/src/codex/catalog-auto-refresh.ts +11 -0
  178. package/src/codex/cli-update-job.ts +35 -13
  179. package/src/codex/convergence.ts +2 -2
  180. package/src/codex/desktop-compatibility/native-identity.ts +4 -8
  181. package/src/codex/features.ts +2 -2
  182. package/src/codex/history-provider.ts +31 -0
  183. package/src/codex/inject/multi-agent-v2.ts +9 -3
  184. package/src/codex/inject/paginated-openai-compat.ts +54 -1
  185. package/src/codex/inject/plan.ts +20 -2
  186. package/src/codex/inject.ts +2 -0
  187. package/src/codex/journal-config-restore.ts +217 -0
  188. package/src/codex/journal.ts +75 -6
  189. package/src/codex/main-account.ts +23 -30
  190. package/src/codex/native-main-auth-file.ts +104 -0
  191. package/src/codex/native-profile-manager.ts +4 -3
  192. package/src/codex/native-profile-store.ts +3 -61
  193. package/src/codex/orca-import.ts +10 -1
  194. package/src/codex/quota-history.ts +13 -0
  195. package/src/codex/quota-window-conflict.ts +103 -0
  196. package/src/codex/quota.ts +23 -1
  197. package/src/codex/subagent-model-fallback.ts +3 -1
  198. package/src/codex/websocket-activity.ts +171 -16
  199. package/src/codex/websocket-registry.ts +11 -4
  200. package/src/combos/cooldown-store.ts +25 -5
  201. package/src/combos/failover.ts +330 -2
  202. package/src/config/dashboard-trusted-proxy.ts +83 -0
  203. package/src/config/diagnostics.ts +28 -0
  204. package/src/config/feature-flags.ts +9 -0
  205. package/src/config/live-reconcile.ts +10 -1
  206. package/src/config/load-degrade.ts +12 -1
  207. package/src/config/multi-agent-surface.ts +28 -5
  208. package/src/config/pending-teardown.ts +60 -3
  209. package/src/config/process-state.ts +175 -4
  210. package/src/config/provider-validation.ts +4 -4
  211. package/src/config/schema/config-schema.ts +6 -0
  212. package/src/config/schema/leaf-validators.ts +9 -2
  213. package/src/config/windows-process-command-line.ts +107 -0
  214. package/src/generated/compatibility-version.json +948 -392
  215. package/src/generated/model-metadata.ts +1 -1
  216. package/src/images/loop.ts +3 -0
  217. package/src/integrations/model-name-guard.ts +25 -0
  218. package/src/integrations/route-intent-catalog.ts +26 -0
  219. package/src/integrations/route-intent-connected.ts +262 -0
  220. package/src/integrations/route-intent-contract.ts +55 -0
  221. package/src/integrations/route-intent-disconnect.ts +109 -0
  222. package/src/integrations/route-intent-initial.ts +64 -0
  223. package/src/integrations/route-intent-state.ts +117 -0
  224. package/src/integrations/route-intent-tick.ts +65 -0
  225. package/src/integrations/route-intent.ts +212 -0
  226. package/src/integrations/writer.ts +44 -11
  227. package/src/lib/client-retry-after.ts +29 -0
  228. package/src/lib/config-ownership.ts +13 -0
  229. package/src/lib/desktop-gui-origin.ts +28 -0
  230. package/src/lib/errors.ts +1 -1
  231. package/src/lib/gui-pair-capability.ts +2 -1
  232. package/src/lib/messages-error-body.ts +4 -1
  233. package/src/lib/outbound-credential-registry.ts +362 -4
  234. package/src/lib/paced-stream.ts +34 -0
  235. package/src/lib/passive-key-fetch-proof.ts +30 -0
  236. package/src/lib/passive-read.ts +5 -0
  237. package/src/lib/process-control.ts +76 -12
  238. package/src/lib/redact.ts +84 -8
  239. package/src/lib/state-store-registrations.ts +11 -0
  240. package/src/lib/state-store-sweeper.ts +4 -0
  241. package/src/lib/supervisor-markers.ts +18 -0
  242. package/src/lib/terminal-safe-text.ts +58 -0
  243. package/src/lib/translator-budget.ts +3 -2
  244. package/src/lib/upstream-retry.ts +14 -4
  245. package/src/link/alias-lock.ts +119 -0
  246. package/src/link/child-activity.ts +28 -2
  247. package/src/link/child-binary-cache-fill.d.mts +50 -0
  248. package/src/link/child-binary-cache-fill.mjs +494 -0
  249. package/src/link/child-binary-cache-start.ts +73 -0
  250. package/src/link/child-binary-source.ts +12 -5
  251. package/src/link/child-gated-ocx.ts +29 -11
  252. package/src/link/child-observations.ts +2 -1
  253. package/src/link/child-observe.ts +2 -2
  254. package/src/link/child-ops-engine.ts +159 -91
  255. package/src/link/child-ops-host.ts +138 -0
  256. package/src/link/child-ops-runners.ts +319 -0
  257. package/src/link/child-ops-scheduler.ts +207 -0
  258. package/src/link/child-ops-types.ts +89 -0
  259. package/src/link/child-parity.ts +23 -4
  260. package/src/link/child-policy.ts +93 -0
  261. package/src/link/child-update-contract.ts +12 -3
  262. package/src/link/codex-settings.ts +1 -1
  263. package/src/link/compatibility.ts +18 -1
  264. package/src/link/diagnostics-read.ts +163 -0
  265. package/src/link/diagnostics.ts +20 -7
  266. package/src/link/explicit-route.ts +209 -0
  267. package/src/link/link-recover.ts +113 -0
  268. package/src/link/management-routes.ts +3 -1
  269. package/src/link/operation-recovery-slot.ts +44 -0
  270. package/src/link/operations-journal.ts +408 -0
  271. package/src/link/peer-report.ts +1 -1
  272. package/src/link/relay-auth.ts +14 -0
  273. package/src/link/remote-plant.ts +152 -14
  274. package/src/link/remote-platform.ts +21 -10
  275. package/src/link/remote-probe.ts +11 -3
  276. package/src/link/remote-windows.ts +50 -10
  277. package/src/link/request-compression.ts +30 -0
  278. package/src/link/residual-recovery.ts +54 -0
  279. package/src/link/retirement.ts +128 -0
  280. package/src/link/route-intent-watch.ts +41 -0
  281. package/src/link/route-intent.ts +209 -0
  282. package/src/link/route-proof.ts +82 -0
  283. package/src/link/route-rounds.ts +579 -0
  284. package/src/link/route-select.ts +95 -0
  285. package/src/link/route-trust.ts +96 -0
  286. package/src/link/ssh-argv.ts +172 -24
  287. package/src/link/ssh-capture-redact.ts +253 -0
  288. package/src/link/ssh-capture.ts +497 -0
  289. package/src/link/ssh-runner.ts +141 -14
  290. package/src/link/status-projection.ts +87 -0
  291. package/src/link/store.ts +54 -1
  292. package/src/link/supervisor.ts +543 -55
  293. package/src/link/sync-fanout-classify.ts +16 -0
  294. package/src/link/sync-then-restart.ts +65 -0
  295. package/src/link/tombstones.ts +209 -0
  296. package/src/link/traffic.ts +178 -0
  297. package/src/link/ws-activity-holds.ts +474 -0
  298. package/src/local-credentials/publication-fence.ts +20 -1
  299. package/src/messaging/mcp-queue-rpc.ts +1 -1
  300. package/src/messaging/mcp-queue-server.ts +16 -1
  301. package/src/messaging/mcp-resume-tools.ts +25 -0
  302. package/src/messaging/remote-enrollment.ts +3 -3
  303. package/src/messaging/remote-tunnels.ts +2 -2
  304. package/src/messaging/resume-permissions.ts +27 -0
  305. package/src/messaging/rpc.ts +46 -2
  306. package/src/oauth/anthropic-continuity.ts +23 -7
  307. package/src/oauth/anthropic-routing.ts +5 -2
  308. package/src/oauth/anthropic.ts +22 -2
  309. package/src/oauth/claude-keychain-read.ts +78 -68
  310. package/src/oauth/index.ts +24 -6
  311. package/src/oauth/local-token-detect.ts +8 -29
  312. package/src/oauth/login-cli-errors.ts +5 -1
  313. package/src/oauth/login-cli.ts +33 -18
  314. package/src/oauth/login-flow-state.ts +26 -3
  315. package/src/oauth/meta-muse.ts +1 -1
  316. package/src/oauth/store.ts +7 -0
  317. package/src/oauth/xai.ts +248 -14
  318. package/src/protocols/contract.ts +4 -0
  319. package/src/protocols/encoders/messages.ts +1 -0
  320. package/src/providers/alias-template.ts +48 -0
  321. package/src/providers/anthropic-billing-ownership.ts +2 -0
  322. package/src/providers/anthropic-output-caps.ts +46 -0
  323. package/src/providers/anthropic-reset-grant-ledger.ts +9 -3
  324. package/src/providers/antigravity-effort-families.ts +11 -3
  325. package/src/providers/antigravity-models.ts +32 -9
  326. package/src/providers/antigravity-wire-snapshot.ts +3 -2
  327. package/src/providers/api-key-pause.ts +3 -0
  328. package/src/providers/api-key-resolve.ts +49 -7
  329. package/src/providers/api-key-response-ownership.ts +2 -0
  330. package/src/providers/api-key-selection.ts +51 -9
  331. package/src/providers/api-keys.ts +6 -2
  332. package/src/providers/cache-affinity-identity.ts +73 -0
  333. package/src/providers/cache-affinity.ts +256 -0
  334. package/src/providers/default-aliases.ts +98 -20
  335. package/src/providers/google-vertex-model-discovery.ts +510 -0
  336. package/src/providers/key-failover.ts +123 -8
  337. package/src/providers/key-store.ts +3 -3
  338. package/src/providers/kiro-models.ts +3 -5
  339. package/src/providers/label.ts +31 -5
  340. package/src/providers/mistral-transport.ts +17 -4
  341. package/src/providers/model-rename-fields.ts +3 -0
  342. package/src/providers/muse-key-quota.ts +14 -6
  343. package/src/providers/new-model-policy-runtime.ts +17 -4
  344. package/src/providers/new-model-policy.ts +30 -4
  345. package/src/providers/passive-key-observation.ts +252 -0
  346. package/src/providers/quota/account-cache.ts +2 -1
  347. package/src/providers/quota/anthropic-cooldown-recovery-worker.ts +121 -0
  348. package/src/providers/quota/passive-key-limits.ts +272 -0
  349. package/src/providers/quota/passive-wire-model.ts +126 -0
  350. package/src/providers/quota/report-cache.ts +61 -2
  351. package/src/providers/quota-key-accounts.ts +11 -6
  352. package/src/providers/quota-types.ts +18 -0
  353. package/src/providers/quota.ts +11 -12
  354. package/src/providers/registry/entries-core.ts +34 -16
  355. package/src/providers/registry/entries-extended.ts +32 -0
  356. package/src/providers/registry/model-seeds.ts +35 -0
  357. package/src/providers/resolved-model-policy.ts +7 -0
  358. package/src/providers/routed-config.ts +8 -3
  359. package/src/providers/xai-transport.ts +3 -0
  360. package/src/remote/features.ts +17 -0
  361. package/src/responses/anthropic-progress.ts +10 -4
  362. package/src/responses/citation-markers.ts +231 -0
  363. package/src/responses/spill-store.ts +5 -1
  364. package/src/responses/state/replay-input.ts +50 -0
  365. package/src/responses/state/replay-owner.ts +24 -0
  366. package/src/responses/state/snapshot-codec.ts +9 -0
  367. package/src/responses/state/spill-queue.ts +1 -0
  368. package/src/responses/state.ts +42 -60
  369. package/src/router.ts +2 -2
  370. package/src/routing/home-route-capture.ts +123 -0
  371. package/src/routing/home-route-intent.ts +200 -0
  372. package/src/routing/route-intent-state.ts +178 -0
  373. package/src/routing/route-to-live-settings.ts +35 -0
  374. package/src/routing/route-to-local.ts +145 -0
  375. package/src/routing/route-to-status.ts +94 -0
  376. package/src/routing/route-to-sync-child.ts +32 -0
  377. package/src/server/adapter-resolve.ts +21 -1
  378. package/src/server/admitted-http-turn.ts +3 -0
  379. package/src/server/auth-cors.ts +98 -0
  380. package/src/server/bare-upstream-error.ts +220 -0
  381. package/src/server/chat-native.ts +14 -5
  382. package/src/server/claude-messages.ts +6 -4
  383. package/src/server/codex-model-list.ts +2 -1
  384. package/src/server/configured-credentials.ts +37 -5
  385. package/src/server/gui-desktop-authorization.ts +36 -0
  386. package/src/server/gui-pair-delivery.ts +6 -3
  387. package/src/server/gui-session.ts +10 -1
  388. package/src/server/inbound-body-admission.ts +17 -4
  389. package/src/server/index/link-listener.ts +190 -12
  390. package/src/server/index/link-management.ts +15 -1
  391. package/src/server/index/link-relay-sessions.ts +87 -8
  392. package/src/server/index/link-websocket-limits.ts +136 -0
  393. package/src/server/index/link-websocket.ts +692 -0
  394. package/src/server/index/optional-listeners.ts +97 -7
  395. package/src/server/index/route-intent-watch.ts +47 -0
  396. package/src/server/index/serve-contract.ts +86 -0
  397. package/src/server/index/serve-options.ts +35 -86
  398. package/src/server/index/startup-warnings.ts +8 -2
  399. package/src/server/index/websocket-handler.ts +26 -4
  400. package/src/server/index.ts +12 -2
  401. package/src/server/inference/client-encoder-delivery.ts +2 -0
  402. package/src/server/inspection-tee.ts +39 -2
  403. package/src/server/lifecycle.ts +2 -0
  404. package/src/server/link-turn.ts +137 -0
  405. package/src/server/management/advisor-routes.ts +10 -2
  406. package/src/server/management/agent-settings-routes.ts +50 -16
  407. package/src/server/management/anthropic-reset-grant-routes.ts +1 -1
  408. package/src/server/management/context.ts +9 -2
  409. package/src/server/management/desktop-authorization.ts +41 -0
  410. package/src/server/management/desktop-compatibility-routes.ts +9 -8
  411. package/src/server/management/desktop-compatibility-runtime-routes.ts +3 -2
  412. package/src/server/management/desktop-compatibility-settings-routes.ts +5 -3
  413. package/src/server/management/home-integration-decision.ts +89 -0
  414. package/src/server/management/integration-routes.ts +208 -81
  415. package/src/server/management/link-child-ops-routes.ts +145 -43
  416. package/src/server/management/link-child-preflight.ts +31 -0
  417. package/src/server/management/link-diagnostics-route.ts +29 -0
  418. package/src/server/management/link-enrollment.ts +199 -47
  419. package/src/server/management/link-operation.ts +609 -0
  420. package/src/server/management/link-recover-route.ts +103 -0
  421. package/src/server/management/link-route-edit.ts +173 -0
  422. package/src/server/management/link-route-request.ts +62 -0
  423. package/src/server/management/link-route-state.ts +83 -7
  424. package/src/server/management/link-routes.ts +553 -51
  425. package/src/server/management/link-traffic-status.ts +13 -0
  426. package/src/server/management/model-routes.ts +122 -36
  427. package/src/server/management/model-rows.ts +2 -1
  428. package/src/server/management/native-integration-routes.ts +176 -70
  429. package/src/server/management/oauth-account-routes.ts +36 -13
  430. package/src/server/management/protocol-routes.ts +7 -0
  431. package/src/server/management/provider-completion-test.ts +4 -4
  432. package/src/server/management/provider-overwrite-carry.ts +11 -0
  433. package/src/server/management/provider-routes.ts +64 -61
  434. package/src/server/management/provider-routing-quota.ts +45 -0
  435. package/src/server/management/route-registry.ts +22 -3
  436. package/src/server/management/route-to-routes.ts +257 -0
  437. package/src/server/management/system-restart.ts +4 -2
  438. package/src/server/management/usage-aggregate-cache.ts +101 -66
  439. package/src/server/management-api.ts +17 -3
  440. package/src/server/management-auth.ts +13 -1
  441. package/src/server/messages-native-preflight.ts +27 -4
  442. package/src/server/messages-native.ts +17 -5
  443. package/src/server/persistent-gui-session.ts +6 -3
  444. package/src/server/proxy-liveness.ts +33 -6
  445. package/src/server/relay-eager.ts +36 -12
  446. package/src/server/relay.ts +183 -116
  447. package/src/server/request-body-facts.ts +48 -0
  448. package/src/server/request-decompress.ts +65 -2
  449. package/src/server/request-log-account-rotation.ts +6 -0
  450. package/src/server/request-log-attempt-usage.ts +69 -0
  451. package/src/server/request-log-cache-affinity.ts +60 -0
  452. package/src/server/request-log-conversation.ts +45 -2
  453. package/src/server/request-log-terminal-status.ts +210 -24
  454. package/src/server/request-log.ts +71 -79
  455. package/src/server/responses/adapter-continuation.ts +2 -1
  456. package/src/server/responses/adapter-delivery.ts +2 -0
  457. package/src/server/responses/adapter-dispatch.ts +5 -7
  458. package/src/server/responses/advisor-plan-slot.ts +33 -1
  459. package/src/server/responses/advisor-question.ts +21 -0
  460. package/src/server/responses/advisor-slot.ts +10 -3
  461. package/src/server/responses/bare-namespace-aliases.ts +18 -0
  462. package/src/server/responses/buffered-sse-json.ts +9 -3
  463. package/src/server/responses/code-mode-collab-surface.ts +11 -0
  464. package/src/server/responses/codex-tool-catalog.ts +156 -0
  465. package/src/server/responses/combo-required-tool-fulfillments.ts +4 -2
  466. package/src/server/responses/combo-stream-preflight.ts +557 -54
  467. package/src/server/responses/compact.ts +32 -8
  468. package/src/server/responses/core-codex-account.ts +17 -3
  469. package/src/server/responses/core-combo-failure.ts +8 -0
  470. package/src/server/responses/core-combo.ts +32 -4
  471. package/src/server/responses/core-errors.ts +5 -2
  472. package/src/server/responses/core-lifetime.ts +3 -2
  473. package/src/server/responses/core-normalize.ts +3 -1
  474. package/src/server/responses/core-options.ts +6 -0
  475. package/src/server/responses/core.ts +2 -0
  476. package/src/server/responses/fetch-helpers.ts +15 -10
  477. package/src/server/responses/native-replay-guard.ts +57 -0
  478. package/src/server/responses/opengateway-completion-guard.ts +10 -4
  479. package/src/server/responses/outbound-request-body.ts +29 -0
  480. package/src/server/responses/passthrough-completion.ts +105 -8
  481. package/src/server/responses/passthrough-delivery.ts +31 -11
  482. package/src/server/responses/passthrough-dispatch.ts +74 -73
  483. package/src/server/responses/policy-fallback.ts +13 -1
  484. package/src/server/responses/request-prepare.ts +50 -6
  485. package/src/server/responses/request-transport.ts +10 -3
  486. package/src/server/responses/reset-replay.ts +46 -2
  487. package/src/server/responses/run-turn-execution.ts +2 -0
  488. package/src/server/responses/sidecar-execution.ts +14 -0
  489. package/src/server/responses/terminal-error-redaction.ts +222 -25
  490. package/src/server/responses/ws-upstream.ts +2 -2
  491. package/src/server/sse-payload-rewrite.ts +3 -2
  492. package/src/server/stop-service-route.ts +85 -0
  493. package/src/server/system-env-shell.ts +12 -1
  494. package/src/server/system-env.ts +5 -3
  495. package/src/server/windows-tcp-drop.ts +21 -4
  496. package/src/server/workflow-refusal.ts +8 -0
  497. package/src/server/ws-bridge.ts +191 -12
  498. package/src/service/cli-windows-stop.ts +189 -0
  499. package/src/service/cli.ts +41 -12
  500. package/src/service/disconnected-client-restart.ts +60 -0
  501. package/src/service/guarded-manager-target.ts +18 -1
  502. package/src/service/health.ts +99 -6
  503. package/src/service/launchd.ts +84 -31
  504. package/src/service/orchestration.ts +418 -91
  505. package/src/service/repair.ts +223 -6
  506. package/src/service/restart-proxy-stop.ts +79 -0
  507. package/src/service/service-child-ownership.ts +6 -2
  508. package/src/service/windows-checked-stop-live.ts +467 -0
  509. package/src/service/windows-checked-stop.ts +435 -0
  510. package/src/service/windows-command-line-token.ts +23 -0
  511. package/src/service/windows-guarded-manager.ts +77 -34
  512. package/src/service/windows-ops.ts +38 -56
  513. package/src/service/windows-process-evidence.ts +292 -0
  514. package/src/service/windows-process-native.ts +262 -0
  515. package/src/service/windows-service-stop.ts +321 -0
  516. package/src/service/windows-stop-binding.ts +187 -0
  517. package/src/service/windows-stop-budget.ts +123 -0
  518. package/src/service/windows-stop-confirm.ts +158 -0
  519. package/src/service/windows-stop-deadline.ts +56 -0
  520. package/src/service.ts +2 -2
  521. package/src/types/config.ts +42 -18
  522. package/src/types/link.ts +20 -0
  523. package/src/types/multi-agent.ts +13 -0
  524. package/src/types/provider.ts +47 -2
  525. package/src/types/request.ts +4 -0
  526. package/src/types.ts +3 -0
  527. package/src/update/guarded-runtime-ops.ts +5 -7
  528. package/src/update/index.ts +25 -10
  529. package/src/update/install-detection.mjs +3 -1
  530. package/src/update/job-pinned-start.ts +2 -0
  531. package/src/update/job-windows-restart.ts +19 -32
  532. package/src/update/job.ts +12 -5
  533. package/src/update/npm-install.d.mts +11 -0
  534. package/src/update/npm-install.mjs +44 -7
  535. package/src/update/orchestrated-entry.ts +1 -1
  536. package/src/update/orchestrated-node-driver.mjs +3 -2
  537. package/src/update/orchestrated-pnpm.d.mts +4 -0
  538. package/src/update/orchestrated-pnpm.mjs +50 -6
  539. package/src/update/orchestrated-session.d.mts +3 -1
  540. package/src/update/orchestrated-session.mjs +21 -6
  541. package/src/update/pnpm-global-install.d.mts +21 -3
  542. package/src/update/pnpm-global-install.mjs +322 -19
  543. package/src/update/pnpm-store-layout.mjs +46 -0
  544. package/src/update/sync-update-mutex.d.mts +3 -2
  545. package/src/update/sync-update-mutex.mjs +57 -8
  546. package/src/update/transactional-install.d.mts +3 -1
  547. package/src/update/transactional-install.mjs +545 -12
  548. package/src/update/windows-installer-marker.d.mts +1 -0
  549. package/src/update/windows-installer-marker.mjs +44 -0
  550. package/src/usage/expected-prices.ts +8 -0
  551. package/src/usage/filter-index.ts +326 -77
  552. package/src/usage/ledger-scanner.ts +15 -0
  553. package/src/usage/link-log-fields.ts +48 -0
  554. package/src/usage/log.ts +43 -2
  555. package/src/usage/request-body.ts +37 -0
  556. package/src/web-search/loop.ts +3 -0
  557. package/gui/dist/assets/App-BpJOzw4F.js +0 -59
  558. package/gui/dist/assets/index-Bbor_y80.js +0 -94
  559. package/gui/dist/classic/assets/App-BrIlUiLc.js +0 -58
  560. package/gui/dist/classic/assets/index-DyJHagvT.js +0 -94
  561. package/src/server/management/desktop-compatibility-authorization.ts +0 -12
@@ -0,0 +1,256 @@
1
+ /**
2
+ * Provider cache affinity: keep a conversation on the key-pool credential that
3
+ * served its last turn, so that credential's upstream prompt cache is read again
4
+ * instead of rebuilt on another key.
5
+ *
6
+ * Modeled on Magpie's gateway affinity design, expressed in this codebase's
7
+ * terms: conversations are session lanes (server/request-log-conversation),
8
+ * credentials are key-pool entries identified by their pool entry id (never key
9
+ * material), and outcomes are recorded from attempt finalization, where every
10
+ * adapter's cache usage is already normalized into cache-read / cache-creation
11
+ * token counts.
12
+ *
13
+ * Affinity is a preference inside eligibility, never an override: this module
14
+ * only answers "which entry served this lane last, and is that worth
15
+ * preferring?". Whether that entry may serve right now (disabled, cooling,
16
+ * pacing) is decided by the caller in key-failover, which owns those rules.
17
+ *
18
+ * The store is process-local, following the combo session-recall precedent:
19
+ * a restart forgets every binding and the first post-restart turn of a
20
+ * conversation is placed by ordinary selection again.
21
+ *
22
+ * Lane ids are client-supplied, so a client that churns them can fill the
23
+ * store and evict other conversations' bindings. The blast radius is lost
24
+ * cache locality only — no correctness or credential exposure — and the
25
+ * count/byte bounds below are the mitigation.
26
+ */
27
+ import type { CacheAffinityMode, OcxProviderConfig } from "../types";
28
+ import type { GenerationContext } from "../lib/state-store-sweeper";
29
+ import { clearCacheAffinityIdentitiesForTests, currentCacheAffinityIdentity, reconcileCacheAffinityIdentities } from "./cache-affinity-identity";
30
+
31
+ /** Tokens read from or written to an upstream cache that make a binding worth keeping across turns. */
32
+ export const CACHE_AFFINITY_WORTH_TOKENS = 1024;
33
+ /** How long an ordinary (5-minute-retention) cache stays warm after the turn that built it. */
34
+ export const CACHE_AFFINITY_COLD_MS = 5 * 60_000;
35
+ /** How long a long-retention (1-hour) cache write stays warm. */
36
+ export const CACHE_AFFINITY_COLD_LONG_MS = 60 * 60_000;
37
+ /** Hard expiry for a binding, however warm: past this the conversation is placed fresh. */
38
+ export const CACHE_AFFINITY_TTL_MS = 24 * 60 * 60_000;
39
+ const CAPACITY = 512;
40
+ /** Per-entry byte cap over the retained strings, mirroring combo session recall. */
41
+ const ENTRY_BYTES_MAX = 1024;
42
+ /** Aggregate byte cap across every retained binding. */
43
+ const TOTAL_BYTES_MAX = 64 * 1024;
44
+
45
+ export type CacheAffinityReason =
46
+ | "cache" // kept: measured cache worth keeping and still warm (auto)
47
+ | "session" // kept: session mode prefers the bound credential while eligible
48
+ | "turn" // kept: turn mode, detected continuation of the in-progress turn
49
+ | "continuation"; // kept: detected continuation of the in-progress turn (auto)
50
+
51
+ export interface CacheAffinityHit {
52
+ entryId: string;
53
+ reason: CacheAffinityReason;
54
+ }
55
+
56
+ interface Binding {
57
+ providerName: string;
58
+ entryId: string;
59
+ identity: string;
60
+ model: string;
61
+ cacheRead: number;
62
+ cacheWrite: number;
63
+ longExpiresAt?: number;
64
+ at: number;
65
+ }
66
+
67
+ const bindings = new Map<string, Binding>();
68
+ let lastReconciledGeneration = 0;
69
+ let bindingsBytes = 0;
70
+
71
+ function bindingBytes(lane: string, binding: Binding): number {
72
+ return Buffer.byteLength(lane) + Buffer.byteLength(binding.providerName)
73
+ + Buffer.byteLength(binding.entryId) + Buffer.byteLength(binding.model) + Buffer.byteLength(binding.identity);
74
+ }
75
+
76
+ function deleteBinding(lane: string): void {
77
+ const binding = bindings.get(lane);
78
+ if (!binding) return;
79
+ bindings.delete(lane);
80
+ bindingsBytes -= bindingBytes(lane, binding);
81
+ }
82
+
83
+ export function cacheAffinityMode(provider: Pick<OcxProviderConfig, "cacheAffinity">): CacheAffinityMode {
84
+ return provider.cacheAffinity ?? "auto";
85
+ }
86
+
87
+ export function cacheAffinityApplies(provider: OcxProviderConfig): boolean {
88
+ if (cacheAffinityMode(provider) === "off") return false;
89
+ if (provider.authMode === "oauth" || provider.authMode === "forward") return false;
90
+ return (provider.apiKeyPool?.length ?? 0) >= 2;
91
+ }
92
+
93
+ export interface ConsultProviderCacheAffinityInput {
94
+ lane: string | undefined;
95
+ providerName: string;
96
+ provider: OcxProviderConfig;
97
+ model: string;
98
+ /** The request continues the lane's in-progress turn (tool results being returned). */
99
+ continuation?: boolean;
100
+ now?: number;
101
+ }
102
+
103
+ /**
104
+ * The bound credential for this lane, when affinity says to prefer it.
105
+ * Purely a preference: the caller must still validate the entry against the
106
+ * live pool (present, enabled, not cooling) before sending with it.
107
+ */
108
+ export function consultProviderCacheAffinity(input: ConsultProviderCacheAffinityInput): CacheAffinityHit | null {
109
+ const { lane, providerName, provider, model } = input;
110
+ if (!lane || !cacheAffinityApplies(provider)) return null;
111
+ const binding = bindings.get(lane);
112
+ if (!binding) return null;
113
+ const now = input.now ?? Date.now();
114
+ if (now - binding.at >= CACHE_AFFINITY_TTL_MS) {
115
+ deleteBinding(lane);
116
+ return null;
117
+ }
118
+ if (binding.providerName !== providerName || binding.model !== model) return null;
119
+ if (binding.identity !== currentCacheAffinityIdentity(providerName, provider, binding.entryId)) {
120
+ deleteBinding(lane);
121
+ return null;
122
+ }
123
+ const mode = cacheAffinityMode(provider);
124
+ const warmUntil = Math.max(binding.at + CACHE_AFFINITY_COLD_MS, binding.longExpiresAt ?? 0);
125
+ if (mode === "session") return { entryId: binding.entryId, reason: "session" };
126
+ if (input.continuation === true) {
127
+ if (now > warmUntil) return null;
128
+ return { entryId: binding.entryId, reason: mode === "turn" ? "turn" : "continuation" };
129
+ }
130
+ if (mode === "turn") return null;
131
+ // auto, across turns: only measured-worth bindings that are still warm.
132
+ if (now > warmUntil) return null;
133
+ const worth = binding.cacheRead + binding.cacheWrite;
134
+ return worth >= CACHE_AFFINITY_WORTH_TOKENS ? { entryId: binding.entryId, reason: "cache" } : null;
135
+ }
136
+
137
+ export interface RecordProviderCacheAffinityInput {
138
+ lane: string | undefined;
139
+ providerName: string;
140
+ entryId: string | undefined;
141
+ identity: string | undefined;
142
+ model: string;
143
+ cacheRead?: number;
144
+ cacheWrite?: number;
145
+ /** Portion of the cache write kept at long (1-hour) retention, when the adapter reports it. */
146
+ cacheWriteLong?: number;
147
+ inputTokens?: number;
148
+ now?: number;
149
+ }
150
+
151
+ /**
152
+ * Remember who served a completed turn. A turn with no cache telemetry at all
153
+ * counts its sent prompt as written (silent-cache vendors such as Ollama
154
+ * Cloud): the prompt the vendor cached is the prompt that was sent.
155
+ */
156
+ export function recordProviderCacheAffinity(input: RecordProviderCacheAffinityInput): void {
157
+ const { lane, providerName, entryId, model, identity } = input;
158
+ if (!lane || !entryId || !identity) return;
159
+ const cacheRead = input.cacheRead ?? 0;
160
+ // No write counter reported — reads-only reporters (OpenAI Chat reports
161
+ // reads, never writes) and fully silent vendors alike: the prompt that was
162
+ // sent is what the vendor cached, so it counts as written. An explicitly
163
+ // reported write count, zero included, is believed as-is.
164
+ const cacheWrite = input.cacheWrite ?? input.inputTokens ?? 0;
165
+ const now = input.now ?? Date.now();
166
+ const previous = bindings.get(lane);
167
+ const matchingLongRead = cacheRead > 0 && previous?.longExpiresAt !== undefined
168
+ && previous.providerName === providerName
169
+ && previous.entryId === entryId && previous.identity === identity && previous.model === model
170
+ && now >= previous.at && now <= previous.longExpiresAt;
171
+ const binding: Binding = {
172
+ providerName,
173
+ entryId,
174
+ identity,
175
+ model,
176
+ cacheRead,
177
+ cacheWrite,
178
+ longExpiresAt: (input.cacheWriteLong ?? 0) > 0 ? now + CACHE_AFFINITY_COLD_LONG_MS
179
+ : matchingLongRead ? previous.longExpiresAt : undefined,
180
+ at: now,
181
+ };
182
+ if (bindingBytes(lane, binding) > ENTRY_BYTES_MAX) return;
183
+ // Re-insert so eviction drops the least recently recorded lane first.
184
+ deleteBinding(lane);
185
+ bindings.set(lane, binding);
186
+ bindingsBytes += bindingBytes(lane, binding);
187
+ while (bindings.size > CAPACITY || bindingsBytes > TOTAL_BYTES_MAX) {
188
+ const oldest = bindings.keys().next().value;
189
+ if (oldest === undefined || oldest === lane) break;
190
+ deleteBinding(oldest);
191
+ }
192
+ }
193
+
194
+ export function releaseProviderCacheAffinity(
195
+ lane: string | undefined,
196
+ providerName?: string,
197
+ entryId?: string,
198
+ identity?: string,
199
+ ): boolean {
200
+ if (!lane) return false;
201
+ const binding = bindings.get(lane);
202
+ if (!binding) return false;
203
+ if ((providerName !== undefined && binding.providerName !== providerName)
204
+ || (entryId !== undefined && binding.entryId !== entryId)
205
+ || (identity !== undefined && binding.identity !== identity)) return false;
206
+ deleteBinding(lane);
207
+ return true;
208
+ }
209
+
210
+ /** The entry a lane is currently bound to, if any (finalization log attribution). */
211
+ export function boundEntryIdForLane(lane: string | undefined): string | undefined {
212
+ return lane ? bindings.get(lane)?.entryId : undefined;
213
+ }
214
+
215
+ /** Periodic expiry for the state-store sweeper; expiry is also evaluated on consult. */
216
+ export function sweepExpiredProviderCacheAffinity(now: number): number {
217
+ let removed = 0;
218
+ for (const [lane, binding] of bindings) {
219
+ if (now - binding.at >= CACHE_AFFINITY_TTL_MS) {
220
+ deleteBinding(lane);
221
+ removed += 1;
222
+ }
223
+ }
224
+ return removed;
225
+ }
226
+
227
+ /**
228
+ * Drop bindings whose provider left the live configuration, was disabled, or
229
+ * lost the bound credential, on a configuration generation change. Consult
230
+ * re-validates against the live pool on every request regardless; this keeps
231
+ * unconsulted lanes from lingering.
232
+ */
233
+ export function reconcileProviderCacheAffinity(context: GenerationContext, providers?: Readonly<Record<string, OcxProviderConfig>>): number {
234
+ if (context.generation <= lastReconciledGeneration) return 0;
235
+ lastReconciledGeneration = context.generation;
236
+ if (providers) reconcileCacheAffinityIdentities(providers);
237
+ let removed = 0;
238
+ for (const [lane, binding] of bindings) {
239
+ const entryIds = context.providerKeyEntryIds?.get(binding.providerName);
240
+ if (!context.providerNames.has(binding.providerName)
241
+ || context.disabledProviderNames?.has(binding.providerName)
242
+ || (entryIds !== undefined && !entryIds.has(binding.entryId))
243
+ || (providers !== undefined && binding.identity !== currentCacheAffinityIdentity(binding.providerName, providers[binding.providerName], binding.entryId))) {
244
+ deleteBinding(lane);
245
+ removed += 1;
246
+ }
247
+ }
248
+ return removed;
249
+ }
250
+
251
+ export function clearProviderCacheAffinityForTests(): void {
252
+ bindings.clear();
253
+ bindingsBytes = 0;
254
+ lastReconciledGeneration = 0;
255
+ clearCacheAffinityIdentitiesForTests();
256
+ }
@@ -42,7 +42,9 @@ export function effectiveProviderAliasDecision(
42
42
 
43
43
  import type { OcxConfig, OcxProviderConfig } from "../types";
44
44
 
45
- export const MODEL_ALIAS_PATTERN = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
45
+ import { expandAliasTemplate, MODEL_ALIAS_PATTERN, type AliasTemplateSkip } from "./alias-template";
46
+
47
+ export { MODEL_ALIAS_PATTERN };
46
48
 
47
49
  /** Ordered, most-specific-first built-in aliases. Updated with the provider registry. */
48
50
  export const DEFAULT_MODEL_ALIASES: ReadonlyArray<{ match: RegExp; alias: string }> = [
@@ -59,7 +61,7 @@ export const DEFAULT_MODEL_ALIASES: ReadonlyArray<{ match: RegExp; alias: string
59
61
  { match: /^grok-4/, alias: "grok" },
60
62
  ];
61
63
 
62
- export interface EffectiveModelAlias { alias: string; source: "user" | "builtin" }
64
+ export interface EffectiveModelAlias { alias: string; source: "user" | "builtin" | "template" }
63
65
 
64
66
  function builtinRule(id: string): { match: RegExp; alias: string } | undefined {
65
67
  const tail = id.slice(id.lastIndexOf("/") + 1);
@@ -70,42 +72,118 @@ export function defaultAliasesEnabled(config: Pick<OcxConfig, "defaultModelAlias
70
72
  return provider.defaultAliases ?? config.defaultModelAliases ?? false;
71
73
  }
72
74
 
75
+ /** The parts of the config an alias view reads; `providers` and `combos` only matter to templates. */
76
+ export type AliasViewConfig = Pick<OcxConfig, "defaultModelAliases"> & Partial<Pick<OcxConfig, "providers" | "combos">>;
77
+
78
+ /**
79
+ * Manual aliases, then built-in ones (when enabled), then the provider's opt-in template (#7705).
80
+ * The template applies only when `providerName` is given, so a caller that does not pass it sees
81
+ * exactly the view it always did.
82
+ */
73
83
  export function effectiveModelAliases(
74
- config: Pick<OcxConfig, "defaultModelAliases">,
84
+ config: AliasViewConfig,
75
85
  provider: OcxProviderConfig,
76
86
  knownIds: Iterable<string>,
87
+ providerName?: string,
77
88
  ): Map<string, EffectiveModelAlias> {
89
+ const known = [...knownIds];
78
90
  const result = new Map<string, EffectiveModelAlias>();
79
91
  for (const [id, alias] of Object.entries(provider.modelAliases ?? {})) {
80
92
  if (typeof alias === "string" && MODEL_ALIAS_PATTERN.test(alias)) result.set(id, { alias, source: "user" });
81
93
  }
82
- if (!defaultAliasesEnabled(config, provider)) return result;
83
- const claims = new Map<string, string[]>();
84
- for (const id of knownIds) {
85
- if (result.has(id)) continue;
86
- const rule = builtinRule(id);
87
- if (!rule) continue;
88
- const key = rule.alias.toLowerCase();
89
- claims.set(key, [...(claims.get(key) ?? []), id]);
94
+ if (defaultAliasesEnabled(config, provider)) {
95
+ const claims = new Map<string, string[]>();
96
+ for (const id of known) {
97
+ if (result.has(id)) continue;
98
+ const rule = builtinRule(id);
99
+ if (!rule) continue;
100
+ const key = rule.alias.toLowerCase();
101
+ claims.set(key, [...(claims.get(key) ?? []), id]);
102
+ }
103
+ for (const [alias, ids] of claims) {
104
+ if (ids.length !== 1) continue;
105
+ const id = ids[0]!;
106
+ // Catalog drift must skip, never shadow, a native id or explicit user alias.
107
+ if (known.some(candidate => candidate.toLowerCase() === alias)) continue;
108
+ if ([...result.values()].some(value => value.alias.toLowerCase() === alias)) continue;
109
+ result.set(id, { alias: builtinRule(id)!.alias, source: "builtin" });
110
+ }
90
111
  }
91
- for (const [alias, ids] of claims) {
92
- if (ids.length !== 1) continue;
93
- const id = ids[0]!;
94
- // Catalog drift must skip, never shadow, a native id or explicit user alias.
95
- if ([...knownIds].some(candidate => candidate.toLowerCase() === alias)) continue;
96
- if ([...result.values()].some(value => value.alias.toLowerCase() === alias)) continue;
97
- result.set(id, { alias: builtinRule(id)!.alias, source: "builtin" });
112
+ if (providerName !== undefined && provider.aliasTemplate) {
113
+ for (const [id, alias] of templateAliasPlan(config, provider, providerName, known, result).accepted) {
114
+ result.set(id, { alias, source: "template" });
115
+ }
98
116
  }
99
117
  return result;
100
118
  }
101
119
 
120
+ export interface TemplateAliasPlan {
121
+ accepted: Map<string, string>;
122
+ skipped: Array<{ id: string; candidate?: string; reason: AliasTemplateSkip | "collision" | "reserved" }>;
123
+ }
124
+
125
+ /**
126
+ * Template candidates for ids that have no manual or built-in alias. Every name already claimed is
127
+ * reserved first: this provider's native ids and aliases, every built-in alias name, every
128
+ * provider name and provider alias, other providers' manual aliases, and combo ids and aliases.
129
+ * Two candidates that collide are both skipped, so the result does not depend on roster order;
130
+ * nothing is ever renamed to make it fit.
131
+ */
132
+ export function templateAliasPlan(
133
+ config: AliasViewConfig,
134
+ provider: OcxProviderConfig,
135
+ providerName: string,
136
+ knownIds: readonly string[],
137
+ existing: ReadonlyMap<string, EffectiveModelAlias>,
138
+ ): TemplateAliasPlan {
139
+ const plan: TemplateAliasPlan = { accepted: new Map(), skipped: [] };
140
+ const template = provider.aliasTemplate;
141
+ if (!template) return plan;
142
+ const providerAlias = config.providers
143
+ ? effectiveProviderAlias(providerName, provider, config as Pick<OcxConfig, "providers">)
144
+ : (provider.alias?.trim() || undefined);
145
+ const reserved = new Set<string>();
146
+ const reserve = (value: unknown) => { if (typeof value === "string" && value.trim()) reserved.add(value.trim().toLowerCase()); };
147
+ for (const id of knownIds) reserve(id);
148
+ for (const value of existing.values()) reserve(value.alias);
149
+ for (const rule of DEFAULT_MODEL_ALIASES) reserve(rule.alias);
150
+ for (const [name, other] of Object.entries(config.providers ?? {})) {
151
+ reserve(name);
152
+ reserve(other.alias);
153
+ // A registry alias (`agy` for google-antigravity) names the provider even when it sets none.
154
+ if (config.providers) reserve(effectiveProviderAlias(name, other, config as Pick<OcxConfig, "providers">));
155
+ if (name !== providerName) for (const alias of Object.values(other.modelAliases ?? {})) reserve(alias);
156
+ }
157
+ for (const [id, combo] of Object.entries(config.combos ?? {})) { reserve(id); reserve((combo as { alias?: unknown }).alias); }
158
+ const candidates = new Map<string, Array<{ id: string; alias: string }>>();
159
+ for (const id of [...new Set(knownIds)].sort()) {
160
+ if (existing.has(id)) continue;
161
+ const expanded = expandAliasTemplate(template, providerAlias, id);
162
+ if ("skip" in expanded) { plan.skipped.push({ id, reason: expanded.skip }); continue; }
163
+ const key = expanded.alias.toLowerCase();
164
+ candidates.set(key, [...(candidates.get(key) ?? []), { id, alias: expanded.alias }]);
165
+ }
166
+ for (const [key, rows] of candidates) {
167
+ if (rows.length > 1) {
168
+ for (const row of rows) plan.skipped.push({ id: row.id, candidate: row.alias, reason: "collision" });
169
+ } else if (reserved.has(key)) {
170
+ plan.skipped.push({ id: rows[0]!.id, candidate: rows[0]!.alias, reason: "reserved" });
171
+ } else {
172
+ plan.accepted.set(rows[0]!.id, rows[0]!.alias);
173
+ }
174
+ }
175
+ plan.skipped.sort((a, b) => a.id.localeCompare(b.id));
176
+ return plan;
177
+ }
178
+
102
179
  export function resolveModelAlias(
103
- config: Pick<OcxConfig, "defaultModelAliases">,
180
+ config: AliasViewConfig,
104
181
  provider: OcxProviderConfig,
105
182
  knownIds: Iterable<string>,
106
183
  requested: string,
184
+ providerName?: string,
107
185
  ): string | undefined {
108
186
  const needle = requested.toLowerCase();
109
- return [...effectiveModelAliases(config, provider, knownIds)]
187
+ return [...effectiveModelAliases(config, provider, knownIds, providerName)]
110
188
  .find(([, value]) => value.alias.toLowerCase() === needle)?.[0];
111
189
  }