Skip to content

Commit 863ea44

Browse files
committed
fix(core): scope credential checks to implicit model defaults
1 parent 5494d1a commit 863ea44

4 files changed

Lines changed: 62 additions & 30 deletions

File tree

‎packages/core/src/config/plugin/provider.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,7 @@ export const Plugin = define({
6464
id: provider.id,
6565
integrationID: provider.integrationID,
6666
})
67-
// Request overlays alone must not bypass a catalog provider's credential check.
68-
if (
69-
!current?.provider.integrationID ||
70-
changed ||
71-
item.package !== undefined ||
72-
item.models !== undefined ||
73-
[item.settings?.apiKey, item.settings?.authToken, item.settings?.accessToken].some(
74-
(value) => typeof value === "string" && value !== "",
75-
)
76-
)
77-
provider.activation = "enabled"
67+
provider.activation = "enabled"
7868
if (item.canonical !== undefined) provider.canonical = item.canonical
7969
if (item.name !== undefined) provider.name = item.name
8070
if (item.package !== undefined) provider.package = item.package

‎packages/core/src/model-resolver.ts‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -409,17 +409,7 @@ export const layer = Layer.effect(
409409
resolve: Effect.fn("ModelResolver.resolve")(function* (requested) {
410410
const selected = requested
411411
? yield* models.get(requested.providerID, requested.id)
412-
: yield* models
413-
.default()
414-
.pipe(
415-
Effect.flatMap((model) =>
416-
model && hasPackage(model)
417-
? Effect.succeed(model)
418-
: Effect.map(models.available(), (models) =>
419-
models.find((model) => hasPackage(model) && Model.supportsText(model)),
420-
),
421-
),
422-
)
412+
: yield* models.default(hasPackage)
423413
if (!selected) return undefined
424414
return yield* load(selected, requested?.variant)
425415
}),

‎packages/core/src/model.ts‎

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { Model } from "@opencode/schema/model"
22
import { Provider } from "./provider.js"
3+
import { Integration } from "./integration.js"
34
import type { DeepMutable } from "./schema.js"
45
import { Context, Effect, Layer, Stream } from "effect"
56
import { makeLocationNode } from "@opencode/util/effect/app-node"
@@ -74,7 +75,7 @@ export interface Interface extends State.Transformable<Editor> {
7475
readonly get: (providerID: Provider.ID, modelID: ID) => Effect.Effect<Info | undefined>
7576
readonly all: () => Effect.Effect<readonly Info[]>
7677
readonly available: () => Effect.Effect<readonly Info[]>
77-
readonly default: () => Effect.Effect<Info | undefined>
78+
readonly default: (filter?: (model: Info) => boolean) => Effect.Effect<Info | undefined>
7879
readonly small: (providerID: Provider.ID) => Effect.Effect<Info | undefined>
7980
}
8081

@@ -89,6 +90,7 @@ const layer = Layer.effect(
8990
Service,
9091
Effect.gen(function* () {
9192
const providers = yield* Provider.Service
93+
const integrations = yield* Integration.Service
9294
const bus = yield* Bus.Service
9395
const location = yield* Location.Service
9496
let input: Provider.Snapshot | undefined
@@ -257,11 +259,25 @@ const layer = Layer.effect(
257259
),
258260
all: Effect.fn("Model.all")(() => read().pipe(Effect.map((value) => value.all))),
259261
available: Effect.fn("Model.available")(() => read().pipe(Effect.map((value) => value.available))),
260-
default: Effect.fn("Model.default")(function* () {
262+
default: Effect.fn("Model.default")(function* (filter?: (model: Info) => boolean) {
261263
const value = yield* read()
262264
const requested = value.data.defaultModel
263265
const model = requested && value.byProvider.get(requested.providerID)?.get(requested.modelID)
264-
return model?.enabled ? model : value.available.find(supportsText)
266+
if (model?.enabled && (!filter || filter(model))) return model
267+
const connections = new Map((yield* integrations.list()).map((integration) => [integration.id, integration]))
268+
const catalog = yield* providers.snapshot()
269+
// Configured gateways remain selectable without a key, but request overlays
270+
// alone must not replace the implicit default with an unconnected provider.
271+
return value.available.find((candidate) => {
272+
if (!supportsText(candidate) || (filter && !filter(candidate))) return false
273+
const provider = catalog.records.get(candidate.providerID)?.provider
274+
const integration = connections.get(provider?.integrationID ?? Integration.ID.make(candidate.providerID))
275+
if (integration?.connections.length) return true
276+
if (!provider?.integrationID && !integration) return true
277+
return [candidate.settings?.apiKey, candidate.settings?.authToken, candidate.settings?.accessToken].some(
278+
(credential) => typeof credential === "string" && credential !== "",
279+
)
280+
})
265281
}),
266282
small: Effect.fn("Model.small")(function* (providerID) {
267283
const value = yield* read()
@@ -280,7 +296,7 @@ const layer = Layer.effect(
280296
}),
281297
)
282298

283-
export const node = makeLocationNode({ service: Service, layer, deps: [Provider.node, Bus.node, Location.node] })
299+
export const node = makeLocationNode({ service: Service, layer, deps: [Provider.node, Integration.node, Bus.node, Location.node] })
284300

285301
export function supportsText(model: Pick<Info, "capabilities">) {
286302
return (

‎packages/core/test/config/provider.test.ts‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ describe("ConfigProviderPlugin.Plugin", () => {
152152
)
153153
}
154154

155-
it.effect("keeps settings-only providers unavailable without credentials and preserves the default model", () =>
155+
it.effect("keeps settings-only providers selectable without changing the implicit default", () =>
156156
Effect.gen(function* () {
157157
const providers = yield* Provider.Service
158158
const models = yield* Model.Service
@@ -183,9 +183,9 @@ describe("ConfigProviderPlugin.Plugin", () => {
183183
}),
184184
])
185185

186-
expect((yield* providers.get(Provider.ID.anthropic))?.activation).toBe("auto")
186+
expect((yield* providers.get(Provider.ID.anthropic))?.activation).toBe("enabled")
187187
expect((yield* providers.get(Provider.ID.anthropic))?.settings?.baseURL).toBe("https://proxy.example/v1")
188-
expect((yield* providers.available()).map((provider) => provider.id)).not.toContain(Provider.ID.anthropic)
188+
expect((yield* providers.available()).map((provider) => provider.id)).toContain(Provider.ID.anthropic)
189189
expect((yield* models.default())?.providerID).toBe(clean.providerID)
190190
}),
191191
)
@@ -209,7 +209,43 @@ describe("ConfigProviderPlugin.Plugin", () => {
209209
yield* addPlugin([new Document({ type: "document", info: decode({ providers: { anthropic: override } }) })])
210210

211211
expect((yield* providers.get(Provider.ID.anthropic))?.activation).toBe("enabled")
212-
expect((yield* models.default())?.providerID).toBe(Provider.ID.anthropic)
212+
expect((yield* models.default())?.providerID).toBe("settings" in override ? Provider.ID.anthropic : undefined)
213+
}),
214+
)
215+
}
216+
217+
for (const headers of [{ "x-api-key": "gateway-key" }, {}]) {
218+
it.effect(`preserves explicit ${"x-api-key" in headers ? "header-auth" : "keyless"} gateway selection`, () =>
219+
Effect.gen(function* () {
220+
const providers = yield* Provider.Service
221+
const models = yield* Model.Service
222+
const integrations = yield* Integration.Service
223+
const modelID = Model.ID.make("chat")
224+
yield* integrations.transform((editor) => {
225+
editor.method.update({ integrationID: Integration.ID.make("xai"), method: { type: "key" } })
226+
})
227+
yield* providers.transform((editor) => {
228+
editor.update(Provider.ID.make("xai"), (provider) => {
229+
provider.activation = "auto"
230+
provider.integrationID = Integration.ID.make("xai")
231+
})
232+
editor.models.update(Provider.ID.make("xai"), modelID, () => {})
233+
})
234+
yield* addPlugin([
235+
new Document({
236+
type: "document",
237+
info: decode({
238+
model: "xai/chat",
239+
providers: { xai: { settings: { baseURL: "http://localhost:1234/v1" }, headers } },
240+
}),
241+
}),
242+
])
243+
expect((yield* providers.available()).map((provider) => provider.id)).toContain(Provider.ID.make("xai"))
244+
expect(yield* models.get(Provider.ID.make("xai"), modelID)).toMatchObject({
245+
settings: { baseURL: "http://localhost:1234/v1" },
246+
headers,
247+
})
248+
expect((yield* models.default())?.providerID).toBe(Provider.ID.make("xai"))
213249
}),
214250
)
215251
}

0 commit comments

Comments
 (0)