vrr/opencode
2
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-05-06 16:31:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 19

fix: ensure user config takes precendence over plugin hooks for model resolution (#25167)

Browse source
This commit is contained in:
Aiden Cline 2026-04-30 17:15:56 -05:00 • committed by GitHub
parent 5518ecaefe
commit 560baae15d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

54
packages/opencode/src/provider/provider.ts
View file

@ -1140,6 +1140,33 @@ const layer: Layer.Layer<
return true
}
for (const hook of plugins) {
const p = hook.provider
const models = p?.models
if (!p || !models) continue
const providerID = ProviderID.make(p.id)
if (disabled.has(providerID)) continue
const provider = database[providerID]
if (!provider) continue
const pluginAuth = yield* auth.get(providerID).pipe(Effect.orDie)
provider.models = yield* Effect.promise(async () => {
const next = await models(provider, { auth: pluginAuth })
return Object.fromEntries(
Object.entries(next).map(([id, model]) => [
id,
{
...model,
id: ModelID.make(id),
providerID,
},
]),
)
})
}
// extend database from config
for (const [providerID, provider] of configProviders) {
const existing = database[providerID]
@ -1326,33 +1353,6 @@ const layer: Layer.Layer<
})
}
for (const hook of plugins) {
const p = hook.provider
const models = p?.models
if (!p || !models) continue
const providerID = ProviderID.make(p.id)
if (disabled.has(providerID)) continue
const provider = providers[providerID]
if (!provider) continue
const pluginAuth = yield* auth.get(providerID).pipe(Effect.orDie)
provider.models = yield* Effect.promise(async () => {
const next = await models(provider, { auth: pluginAuth })
return Object.fromEntries(
Object.entries(next).map(([id, model]) => [
id,
{
...model,
id: ModelID.make(id),
providerID,
},
]),
)
})
}
for (const [id, provider] of Object.entries(providers)) {
const providerID = ProviderID.make(id)
if (!isProviderAllowed(providerID)) {