diff --git a/packages/core/src/model-resolver.ts b/packages/core/src/model-resolver.ts index 8e06c4762d0..24cb6d5cc5c 100644 --- a/packages/core/src/model-resolver.ts +++ b/packages/core/src/model-resolver.ts @@ -548,9 +548,12 @@ export const layer = Layer.effect( ) function hasConfiguredAuth(model: RuntimeInfo) { - return [model.settings?.apiKey, model.settings?.authToken, model.settings?.accessToken].some( - (value) => typeof value === "string" && value !== "", - ) + return [ + model.settings?.apiKey, + model.settings?.gatewayApiKey, + model.settings?.authToken, + model.settings?.accessToken, + ].some((value) => typeof value === "string" && value !== "") } const API_KEY_AUTH_PACKAGES: ReadonlySet = new Set([ diff --git a/packages/core/test/model-resolver.test.ts b/packages/core/test/model-resolver.test.ts index 4c5868ce783..91b6d5a90fb 100644 --- a/packages/core/test/model-resolver.test.ts +++ b/packages/core/test/model-resolver.test.ts @@ -423,6 +423,21 @@ describe("ModelResolver", () => { expect(headers["x-goog-api-key"]).toBeUndefined() }), ) + + const gateway = yield* resolver.resolveModel( + model("@opencode/ai/providers/cloudflare-ai-gateway", { + providerID: Provider.ID.make("gateway"), + settings: { baseURL: "https://gateway.example.com/v1/compat", gatewayApiKey: "gateway-fixture" }, + }), + ) + const headers = yield* gateway.model.route.auth.apply({ + request: ai.request({ model: gateway.model, prompt: "Hello" }), + method: "POST", + url: gateway.model.route.endpoint.baseURL ?? "", + body: "{}", + headers: Headers.fromInput(gateway.model.options?.headers), + }) + expect(headers.authorization).toBe("Bearer gateway-fixture") }).pipe(Effect.provide(layer)), ) })