Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rekram1-node merged 1 commit into from
Apr 30, 2026
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions packages/opencode/src/provider/provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Comment thread
rekram1-node marked this conversation as resolved.
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]
Expand Down Expand Up @@ -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)) {
Expand Down
Loading