@draht/coding-agent 2026.7.13-1 → 2026.7.30

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 (288) hide show
  1. package/CHANGELOG.md +87 -0
  2. package/README.md +1 -0
  3. package/dist/bun/cli.js +2 -0
  4. package/dist/bun/cli.js.map +1 -1
  5. package/dist/cli/args.d.ts.map +1 -1
  6. package/dist/cli/args.js +12 -2
  7. package/dist/cli/args.js.map +1 -1
  8. package/dist/cli/config-selector.js +1 -1
  9. package/dist/cli/config-selector.js.map +1 -1
  10. package/dist/cli/credential-print.d.ts +23 -0
  11. package/dist/cli/credential-print.d.ts.map +1 -0
  12. package/dist/cli/credential-print.js +116 -0
  13. package/dist/cli/credential-print.js.map +1 -0
  14. package/dist/cli/list-models.d.ts +2 -2
  15. package/dist/cli/list-models.d.ts.map +1 -1
  16. package/dist/cli/list-models.js +3 -3
  17. package/dist/cli/list-models.js.map +1 -1
  18. package/dist/cli/startup-ui.js +1 -1
  19. package/dist/cli/startup-ui.js.map +1 -1
  20. package/dist/core/agent-session-runtime.d.ts.map +1 -1
  21. package/dist/core/agent-session-runtime.js +3 -0
  22. package/dist/core/agent-session-runtime.js.map +1 -1
  23. package/dist/core/agent-session-services.d.ts +3 -6
  24. package/dist/core/agent-session-services.d.ts.map +1 -1
  25. package/dist/core/agent-session-services.js +23 -9
  26. package/dist/core/agent-session-services.js.map +1 -1
  27. package/dist/core/agent-session.d.ts +52 -11
  28. package/dist/core/agent-session.d.ts.map +1 -1
  29. package/dist/core/agent-session.js +199 -101
  30. package/dist/core/agent-session.js.map +1 -1
  31. package/dist/core/auth-storage.d.ts +15 -103
  32. package/dist/core/auth-storage.d.ts.map +1 -1
  33. package/dist/core/auth-storage.js +46 -259
  34. package/dist/core/auth-storage.js.map +1 -1
  35. package/dist/core/cache-stats.d.ts +2 -2
  36. package/dist/core/cache-stats.d.ts.map +1 -1
  37. package/dist/core/cache-stats.js +1 -1
  38. package/dist/core/cache-stats.js.map +1 -1
  39. package/dist/core/compaction/branch-summarization.d.ts +8 -2
  40. package/dist/core/compaction/branch-summarization.d.ts.map +1 -1
  41. package/dist/core/compaction/branch-summarization.js +8 -11
  42. package/dist/core/compaction/branch-summarization.js.map +1 -1
  43. package/dist/core/compaction/compaction.d.ts +19 -3
  44. package/dist/core/compaction/compaction.d.ts.map +1 -1
  45. package/dist/core/compaction/compaction.js +71 -26
  46. package/dist/core/compaction/compaction.js.map +1 -1
  47. package/dist/core/compaction/utils.d.ts +1 -1
  48. package/dist/core/compaction/utils.d.ts.map +1 -1
  49. package/dist/core/compaction/utils.js +6 -17
  50. package/dist/core/compaction/utils.js.map +1 -1
  51. package/dist/core/context-windows.d.ts +7 -0
  52. package/dist/core/context-windows.d.ts.map +1 -0
  53. package/dist/core/context-windows.js +35 -0
  54. package/dist/core/context-windows.js.map +1 -0
  55. package/dist/core/extensions/index.d.ts +1 -1
  56. package/dist/core/extensions/index.d.ts.map +1 -1
  57. package/dist/core/extensions/index.js.map +1 -1
  58. package/dist/core/extensions/loader.d.ts.map +1 -1
  59. package/dist/core/extensions/loader.js +18 -3
  60. package/dist/core/extensions/loader.js.map +1 -1
  61. package/dist/core/extensions/runner.d.ts +6 -1
  62. package/dist/core/extensions/runner.d.ts.map +1 -1
  63. package/dist/core/extensions/runner.js +80 -0
  64. package/dist/core/extensions/runner.js.map +1 -1
  65. package/dist/core/extensions/types.d.ts +48 -4
  66. package/dist/core/extensions/types.d.ts.map +1 -1
  67. package/dist/core/extensions/types.js.map +1 -1
  68. package/dist/core/extensions/wrapper.d.ts.map +1 -1
  69. package/dist/core/extensions/wrapper.js +22 -3
  70. package/dist/core/extensions/wrapper.js.map +1 -1
  71. package/dist/core/footer-data-provider.d.ts +10 -0
  72. package/dist/core/footer-data-provider.d.ts.map +1 -1
  73. package/dist/core/footer-data-provider.js +1 -1
  74. package/dist/core/footer-data-provider.js.map +1 -1
  75. package/dist/core/keybindings.d.ts +13 -3
  76. package/dist/core/keybindings.d.ts.map +1 -1
  77. package/dist/core/keybindings.js +11 -3
  78. package/dist/core/keybindings.js.map +1 -1
  79. package/dist/core/model-config.d.ts +542 -0
  80. package/dist/core/model-config.d.ts.map +1 -0
  81. package/dist/core/model-config.js +247 -0
  82. package/dist/core/model-config.js.map +1 -0
  83. package/dist/core/model-registry.d.ts +17 -123
  84. package/dist/core/model-registry.d.ts.map +1 -1
  85. package/dist/core/model-registry.js +59 -730
  86. package/dist/core/model-registry.js.map +1 -1
  87. package/dist/core/model-resolver.d.ts +7 -6
  88. package/dist/core/model-resolver.d.ts.map +1 -1
  89. package/dist/core/model-resolver.js +41 -21
  90. package/dist/core/model-resolver.js.map +1 -1
  91. package/dist/core/model-runtime.d.ts +83 -0
  92. package/dist/core/model-runtime.d.ts.map +1 -0
  93. package/dist/core/model-runtime.js +431 -0
  94. package/dist/core/model-runtime.js.map +1 -0
  95. package/dist/core/models-store.d.ts +17 -0
  96. package/dist/core/models-store.d.ts.map +1 -0
  97. package/dist/core/models-store.js +46 -0
  98. package/dist/core/models-store.js.map +1 -0
  99. package/dist/core/package-manager.d.ts.map +1 -1
  100. package/dist/core/package-manager.js +31 -12
  101. package/dist/core/package-manager.js.map +1 -1
  102. package/dist/core/prompt-templates.d.ts +1 -0
  103. package/dist/core/prompt-templates.d.ts.map +1 -1
  104. package/dist/core/prompt-templates.js +4 -4
  105. package/dist/core/prompt-templates.js.map +1 -1
  106. package/dist/core/provider-composer.d.ts +55 -0
  107. package/dist/core/provider-composer.d.ts.map +1 -0
  108. package/dist/core/provider-composer.js +375 -0
  109. package/dist/core/provider-composer.js.map +1 -0
  110. package/dist/core/radius.d.ts +2 -0
  111. package/dist/core/radius.d.ts.map +1 -0
  112. package/dist/core/radius.js +2 -0
  113. package/dist/core/radius.js.map +1 -0
  114. package/dist/core/remote-catalog-provider.d.ts +5 -0
  115. package/dist/core/remote-catalog-provider.d.ts.map +1 -0
  116. package/dist/core/remote-catalog-provider.js +115 -0
  117. package/dist/core/remote-catalog-provider.js.map +1 -0
  118. package/dist/core/resource-loader.d.ts +15 -0
  119. package/dist/core/resource-loader.d.ts.map +1 -1
  120. package/dist/core/resource-loader.js +64 -9
  121. package/dist/core/resource-loader.js.map +1 -1
  122. package/dist/core/runtime-credentials.d.ts +15 -0
  123. package/dist/core/runtime-credentials.d.ts.map +1 -0
  124. package/dist/core/runtime-credentials.js +35 -0
  125. package/dist/core/runtime-credentials.js.map +1 -0
  126. package/dist/core/sdk.d.ts +3 -6
  127. package/dist/core/sdk.d.ts.map +1 -1
  128. package/dist/core/sdk.js +22 -21
  129. package/dist/core/sdk.js.map +1 -1
  130. package/dist/core/session-manager.d.ts +14 -6
  131. package/dist/core/session-manager.d.ts.map +1 -1
  132. package/dist/core/session-manager.js +116 -28
  133. package/dist/core/session-manager.js.map +1 -1
  134. package/dist/core/settings-manager.d.ts +1 -1
  135. package/dist/core/settings-manager.d.ts.map +1 -1
  136. package/dist/core/settings-manager.js.map +1 -1
  137. package/dist/core/system-prompt.d.ts.map +1 -1
  138. package/dist/core/system-prompt.js +2 -12
  139. package/dist/core/system-prompt.js.map +1 -1
  140. package/dist/core/tools/bash.d.ts +2 -0
  141. package/dist/core/tools/bash.d.ts.map +1 -1
  142. package/dist/core/tools/bash.js +34 -5
  143. package/dist/core/tools/bash.js.map +1 -1
  144. package/dist/core/tools/read.js +1 -1
  145. package/dist/core/tools/read.js.map +1 -1
  146. package/dist/core/tools/tool-definition-wrapper.d.ts.map +1 -1
  147. package/dist/core/tools/tool-definition-wrapper.js +3 -1
  148. package/dist/core/tools/tool-definition-wrapper.js.map +1 -1
  149. package/dist/core/usage-totals.d.ts +19 -0
  150. package/dist/core/usage-totals.d.ts.map +1 -0
  151. package/dist/core/usage-totals.js +52 -0
  152. package/dist/core/usage-totals.js.map +1 -0
  153. package/dist/extensions/index.d.ts +3 -0
  154. package/dist/extensions/index.d.ts.map +1 -0
  155. package/dist/extensions/index.js +3 -0
  156. package/dist/extensions/index.js.map +1 -0
  157. package/dist/extensions/llama/client.d.ts +61 -0
  158. package/dist/extensions/llama/client.d.ts.map +1 -0
  159. package/dist/extensions/llama/client.js +300 -0
  160. package/dist/extensions/llama/client.js.map +1 -0
  161. package/dist/extensions/llama/huggingface.d.ts +23 -0
  162. package/dist/extensions/llama/huggingface.d.ts.map +1 -0
  163. package/dist/extensions/llama/huggingface.js +139 -0
  164. package/dist/extensions/llama/huggingface.js.map +1 -0
  165. package/dist/extensions/llama/index.d.ts +3 -0
  166. package/dist/extensions/llama/index.d.ts.map +1 -0
  167. package/dist/extensions/llama/index.js +208 -0
  168. package/dist/extensions/llama/index.js.map +1 -0
  169. package/dist/extensions/llama/provider.d.ts +10 -0
  170. package/dist/extensions/llama/provider.d.ts.map +1 -0
  171. package/dist/extensions/llama/provider.js +107 -0
  172. package/dist/extensions/llama/provider.js.map +1 -0
  173. package/dist/extensions/llama/ui.d.ts +42 -0
  174. package/dist/extensions/llama/ui.d.ts.map +1 -0
  175. package/dist/extensions/llama/ui.js +400 -0
  176. package/dist/extensions/llama/ui.js.map +1 -0
  177. package/dist/index.d.ts +4 -3
  178. package/dist/index.d.ts.map +1 -1
  179. package/dist/index.js +3 -3
  180. package/dist/index.js.map +1 -1
  181. package/dist/main.d.ts.map +1 -1
  182. package/dist/main.js +63 -16
  183. package/dist/main.js.map +1 -1
  184. package/dist/modes/interactive/components/assistant-message.d.ts.map +1 -1
  185. package/dist/modes/interactive/components/assistant-message.js +22 -10
  186. package/dist/modes/interactive/components/assistant-message.js.map +1 -1
  187. package/dist/modes/interactive/components/custom-editor.js +1 -1
  188. package/dist/modes/interactive/components/custom-editor.js.map +1 -1
  189. package/dist/modes/interactive/components/custom-message.d.ts +3 -1
  190. package/dist/modes/interactive/components/custom-message.d.ts.map +1 -1
  191. package/dist/modes/interactive/components/custom-message.js +9 -2
  192. package/dist/modes/interactive/components/custom-message.js.map +1 -1
  193. package/dist/modes/interactive/components/extension-editor.d.ts +1 -2
  194. package/dist/modes/interactive/components/extension-editor.d.ts.map +1 -1
  195. package/dist/modes/interactive/components/extension-editor.js +16 -46
  196. package/dist/modes/interactive/components/extension-editor.js.map +1 -1
  197. package/dist/modes/interactive/components/footer.d.ts.map +1 -1
  198. package/dist/modes/interactive/components/footer.js +24 -23
  199. package/dist/modes/interactive/components/footer.js.map +1 -1
  200. package/dist/modes/interactive/components/login-dialog.d.ts +5 -5
  201. package/dist/modes/interactive/components/login-dialog.d.ts.map +1 -1
  202. package/dist/modes/interactive/components/login-dialog.js +17 -8
  203. package/dist/modes/interactive/components/login-dialog.js.map +1 -1
  204. package/dist/modes/interactive/components/model-selector.d.ts +11 -4
  205. package/dist/modes/interactive/components/model-selector.d.ts.map +1 -1
  206. package/dist/modes/interactive/components/model-selector.js +74 -41
  207. package/dist/modes/interactive/components/model-selector.js.map +1 -1
  208. package/dist/modes/interactive/components/oauth-selector.d.ts +4 -4
  209. package/dist/modes/interactive/components/oauth-selector.d.ts.map +1 -1
  210. package/dist/modes/interactive/components/oauth-selector.js +14 -25
  211. package/dist/modes/interactive/components/oauth-selector.js.map +1 -1
  212. package/dist/modes/interactive/components/scoped-models-selector.d.ts.map +1 -1
  213. package/dist/modes/interactive/components/scoped-models-selector.js +22 -13
  214. package/dist/modes/interactive/components/scoped-models-selector.js.map +1 -1
  215. package/dist/modes/interactive/components/tree-selector.d.ts +5 -0
  216. package/dist/modes/interactive/components/tree-selector.d.ts.map +1 -1
  217. package/dist/modes/interactive/components/tree-selector.js +47 -12
  218. package/dist/modes/interactive/components/tree-selector.js.map +1 -1
  219. package/dist/modes/interactive/external-editor.d.ts +12 -0
  220. package/dist/modes/interactive/external-editor.d.ts.map +1 -0
  221. package/dist/modes/interactive/external-editor.js +37 -0
  222. package/dist/modes/interactive/external-editor.js.map +1 -0
  223. package/dist/modes/interactive/interactive-mode.d.ts +10 -7
  224. package/dist/modes/interactive/interactive-mode.d.ts.map +1 -1
  225. package/dist/modes/interactive/interactive-mode.js +369 -261
  226. package/dist/modes/interactive/interactive-mode.js.map +1 -1
  227. package/dist/modes/rpc/rpc-client.d.ts +4 -0
  228. package/dist/modes/rpc/rpc-client.d.ts.map +1 -1
  229. package/dist/modes/rpc/rpc-client.js +7 -0
  230. package/dist/modes/rpc/rpc-client.js.map +1 -1
  231. package/dist/modes/rpc/rpc-mode.d.ts.map +1 -1
  232. package/dist/modes/rpc/rpc-mode.js +20 -2
  233. package/dist/modes/rpc/rpc-mode.js.map +1 -1
  234. package/dist/modes/rpc/rpc-types.d.ts +11 -0
  235. package/dist/modes/rpc/rpc-types.d.ts.map +1 -1
  236. package/dist/modes/rpc/rpc-types.js.map +1 -1
  237. package/dist/package-manager-cli.d.ts.map +1 -1
  238. package/dist/package-manager-cli.js +67 -5
  239. package/dist/package-manager-cli.js.map +1 -1
  240. package/dist/utils/clipboard-native.d.ts +1 -0
  241. package/dist/utils/clipboard-native.d.ts.map +1 -1
  242. package/dist/utils/clipboard-native.js.map +1 -1
  243. package/dist/utils/clipboard.d.ts +2 -0
  244. package/dist/utils/clipboard.d.ts.map +1 -1
  245. package/dist/utils/clipboard.js +32 -8
  246. package/dist/utils/clipboard.js.map +1 -1
  247. package/dist/utils/version-check.d.ts.map +1 -1
  248. package/dist/utils/version-check.js +3 -1
  249. package/dist/utils/version-check.js.map +1 -1
  250. package/docs/compaction.md +9 -4
  251. package/docs/custom-provider.md +50 -16
  252. package/docs/environment-variables.md +88 -0
  253. package/docs/extensions.md +228 -15
  254. package/docs/index.md +2 -0
  255. package/docs/json.md +5 -1
  256. package/docs/keybindings.md +2 -0
  257. package/docs/llama-cpp.md +99 -0
  258. package/docs/models.md +13 -2
  259. package/docs/packages.md +1 -0
  260. package/docs/prompt-templates.md +1 -0
  261. package/docs/providers.md +36 -2
  262. package/docs/quickstart.md +1 -1
  263. package/docs/rpc.md +107 -7
  264. package/docs/sdk.md +3 -0
  265. package/docs/session-format.md +19 -3
  266. package/docs/settings.md +1 -1
  267. package/docs/tui.md +41 -26
  268. package/docs/usage.md +4 -14
  269. package/examples/extensions/custom-compaction.ts +4 -0
  270. package/examples/extensions/custom-provider-anthropic/index.ts +9 -3
  271. package/examples/extensions/custom-provider-anthropic/package.json +1 -1
  272. package/examples/extensions/custom-provider-gitlab-duo/package.json +1 -1
  273. package/examples/extensions/custom-provider-qwen-cli/package.json +1 -1
  274. package/examples/extensions/gondolin/package.json +2 -2
  275. package/examples/extensions/handoff.ts +9 -1
  276. package/examples/extensions/kimi-deferred-tools.ts +61 -0
  277. package/examples/extensions/message-renderer.ts +2 -2
  278. package/examples/extensions/sandbox/package.json +1 -1
  279. package/examples/extensions/summarize.ts +3 -0
  280. package/examples/extensions/with-deps/package.json +1 -1
  281. package/examples/sdk/02-custom-model.ts +5 -8
  282. package/examples/sdk/09-api-keys-and-oauth.ts +15 -31
  283. package/examples/sdk/12-full-control.ts +9 -12
  284. package/package.json +10 -8
  285. package/dist/core/provider-display-names.d.ts +0 -2
  286. package/dist/core/provider-display-names.d.ts.map +0 -1
  287. package/dist/core/provider-display-names.js +0 -36
  288. package/dist/core/provider-display-names.js.map +0 -1
@@ -1,774 +1,103 @@
1
+ export { clearApiKeyCache } from "./provider-composer.js";
1
2
  /**
2
- * Model registry - manages built-in and custom models, provides API key resolution.
3
- */
4
- import { getModels, getProviders, registerApiProvider, resetApiProviders, } from "@draht/ai/compat";
5
- import { registerOAuthProvider, resetOAuthProviders } from "@draht/ai/oauth";
6
- import { existsSync, readFileSync } from "fs";
7
- import { join } from "path";
8
- import { Type } from "typebox";
9
- import { Compile } from "typebox/compile";
10
- import { getAgentDir } from "../config.js";
11
- import { stripJsonComments } from "../utils/json.js";
12
- import { normalizePath } from "../utils/paths.js";
13
- import { BUILT_IN_PROVIDER_DISPLAY_NAMES } from "./provider-display-names.js";
14
- import { clearConfigValueCache, getConfigValueEnvVarNames, isCommandConfigValue, isConfigValueConfigured, resolveConfigValueOrThrow, resolveConfigValueUncached, resolveHeadersOrThrow, } from "./resolve-config-value.js";
15
- // Schema for OpenRouter routing preferences
16
- const PercentileCutoffsSchema = Type.Object({
17
- p50: Type.Optional(Type.Number()),
18
- p75: Type.Optional(Type.Number()),
19
- p90: Type.Optional(Type.Number()),
20
- p99: Type.Optional(Type.Number()),
21
- });
22
- const OpenRouterRoutingSchema = Type.Object({
23
- allow_fallbacks: Type.Optional(Type.Boolean()),
24
- require_parameters: Type.Optional(Type.Boolean()),
25
- data_collection: Type.Optional(Type.Union([Type.Literal("deny"), Type.Literal("allow")])),
26
- zdr: Type.Optional(Type.Boolean()),
27
- enforce_distillable_text: Type.Optional(Type.Boolean()),
28
- order: Type.Optional(Type.Array(Type.String())),
29
- only: Type.Optional(Type.Array(Type.String())),
30
- ignore: Type.Optional(Type.Array(Type.String())),
31
- quantizations: Type.Optional(Type.Array(Type.String())),
32
- sort: Type.Optional(Type.Union([
33
- Type.String(),
34
- Type.Object({
35
- by: Type.Optional(Type.String()),
36
- partition: Type.Optional(Type.Union([Type.String(), Type.Null()])),
37
- }),
38
- ])),
39
- max_price: Type.Optional(Type.Object({
40
- prompt: Type.Optional(Type.Union([Type.Number(), Type.String()])),
41
- completion: Type.Optional(Type.Union([Type.Number(), Type.String()])),
42
- image: Type.Optional(Type.Union([Type.Number(), Type.String()])),
43
- audio: Type.Optional(Type.Union([Type.Number(), Type.String()])),
44
- request: Type.Optional(Type.Union([Type.Number(), Type.String()])),
45
- })),
46
- preferred_min_throughput: Type.Optional(Type.Union([Type.Number(), PercentileCutoffsSchema])),
47
- preferred_max_latency: Type.Optional(Type.Union([Type.Number(), PercentileCutoffsSchema])),
48
- });
49
- // Schema for Vercel AI Gateway routing preferences
50
- const VercelGatewayRoutingSchema = Type.Object({
51
- only: Type.Optional(Type.Array(Type.String())),
52
- order: Type.Optional(Type.Array(Type.String())),
53
- });
54
- // Schema for thinking level support and provider-specific values
55
- const ThinkingLevelMapValueSchema = Type.Union([Type.String(), Type.Null()]);
56
- const ThinkingLevelMapSchema = Type.Object({
57
- off: Type.Optional(ThinkingLevelMapValueSchema),
58
- minimal: Type.Optional(ThinkingLevelMapValueSchema),
59
- low: Type.Optional(ThinkingLevelMapValueSchema),
60
- medium: Type.Optional(ThinkingLevelMapValueSchema),
61
- high: Type.Optional(ThinkingLevelMapValueSchema),
62
- xhigh: Type.Optional(ThinkingLevelMapValueSchema),
63
- max: Type.Optional(ThinkingLevelMapValueSchema),
64
- });
65
- const ChatTemplateKwargScalarSchema = Type.Union([Type.String(), Type.Number(), Type.Boolean(), Type.Null()]);
66
- const ChatTemplateKwargVariableSchema = Type.Object({
67
- $var: Type.Union([Type.Literal("thinking.enabled"), Type.Literal("thinking.effort")]),
68
- omitWhenOff: Type.Optional(Type.Boolean()),
69
- });
70
- const ChatTemplateKwargSchema = Type.Union([ChatTemplateKwargScalarSchema, ChatTemplateKwargVariableSchema]);
71
- const OpenAICompletionsCompatSchema = Type.Object({
72
- supportsStore: Type.Optional(Type.Boolean()),
73
- supportsDeveloperRole: Type.Optional(Type.Boolean()),
74
- supportsReasoningEffort: Type.Optional(Type.Boolean()),
75
- supportsUsageInStreaming: Type.Optional(Type.Boolean()),
76
- maxTokensField: Type.Optional(Type.Union([Type.Literal("max_completion_tokens"), Type.Literal("max_tokens")])),
77
- requiresToolResultName: Type.Optional(Type.Boolean()),
78
- requiresAssistantAfterToolResult: Type.Optional(Type.Boolean()),
79
- requiresThinkingAsText: Type.Optional(Type.Boolean()),
80
- requiresReasoningContentOnAssistantMessages: Type.Optional(Type.Boolean()),
81
- thinkingFormat: Type.Optional(Type.Union([
82
- Type.Literal("openai"),
83
- Type.Literal("openrouter"),
84
- Type.Literal("together"),
85
- Type.Literal("deepseek"),
86
- Type.Literal("zai"),
87
- Type.Literal("qwen"),
88
- Type.Literal("chat-template"),
89
- Type.Literal("qwen-chat-template"),
90
- Type.Literal("string-thinking"),
91
- Type.Literal("ant-ling"),
92
- ])),
93
- chatTemplateKwargs: Type.Optional(Type.Record(Type.String(), ChatTemplateKwargSchema)),
94
- cacheControlFormat: Type.Optional(Type.Literal("anthropic")),
95
- openRouterRouting: Type.Optional(OpenRouterRoutingSchema),
96
- vercelGatewayRouting: Type.Optional(VercelGatewayRoutingSchema),
97
- supportsStrictMode: Type.Optional(Type.Boolean()),
98
- supportsLongCacheRetention: Type.Optional(Type.Boolean()),
99
- });
100
- const OpenAIResponsesCompatSchema = Type.Object({
101
- supportsDeveloperRole: Type.Optional(Type.Boolean()),
102
- sendSessionIdHeader: Type.Optional(Type.Boolean()),
103
- supportsLongCacheRetention: Type.Optional(Type.Boolean()),
104
- });
105
- const AnthropicMessagesCompatSchema = Type.Object({
106
- supportsEagerToolInputStreaming: Type.Optional(Type.Boolean()),
107
- supportsLongCacheRetention: Type.Optional(Type.Boolean()),
108
- sendSessionAffinityHeaders: Type.Optional(Type.Boolean()),
109
- supportsCacheControlOnTools: Type.Optional(Type.Boolean()),
110
- forceAdaptiveThinking: Type.Optional(Type.Boolean()),
111
- });
112
- const ProviderCompatSchema = Type.Union([
113
- OpenAICompletionsCompatSchema,
114
- OpenAIResponsesCompatSchema,
115
- AnthropicMessagesCompatSchema,
116
- ]);
117
- const ModelCostRatesSchema = {
118
- input: Type.Number(),
119
- output: Type.Number(),
120
- cacheRead: Type.Number(),
121
- cacheWrite: Type.Number(),
122
- };
123
- const ModelCostTierSchema = Type.Object({
124
- inputTokensAbove: Type.Number(),
125
- ...ModelCostRatesSchema,
126
- });
127
- const ModelCostSchema = Type.Object({
128
- ...ModelCostRatesSchema,
129
- tiers: Type.Optional(Type.Array(ModelCostTierSchema)),
130
- });
131
- // Schema for custom model definition
132
- // Most fields are optional with sensible defaults for local models (Ollama, LM Studio, etc.)
133
- const ModelDefinitionSchema = Type.Object({
134
- id: Type.String({ minLength: 1 }),
135
- name: Type.Optional(Type.String({ minLength: 1 })),
136
- api: Type.Optional(Type.String({ minLength: 1 })),
137
- baseUrl: Type.Optional(Type.String({ minLength: 1 })),
138
- reasoning: Type.Optional(Type.Boolean()),
139
- thinkingLevelMap: Type.Optional(ThinkingLevelMapSchema),
140
- input: Type.Optional(Type.Array(Type.Union([Type.Literal("text"), Type.Literal("image")]))),
141
- cost: Type.Optional(ModelCostSchema),
142
- contextWindow: Type.Optional(Type.Number()),
143
- maxTokens: Type.Optional(Type.Number()),
144
- headers: Type.Optional(Type.Record(Type.String(), Type.String())),
145
- compat: Type.Optional(ProviderCompatSchema),
146
- });
147
- // Schema for per-model overrides (all fields optional, merged with built-in model)
148
- const ModelOverrideSchema = Type.Object({
149
- name: Type.Optional(Type.String({ minLength: 1 })),
150
- reasoning: Type.Optional(Type.Boolean()),
151
- thinkingLevelMap: Type.Optional(ThinkingLevelMapSchema),
152
- input: Type.Optional(Type.Array(Type.Union([Type.Literal("text"), Type.Literal("image")]))),
153
- cost: Type.Optional(Type.Object({
154
- input: Type.Optional(Type.Number()),
155
- output: Type.Optional(Type.Number()),
156
- cacheRead: Type.Optional(Type.Number()),
157
- cacheWrite: Type.Optional(Type.Number()),
158
- tiers: Type.Optional(Type.Array(ModelCostTierSchema)),
159
- })),
160
- contextWindow: Type.Optional(Type.Number()),
161
- maxTokens: Type.Optional(Type.Number()),
162
- headers: Type.Optional(Type.Record(Type.String(), Type.String())),
163
- compat: Type.Optional(ProviderCompatSchema),
164
- });
165
- const ProviderConfigSchema = Type.Object({
166
- name: Type.Optional(Type.String({ minLength: 1 })),
167
- baseUrl: Type.Optional(Type.String({ minLength: 1 })),
168
- apiKey: Type.Optional(Type.String({ minLength: 1 })),
169
- api: Type.Optional(Type.String({ minLength: 1 })),
170
- headers: Type.Optional(Type.Record(Type.String(), Type.String())),
171
- compat: Type.Optional(ProviderCompatSchema),
172
- authHeader: Type.Optional(Type.Boolean()),
173
- models: Type.Optional(Type.Array(ModelDefinitionSchema)),
174
- modelOverrides: Type.Optional(Type.Record(Type.String(), ModelOverrideSchema)),
175
- });
176
- const ModelsConfigSchema = Type.Object({
177
- providers: Type.Record(Type.String(), ProviderConfigSchema),
178
- });
179
- const validateModelsConfig = Compile(ModelsConfigSchema);
180
- function formatValidationPath(error) {
181
- if (error.keyword === "required") {
182
- const requiredProperties = error.params.requiredProperties;
183
- const requiredProperty = requiredProperties?.[0];
184
- if (requiredProperty) {
185
- const basePath = error.instancePath.replace(/^\//, "").replace(/\//g, ".");
186
- return basePath ? `${basePath}.${requiredProperty}` : requiredProperty;
187
- }
188
- }
189
- const path = error.instancePath.replace(/^\//, "").replace(/\//g, ".");
190
- return path || "root";
191
- }
192
- function emptyCustomModelsResult(error) {
193
- return { models: [], overrides: new Map(), modelOverrides: new Map(), error };
194
- }
195
- function mergeCompat(baseCompat, overrideCompat) {
196
- if (!overrideCompat)
197
- return baseCompat;
198
- const base = baseCompat;
199
- const override = overrideCompat;
200
- const merged = { ...base, ...override };
201
- const baseCompletions = base;
202
- const overrideCompletions = override;
203
- const mergedCompletions = merged;
204
- if (baseCompletions?.openRouterRouting || overrideCompletions.openRouterRouting) {
205
- mergedCompletions.openRouterRouting = {
206
- ...baseCompletions?.openRouterRouting,
207
- ...overrideCompletions.openRouterRouting,
208
- };
209
- }
210
- if (baseCompletions?.vercelGatewayRouting || overrideCompletions.vercelGatewayRouting) {
211
- mergedCompletions.vercelGatewayRouting = {
212
- ...baseCompletions?.vercelGatewayRouting,
213
- ...overrideCompletions.vercelGatewayRouting,
214
- };
215
- }
216
- if (baseCompletions?.chatTemplateKwargs || overrideCompletions.chatTemplateKwargs) {
217
- mergedCompletions.chatTemplateKwargs = {
218
- ...baseCompletions?.chatTemplateKwargs,
219
- ...overrideCompletions.chatTemplateKwargs,
220
- };
221
- }
222
- return merged;
223
- }
224
- /**
225
- * Deep merge a model override into a model.
226
- * Handles nested objects (cost, compat) by merging rather than replacing.
227
- */
228
- function applyModelOverride(model, override) {
229
- const result = { ...model };
230
- // Simple field overrides
231
- if (override.name !== undefined)
232
- result.name = override.name;
233
- if (override.reasoning !== undefined)
234
- result.reasoning = override.reasoning;
235
- if (override.thinkingLevelMap !== undefined) {
236
- result.thinkingLevelMap = { ...model.thinkingLevelMap, ...override.thinkingLevelMap };
237
- }
238
- if (override.input !== undefined)
239
- result.input = override.input;
240
- if (override.contextWindow !== undefined)
241
- result.contextWindow = override.contextWindow;
242
- if (override.maxTokens !== undefined)
243
- result.maxTokens = override.maxTokens;
244
- // Merge cost (partial override)
245
- if (override.cost) {
246
- result.cost = {
247
- input: override.cost.input ?? model.cost.input,
248
- output: override.cost.output ?? model.cost.output,
249
- cacheRead: override.cost.cacheRead ?? model.cost.cacheRead,
250
- cacheWrite: override.cost.cacheWrite ?? model.cost.cacheWrite,
251
- tiers: override.cost.tiers ?? model.cost.tiers,
252
- };
253
- }
254
- // Deep merge compat
255
- result.compat = mergeCompat(model.compat, override.compat);
256
- return result;
257
- }
258
- /** Clear the config value command cache. Exported for testing. */
259
- export const clearApiKeyCache = clearConfigValueCache;
260
- /**
261
- * Model registry - loads and manages models, resolves API keys via AuthStorage.
3
+ * Synchronous compatibility facade exposed to extensions.
4
+ * Coding-agent internals use ModelRuntime directly.
262
5
  */
263
6
  export class ModelRegistry {
264
- constructor(authStorage, modelsJsonPath) {
265
- this.models = [];
266
- this.providerRequestConfigs = new Map();
267
- this.modelRequestHeaders = new Map();
268
- this.configModelOverrides = new Map();
269
- this.registeredProviders = new Map();
270
- this.loadError = undefined;
271
- this.authStorage = authStorage;
272
- this.modelsJsonPath = modelsJsonPath ? normalizePath(modelsJsonPath) : undefined;
273
- this.loadModels();
7
+ constructor(runtime) {
8
+ this.runtime = runtime;
274
9
  }
275
- static create(authStorage, modelsJsonPath = join(getAgentDir(), "models.json")) {
276
- return new ModelRegistry(authStorage, modelsJsonPath);
277
- }
278
- static inMemory(authStorage) {
279
- return new ModelRegistry(authStorage, undefined);
280
- }
281
- /**
282
- * Reload models from disk (built-in + custom from models.json).
283
- */
284
- refresh() {
285
- this.providerRequestConfigs.clear();
286
- this.modelRequestHeaders.clear();
287
- this.loadError = undefined;
288
- // Ensure dynamic API/OAuth registrations are rebuilt from current provider state.
289
- resetApiProviders();
290
- resetOAuthProviders();
291
- this.loadModels();
292
- for (const [providerName, config] of this.registeredProviders.entries()) {
293
- this.applyProviderConfig(providerName, config);
294
- }
10
+ /** Reload models.json asynchronously. Await before making synchronous registry reads. */
11
+ async refresh() {
12
+ await this.runtime.refresh();
295
13
  }
296
- /**
297
- * Get any error from loading models.json (undefined if no error).
298
- */
299
14
  getError() {
300
- return this.loadError;
301
- }
302
- loadModels() {
303
- // Load custom models and overrides from models.json
304
- const { models: customModels, overrides, modelOverrides, error, } = this.modelsJsonPath ? this.loadCustomModels(this.modelsJsonPath) : emptyCustomModelsResult();
305
- this.configModelOverrides = modelOverrides;
306
- if (error) {
307
- this.loadError = error;
308
- // Keep built-in models even if custom models failed to load
309
- }
310
- const builtInModels = this.loadBuiltInModels(overrides, modelOverrides);
311
- let combined = this.mergeCustomModels(builtInModels, customModels);
312
- // Let OAuth providers modify their models (e.g., update baseUrl)
313
- for (const oauthProvider of this.authStorage.getOAuthProviders()) {
314
- const cred = this.authStorage.get(oauthProvider.id);
315
- if (cred?.type === "oauth" && oauthProvider.modifyModels) {
316
- combined = oauthProvider.modifyModels(combined, cred);
317
- }
318
- }
319
- this.models = combined;
320
- }
321
- /** Load built-in models and apply provider/model overrides */
322
- loadBuiltInModels(overrides, modelOverrides) {
323
- return getProviders().flatMap((provider) => {
324
- const models = getModels(provider);
325
- const providerOverride = overrides.get(provider);
326
- const perModelOverrides = modelOverrides.get(provider);
327
- return models.map((m) => {
328
- let model = m;
329
- // Apply provider-level baseUrl/headers/compat override
330
- if (providerOverride) {
331
- model = {
332
- ...model,
333
- baseUrl: providerOverride.baseUrl ?? model.baseUrl,
334
- compat: mergeCompat(model.compat, providerOverride.compat),
335
- };
336
- }
337
- // Apply per-model override
338
- const modelOverride = perModelOverrides?.get(m.id);
339
- if (modelOverride) {
340
- model = applyModelOverride(model, modelOverride);
341
- }
342
- return model;
343
- });
344
- });
345
- }
346
- getConfiguredModelOverride(providerName, modelId) {
347
- return this.configModelOverrides.get(providerName)?.get(modelId);
348
- }
349
- applyConfiguredModelOverride(providerName, model) {
350
- const modelOverride = this.getConfiguredModelOverride(providerName, model.id);
351
- return modelOverride ? applyModelOverride(model, modelOverride) : model;
352
- }
353
- /** Merge custom models into built-in list by provider+id (custom wins on conflicts). */
354
- mergeCustomModels(builtInModels, customModels) {
355
- const merged = [...builtInModels];
356
- for (const customModel of customModels) {
357
- const existingIndex = merged.findIndex((m) => m.provider === customModel.provider && m.id === customModel.id);
358
- if (existingIndex >= 0) {
359
- merged[existingIndex] = customModel;
360
- }
361
- else {
362
- merged.push(customModel);
363
- }
364
- }
365
- return merged;
366
- }
367
- loadCustomModels(modelsJsonPath) {
368
- if (!existsSync(modelsJsonPath)) {
369
- return emptyCustomModelsResult();
370
- }
371
- try {
372
- const content = readFileSync(modelsJsonPath, "utf-8");
373
- const parsed = JSON.parse(stripJsonComments(content));
374
- if (!validateModelsConfig.Check(parsed)) {
375
- const errors = validateModelsConfig
376
- .Errors(parsed)
377
- .map((error) => ` - ${formatValidationPath(error)}: ${error.message}`)
378
- .join("\n") || "Unknown schema error";
379
- return emptyCustomModelsResult(`Invalid models.json schema:\n${errors}\n\nFile: ${modelsJsonPath}`);
380
- }
381
- const config = parsed;
382
- // Additional validation
383
- this.validateConfig(config);
384
- const overrides = new Map();
385
- const modelOverrides = new Map();
386
- for (const [providerName, providerConfig] of Object.entries(config.providers)) {
387
- if (providerConfig.baseUrl || providerConfig.compat) {
388
- overrides.set(providerName, {
389
- baseUrl: providerConfig.baseUrl,
390
- compat: providerConfig.compat,
391
- });
392
- }
393
- this.storeProviderRequestConfig(providerName, providerConfig);
394
- if (providerConfig.modelOverrides) {
395
- modelOverrides.set(providerName, new Map(Object.entries(providerConfig.modelOverrides)));
396
- for (const [modelId, modelOverride] of Object.entries(providerConfig.modelOverrides)) {
397
- this.storeModelHeaders(providerName, modelId, modelOverride.headers);
398
- }
399
- }
400
- }
401
- return { models: this.parseModels(config), overrides, modelOverrides, error: undefined };
402
- }
403
- catch (error) {
404
- if (error instanceof SyntaxError) {
405
- return emptyCustomModelsResult(`Failed to parse models.json: ${error.message}\n\nFile: ${modelsJsonPath}`);
406
- }
407
- return emptyCustomModelsResult(`Failed to load models.json: ${error instanceof Error ? error.message : error}\n\nFile: ${modelsJsonPath}`);
408
- }
409
- }
410
- validateConfig(config) {
411
- const builtInProviders = new Set(getProviders());
412
- for (const [providerName, providerConfig] of Object.entries(config.providers)) {
413
- const isBuiltIn = builtInProviders.has(providerName);
414
- const hasProviderApi = !!providerConfig.api;
415
- const models = providerConfig.models ?? [];
416
- const hasModelOverrides = providerConfig.modelOverrides && Object.keys(providerConfig.modelOverrides).length > 0;
417
- if (models.length === 0) {
418
- // Override-only config: needs baseUrl, headers, compat, modelOverrides, or some combination.
419
- if (!providerConfig.baseUrl && !providerConfig.headers && !providerConfig.compat && !hasModelOverrides) {
420
- throw new Error(`Provider ${providerName}: must specify "baseUrl", "headers", "compat", "modelOverrides", or "models".`);
421
- }
422
- }
423
- else if (!isBuiltIn) {
424
- // Non-built-in providers with custom models require an endpoint.
425
- // Auth can come from auth.json, --api-key, or provider request config.
426
- if (!providerConfig.baseUrl) {
427
- throw new Error(`Provider ${providerName}: "baseUrl" is required when defining custom models.`);
428
- }
429
- }
430
- // Built-in providers with custom models: baseUrl/apiKey/api are optional,
431
- // inherited from built-in models. Auth comes from env vars / auth storage.
432
- for (const modelDef of models) {
433
- const hasModelApi = !!modelDef.api;
434
- if (!hasProviderApi && !hasModelApi && !isBuiltIn) {
435
- throw new Error(`Provider ${providerName}, model ${modelDef.id}: no "api" specified. Set at provider or model level.`);
436
- }
437
- // For built-in providers, api is optional — inherited from built-in models.
438
- if (!modelDef.id)
439
- throw new Error(`Provider ${providerName}: model missing "id"`);
440
- // Validate contextWindow/maxTokens only if provided (they have defaults)
441
- if (modelDef.contextWindow !== undefined && modelDef.contextWindow <= 0)
442
- throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid contextWindow`);
443
- if (modelDef.maxTokens !== undefined && modelDef.maxTokens <= 0)
444
- throw new Error(`Provider ${providerName}, model ${modelDef.id}: invalid maxTokens`);
445
- }
446
- }
447
- }
448
- parseModels(config) {
449
- const models = [];
450
- const builtInProviders = new Set(getProviders());
451
- // Cache built-in defaults (api, baseUrl) per provider, extracted from first model.
452
- const builtInDefaultsCache = new Map();
453
- const getBuiltInDefaults = (providerName) => {
454
- if (!builtInProviders.has(providerName))
455
- return undefined;
456
- if (builtInDefaultsCache.has(providerName))
457
- return builtInDefaultsCache.get(providerName);
458
- const builtIn = getModels(providerName);
459
- if (builtIn.length === 0)
460
- return undefined;
461
- const defaults = { api: builtIn[0].api, baseUrl: builtIn[0].baseUrl };
462
- builtInDefaultsCache.set(providerName, defaults);
463
- return defaults;
464
- };
465
- for (const [providerName, providerConfig] of Object.entries(config.providers)) {
466
- const modelDefs = providerConfig.models ?? [];
467
- if (modelDefs.length === 0)
468
- continue; // Override-only, no custom models
469
- const builtInDefaults = getBuiltInDefaults(providerName);
470
- for (const modelDef of modelDefs) {
471
- const api = modelDef.api ?? providerConfig.api ?? builtInDefaults?.api;
472
- if (!api)
473
- continue;
474
- const baseUrl = modelDef.baseUrl ?? providerConfig.baseUrl ?? builtInDefaults?.baseUrl;
475
- if (!baseUrl)
476
- continue;
477
- const compat = mergeCompat(providerConfig.compat, modelDef.compat);
478
- this.storeModelHeaders(providerName, modelDef.id, modelDef.headers);
479
- const defaultCost = { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
480
- models.push({
481
- id: modelDef.id,
482
- name: modelDef.name ?? modelDef.id,
483
- api: api,
484
- provider: providerName,
485
- baseUrl,
486
- reasoning: modelDef.reasoning ?? false,
487
- thinkingLevelMap: modelDef.thinkingLevelMap,
488
- input: (modelDef.input ?? ["text"]),
489
- cost: modelDef.cost ?? defaultCost,
490
- contextWindow: modelDef.contextWindow ?? 128000,
491
- maxTokens: modelDef.maxTokens ?? 16384,
492
- headers: undefined,
493
- compat,
494
- });
495
- }
496
- }
497
- return models;
15
+ return this.runtime.getError();
498
16
  }
499
- /**
500
- * Get all models (built-in + custom).
501
- * If models.json had errors, returns only built-in models.
502
- */
503
17
  getAll() {
504
- return this.models;
18
+ return [...this.runtime.getModels()];
505
19
  }
506
- /**
507
- * Get only models that have auth configured.
508
- * This is a fast check that doesn't refresh OAuth tokens.
509
- */
510
20
  getAvailable() {
511
- return this.models.filter((m) => this.hasConfiguredAuth(m));
21
+ return [...this.runtime.getAvailableSnapshot()];
512
22
  }
513
- /**
514
- * Find a model by provider and ID.
515
- */
516
23
  find(provider, modelId) {
517
- return this.models.find((m) => m.provider === provider && m.id === modelId);
24
+ return this.runtime.getModel(provider, modelId);
518
25
  }
519
- /**
520
- * Get API key for a model.
521
- */
522
26
  hasConfiguredAuth(model) {
523
- const providerApiKey = this.providerRequestConfigs.get(model.provider)?.apiKey;
524
- return (this.authStorage.hasAuth(model.provider) ||
525
- (providerApiKey !== undefined && isConfigValueConfigured(providerApiKey)));
526
- }
527
- getModelRequestKey(provider, modelId) {
528
- return `${provider}:${modelId}`;
529
- }
530
- storeProviderRequestConfig(providerName, config) {
531
- if (!config.apiKey && !config.headers && !config.authHeader) {
532
- return;
533
- }
534
- this.providerRequestConfigs.set(providerName, {
535
- apiKey: config.apiKey,
536
- headers: config.headers,
537
- authHeader: config.authHeader,
538
- });
539
- }
540
- storeModelHeaders(providerName, modelId, headers) {
541
- const key = this.getModelRequestKey(providerName, modelId);
542
- if (!headers || Object.keys(headers).length === 0) {
543
- this.modelRequestHeaders.delete(key);
544
- return;
545
- }
546
- this.modelRequestHeaders.set(key, headers);
27
+ return this.runtime.hasConfiguredAuth(model.provider);
547
28
  }
548
- /**
549
- * Get API key and request headers for a model.
550
- */
551
29
  async getApiKeyAndHeaders(model) {
552
30
  try {
553
- const providerConfig = this.providerRequestConfigs.get(model.provider);
554
- const providerEnv = this.authStorage.getProviderEnv(model.provider);
555
- const apiKeyFromAuthStorage = await this.authStorage.getApiKey(model.provider, { includeFallback: false });
556
- const apiKey = apiKeyFromAuthStorage ??
557
- (providerConfig?.apiKey
558
- ? resolveConfigValueOrThrow(providerConfig.apiKey, `API key for provider "${model.provider}"`, providerEnv)
559
- : undefined);
560
- const providerHeaders = resolveHeadersOrThrow(providerConfig?.headers, `provider "${model.provider}"`, providerEnv);
561
- const modelHeaders = resolveHeadersOrThrow(this.modelRequestHeaders.get(this.getModelRequestKey(model.provider, model.id)), `model "${model.provider}/${model.id}"`, providerEnv);
562
- let headers = model.headers || providerHeaders || modelHeaders
563
- ? { ...model.headers, ...providerHeaders, ...modelHeaders }
564
- : undefined;
565
- if (providerConfig?.authHeader) {
566
- if (!apiKey) {
31
+ const resolution = await this.runtime.getAuth(model);
32
+ if (!resolution) {
33
+ const compatibility = this.runtime.getCompatibilityRequestConfig(model);
34
+ if (compatibility.authHeader) {
567
35
  return { ok: false, error: `No API key found for "${model.provider}"` };
568
36
  }
569
- headers = { ...headers, Authorization: `Bearer ${apiKey}` };
37
+ const headers = compatibility.headers
38
+ ? Object.fromEntries(Object.entries(compatibility.headers).filter((entry) => entry[1] !== null))
39
+ : undefined;
40
+ return { ok: true, headers };
570
41
  }
571
- return {
572
- ok: true,
573
- apiKey,
574
- headers: headers && Object.keys(headers).length > 0 ? headers : undefined,
575
- env: providerEnv && Object.keys(providerEnv).length > 0 ? providerEnv : undefined,
576
- };
42
+ const headers = resolution.auth.headers
43
+ ? Object.fromEntries(Object.entries(resolution.auth.headers).filter((entry) => entry[1] !== null))
44
+ : undefined;
45
+ return { ok: true, apiKey: resolution.auth.apiKey, headers, env: resolution.env };
577
46
  }
578
47
  catch (error) {
48
+ const cause = error instanceof Error ? error.cause : undefined;
49
+ const message = cause instanceof Error ? cause.message : error instanceof Error ? error.message : String(error);
579
50
  return {
580
51
  ok: false,
581
- error: error instanceof Error ? error.message : String(error),
52
+ error: message === "authHeader requires a resolved API key"
53
+ ? `No API key found for "${model.provider}"`
54
+ : message,
582
55
  };
583
56
  }
584
57
  }
585
- /**
586
- * Return auth status for a provider, including request auth configured in models.json.
587
- * This intentionally does not execute command-backed config values.
588
- */
589
58
  getProviderAuthStatus(provider) {
590
- const authStatus = this.authStorage.getAuthStatus(provider);
591
- if (authStatus.source) {
592
- return authStatus;
593
- }
594
- const providerApiKey = this.providerRequestConfigs.get(provider)?.apiKey;
595
- if (!providerApiKey) {
596
- return authStatus;
597
- }
598
- if (isCommandConfigValue(providerApiKey)) {
599
- return { configured: true, source: "models_json_command" };
600
- }
601
- const envVarNames = getConfigValueEnvVarNames(providerApiKey);
602
- if (envVarNames.length > 0) {
603
- return isConfigValueConfigured(providerApiKey)
604
- ? { configured: true, source: "environment", label: envVarNames.join(", ") }
605
- : { configured: false };
606
- }
607
- return { configured: true, source: "models_json_key" };
59
+ return this.runtime.getProviderAuthStatus(provider);
60
+ }
61
+ getProvider(provider) {
62
+ return this.runtime.getProvider(provider);
608
63
  }
609
- /**
610
- * Get display name for a provider.
611
- */
612
64
  getProviderDisplayName(provider) {
613
- const registeredProvider = this.registeredProviders.get(provider);
614
- const oauthProvider = this.authStorage.getOAuthProviders().find((p) => p.id === provider);
615
- return (registeredProvider?.name ??
616
- registeredProvider?.oauth?.name ??
617
- oauthProvider?.name ??
618
- BUILT_IN_PROVIDER_DISPLAY_NAMES[provider] ??
619
- provider);
65
+ return this.runtime.getProvider(provider)?.name ?? provider;
66
+ }
67
+ getProviderAuth(provider) {
68
+ return this.runtime.getAuth(provider);
620
69
  }
621
- /**
622
- * Get API key for a provider.
623
- */
624
70
  async getApiKeyForProvider(provider) {
625
- const apiKey = await this.authStorage.getApiKey(provider);
626
- if (apiKey !== undefined) {
627
- return apiKey;
71
+ try {
72
+ return (await this.runtime.getAuth(provider))?.auth.apiKey;
73
+ }
74
+ catch {
75
+ return undefined;
628
76
  }
629
- const providerApiKey = this.providerRequestConfigs.get(provider)?.apiKey;
630
- return providerApiKey
631
- ? resolveConfigValueUncached(providerApiKey, this.authStorage.getProviderEnv(provider))
632
- : undefined;
633
77
  }
634
- /**
635
- * Check if a model is using OAuth credentials (subscription).
636
- */
637
78
  isUsingOAuth(model) {
638
- const cred = this.authStorage.get(model.provider);
639
- return cred?.type === "oauth";
79
+ return this.runtime.isUsingOAuth(model.provider);
640
80
  }
641
- /**
642
- * Register a provider dynamically (from extensions).
643
- *
644
- * If provider has models: replaces all existing models for this provider.
645
- * If provider has only baseUrl/headers: overrides existing models' URLs.
646
- * If provider has oauth: registers OAuth provider for /login support.
647
- */
648
- registerProvider(providerName, config) {
649
- this.validateProviderConfig(providerName, config);
650
- this.applyProviderConfig(providerName, config);
651
- this.upsertRegisteredProvider(providerName, config);
81
+ registerProvider(providerOrName, config) {
82
+ if (typeof providerOrName === "string") {
83
+ if (!config)
84
+ throw new Error("Provider config is required when registering by name");
85
+ this.runtime.registerProvider(providerOrName, config);
86
+ return;
87
+ }
88
+ this.runtime.registerNativeProvider(providerOrName);
652
89
  }
653
- /**
654
- * Unregister a previously registered provider.
655
- *
656
- * Removes the provider from the registry and reloads models from disk so that
657
- * built-in models overridden by this provider are restored to their original state.
658
- * Also resets dynamic OAuth and API stream registrations before reapplying
659
- * remaining dynamic providers.
660
- * Has no effect if the provider was never registered.
661
- */
662
90
  unregisterProvider(providerName) {
663
- if (!this.registeredProviders.has(providerName))
664
- return;
665
- this.registeredProviders.delete(providerName);
666
- this.refresh();
91
+ this.runtime.unregisterProvider(providerName);
667
92
  }
668
- /**
669
- * Upsert a provider config into registeredProviders.
670
- * If the provider is already registered, defined values in the incoming config
671
- * override existing ones; undefined values are preserved from the stored config.
672
- * If the provider is not registered, the incoming config is stored as-is.
673
- */
674
- upsertRegisteredProvider(providerName, config) {
675
- const existing = this.registeredProviders.get(providerName);
676
- if (!existing) {
677
- this.registeredProviders.set(providerName, config);
678
- return;
679
- }
680
- for (const k of Object.keys(config)) {
681
- if (config[k] !== undefined) {
682
- existing[k] = config[k];
683
- }
684
- }
93
+ getRegisteredProviderConfig(providerName) {
94
+ return this.runtime.getRegisteredProviderConfig(providerName);
685
95
  }
686
- validateProviderConfig(providerName, config) {
687
- if (config.streamSimple && !config.api) {
688
- throw new Error(`Provider ${providerName}: "api" is required when registering streamSimple.`);
689
- }
690
- if (!config.models || config.models.length === 0) {
691
- return;
692
- }
693
- if (!config.baseUrl) {
694
- throw new Error(`Provider ${providerName}: "baseUrl" is required when defining models.`);
695
- }
696
- if (!config.apiKey && !config.oauth) {
697
- throw new Error(`Provider ${providerName}: "apiKey" or "oauth" is required when defining models.`);
698
- }
699
- for (const modelDef of config.models) {
700
- const api = modelDef.api || config.api;
701
- if (!api) {
702
- throw new Error(`Provider ${providerName}, model ${modelDef.id}: no "api" specified.`);
703
- }
704
- }
96
+ getRegisteredNativeProvider(providerName) {
97
+ return this.runtime.getRegisteredNativeProvider(providerName);
705
98
  }
706
- applyProviderConfig(providerName, config) {
707
- // Register OAuth provider if provided
708
- if (config.oauth) {
709
- // Ensure the OAuth provider ID matches the provider name
710
- const oauthProvider = {
711
- ...config.oauth,
712
- id: providerName,
713
- };
714
- registerOAuthProvider(oauthProvider);
715
- }
716
- if (config.streamSimple) {
717
- const streamSimple = config.streamSimple;
718
- registerApiProvider({
719
- api: config.api,
720
- stream: (model, context, options) => streamSimple(model, context, options),
721
- streamSimple,
722
- }, `provider:${providerName}`);
723
- }
724
- this.storeProviderRequestConfig(providerName, config);
725
- if (config.models && config.models.length > 0) {
726
- // Full replacement: remove existing models for this provider
727
- this.models = this.models.filter((m) => m.provider !== providerName);
728
- // Parse and add new models
729
- for (const modelDef of config.models) {
730
- const api = modelDef.api || config.api;
731
- const modelOverride = this.getConfiguredModelOverride(providerName, modelDef.id);
732
- const headers = modelDef.headers || modelOverride?.headers
733
- ? { ...modelDef.headers, ...modelOverride?.headers }
734
- : undefined;
735
- this.storeModelHeaders(providerName, modelDef.id, headers);
736
- const model = this.applyConfiguredModelOverride(providerName, {
737
- id: modelDef.id,
738
- name: modelDef.name,
739
- api: api,
740
- provider: providerName,
741
- baseUrl: modelDef.baseUrl ?? config.baseUrl,
742
- reasoning: modelDef.reasoning,
743
- thinkingLevelMap: modelDef.thinkingLevelMap,
744
- input: modelDef.input,
745
- cost: modelDef.cost,
746
- contextWindow: modelDef.contextWindow,
747
- maxTokens: modelDef.maxTokens,
748
- headers: undefined,
749
- compat: modelDef.compat,
750
- });
751
- this.models.push(model);
752
- }
753
- // Apply OAuth modifyModels if credentials exist (e.g., to update baseUrl)
754
- if (config.oauth?.modifyModels) {
755
- const cred = this.authStorage.get(providerName);
756
- if (cred?.type === "oauth") {
757
- this.models = config.oauth.modifyModels(this.models, cred);
758
- }
759
- }
760
- }
761
- else if (config.baseUrl || config.headers) {
762
- // Override-only: update baseUrl for existing models. Request headers are resolved per request.
763
- this.models = this.models.map((m) => {
764
- if (m.provider !== providerName)
765
- return m;
766
- return {
767
- ...m,
768
- baseUrl: config.baseUrl ?? m.baseUrl,
769
- };
770
- });
771
- }
99
+ getRegisteredProviderIds() {
100
+ return this.runtime.getRegisteredProviderIds();
772
101
  }
773
102
  }
774
103
  //# sourceMappingURL=model-registry.js.map