diff --git a/packages/ai/src/auth/helpers.ts b/packages/ai/src/auth/helpers.ts index 5c64535f..251c60da 100644 --- a/packages/ai/src/auth/helpers.ts +++ b/packages/ai/src/auth/helpers.ts @@ -14,7 +14,9 @@ export function envApiKeyAuth(name: string, envVars: readonly string[]): ApiKeyA return { type: "api_key", key }; }, resolve: async ({ ctx, credential }) => { - if (credential?.key) return { auth: { apiKey: credential.key }, source: "stored credential" }; + if (credential?.key) { + return { auth: { apiKey: credential.key }, env: credential.env, source: "stored credential" }; + } for (const envVar of envVars) { const value = await ctx.env(envVar); if (value) return { auth: { apiKey: value }, source: envVar }; diff --git a/packages/ai/src/providers/amazon-bedrock.ts b/packages/ai/src/providers/amazon-bedrock.ts index 83a7050f..61deef5c 100644 --- a/packages/ai/src/providers/amazon-bedrock.ts +++ b/packages/ai/src/providers/amazon-bedrock.ts @@ -50,7 +50,9 @@ const bedrockAuth: ApiKeyAuth = { return { type: "api_key" }; }, resolve: async ({ ctx, credential }) => { - if (credential?.key) return { auth: { apiKey: credential.key }, source: "stored credential" }; + if (credential?.key) { + return { auth: { apiKey: credential.key }, env: credential.env, source: "stored credential" }; + } if (await ctx.env("AWS_BEARER_TOKEN_BEDROCK")) return { auth: {}, source: "AWS_BEARER_TOKEN_BEDROCK" }; if (credential?.env?.AWS_PROFILE ?? (await ctx.env("AWS_PROFILE"))) { return {