Merge branch 'pr-6178' into feat/add-api-key-env-vars

Author: daniel-lxs

packages/types/src/constants.ts

@@ -0,0 +1,39 @@
+/**
+ * API key environment variable names organized by provider
+ */
+export const API_KEYS = {
+	ANTHROPIC: 'ANTHROPIC_API_KEY',
+	OPENAI: 'OPENAI_API_KEY',
+	OPEN_ROUTER: 'OPENROUTER_API_KEY',
+	GLAMA: 'GLAMA_API_KEY',
+	GEMINI: 'GEMINI_API_KEY',
+	MISTRAL: 'MISTRAL_API_KEY',
+	DEEP_SEEK: 'DEEPSEEK_API_KEY',
+	UNBOUND: 'UNBOUND_API_KEY',
+	REQUESTY: 'REQUESTY_API_KEY',
+	XAI: 'XAI_API_KEY',
+	GROQ: 'GROQ_API_KEY',
+	CHUTES: 'CHUTES_API_KEY',
+	LITELLM: 'LITELLM_API_KEY',
+	CEREBRAS: 'CEREBRAS_API_KEY',
+	DEEP_INFRA: 'DEEPINFRA_API_KEY',
+	DOUBAO: 'DOUBAO_API_KEY',
+	FEATHERLESS: 'FEATHERLESS_API_KEY',
+	FIREWORKS: 'FIREWORKS_API_KEY',
+	HUGGING_FACE: 'HUGGINGFACE_API_KEY',
+	IO_INTELLIGENCE: 'IOINTELLIGENCE_API_KEY',
+	MOONSHOOT: 'MOONSHOT_API_KEY',
+	SAMBA_NOVA: 'SAMBANOVA_API_KEY',
+	VERCEL: 'VERCEL_API_KEY',
+	ZAI: 'ZAI_API_KEY',
+} as const
+
+/**
+ * Array of all API key environment variable names
+ */
+export const API_KEY_ENV_VAR_NAMES = Object.values(API_KEYS)
+
+/**
+ * Type for API key environment variable names
+ */
+export type ApiKeyEnvVar = typeof API_KEYS[keyof typeof API_KEYS]

packages/types/src/index.ts

@@ -1,6 +1,7 @@
 export * from "./api.js"
 export * from "./cloud.js"
 export * from "./codebase-index.js"
+export * from "./constants.js"
 export * from "./cookie-consent.js"
 export * from "./events.js"
 export * from "./experiment.js"

packages/types/src/provider-settings.ts

@@ -190,6 +190,7 @@ const apiModelIdProviderModelSchema = baseProviderSettingsSchema.extend({
 
 const anthropicSchema = apiModelIdProviderModelSchema.extend({
 	apiKey: z.string().optional(),
+	anthropicConfigUseEnvVars: z.boolean().optional(),
 	anthropicBaseUrl: z.string().optional(),
 	anthropicUseAuthToken: z.boolean().optional(),
 	anthropicBeta1MContext: z.boolean().optional(), // Enable 'context-1m-2025-08-07' beta for 1M context window.
@@ -203,10 +204,12 @@ const claudeCodeSchema = apiModelIdProviderModelSchema.extend({
 const glamaSchema = baseProviderSettingsSchema.extend({
 	glamaModelId: z.string().optional(),
 	glamaApiKey: z.string().optional(),
+	glamaConfigUseEnvVars: z.boolean().optional(),
 })
 
 const openRouterSchema = baseProviderSettingsSchema.extend({
 	openRouterApiKey: z.string().optional(),
+	openRouterConfigUseEnvVars: z.boolean().optional(),
 	openRouterModelId: z.string().optional(),
 	openRouterBaseUrl: z.string().optional(),
 	openRouterSpecificProvider: z.string().optional(),
@@ -243,6 +246,7 @@ const vertexSchema = apiModelIdProviderModelSchema.extend({
 const openAiSchema = baseProviderSettingsSchema.extend({
 	openAiBaseUrl: z.string().optional(),
 	openAiApiKey: z.string().optional(),
+	openAiConfigUseEnvVars: z.boolean().optional(),
 	openAiLegacyFormat: z.boolean().optional(),
 	openAiR1FormatEnabled: z.boolean().optional(),
 	openAiModelId: z.string().optional(),
@@ -281,6 +285,7 @@ const lmStudioSchema = baseProviderSettingsSchema.extend({
 
 const geminiSchema = apiModelIdProviderModelSchema.extend({
 	geminiApiKey: z.string().optional(),
+	geminiConfigUseEnvVars: z.boolean().optional(),
 	googleGeminiBaseUrl: z.string().optional(),
 	enableUrlContext: z.boolean().optional(),
 	enableGrounding: z.boolean().optional(),
@@ -293,6 +298,7 @@ const geminiCliSchema = apiModelIdProviderModelSchema.extend({
 
 const openAiNativeSchema = apiModelIdProviderModelSchema.extend({
 	openAiNativeApiKey: z.string().optional(),
+	openAiNativeConfigUseEnvVars: z.boolean().optional(),
 	openAiNativeBaseUrl: z.string().optional(),
 	// OpenAI Responses API service tier for openai-native provider only.
 	// UI should only expose this when the selected model supports flex/priority.
@@ -301,40 +307,47 @@ const openAiNativeSchema = apiModelIdProviderModelSchema.extend({
 
 const mistralSchema = apiModelIdProviderModelSchema.extend({
 	mistralApiKey: z.string().optional(),
+	mistralConfigUseEnvVars: z.boolean().optional(),
 	mistralCodestralUrl: z.string().optional(),
 })
 
 const deepSeekSchema = apiModelIdProviderModelSchema.extend({
 	deepSeekBaseUrl: z.string().optional(),
 	deepSeekApiKey: z.string().optional(),
+	deepSeekConfigUseEnvVars: z.boolean().optional(),
 })
 
 const deepInfraSchema = apiModelIdProviderModelSchema.extend({
 	deepInfraBaseUrl: z.string().optional(),
 	deepInfraApiKey: z.string().optional(),
+	deepInfraConfigUseEnvVars: z.boolean().optional(),
 	deepInfraModelId: z.string().optional(),
 })
 
 const doubaoSchema = apiModelIdProviderModelSchema.extend({
 	doubaoBaseUrl: z.string().optional(),
 	doubaoApiKey: z.string().optional(),
+	doubaoConfigUseEnvVars: z.boolean().optional(),
 })
 
 const moonshotSchema = apiModelIdProviderModelSchema.extend({
 	moonshotBaseUrl: z
 		.union([z.literal("https://api.moonshot.ai/v1"), z.literal("https://api.moonshot.cn/v1")])
 		.optional(),
 	moonshotApiKey: z.string().optional(),
+	moonshotConfigUseEnvVars: z.boolean().optional(),
 })
 
 const unboundSchema = baseProviderSettingsSchema.extend({
 	unboundApiKey: z.string().optional(),
+	unboundConfigUseEnvVars: z.boolean().optional(),
 	unboundModelId: z.string().optional(),
 })
 
 const requestySchema = baseProviderSettingsSchema.extend({
 	requestyBaseUrl: z.string().optional(),
 	requestyApiKey: z.string().optional(),
+	requestyConfigUseEnvVars: z.boolean().optional(),
 	requestyModelId: z.string().optional(),
 })
 
@@ -346,35 +359,42 @@ const fakeAiSchema = baseProviderSettingsSchema.extend({
 
 const xaiSchema = apiModelIdProviderModelSchema.extend({
 	xaiApiKey: z.string().optional(),
+	xaiConfigUseEnvVars: z.boolean().optional(),
 })
 
 const groqSchema = apiModelIdProviderModelSchema.extend({
 	groqApiKey: z.string().optional(),
+	groqConfigUseEnvVars: z.boolean().optional(),
 })
 
 const huggingFaceSchema = baseProviderSettingsSchema.extend({
 	huggingFaceApiKey: z.string().optional(),
+	huggingFaceConfigUseEnvVars: z.boolean().optional(),	
 	huggingFaceModelId: z.string().optional(),
 	huggingFaceInferenceProvider: z.string().optional(),
 })
 
 const chutesSchema = apiModelIdProviderModelSchema.extend({
 	chutesApiKey: z.string().optional(),
+	chutesConfigUseEnvVars: z.boolean().optional(),
 })
 
 const litellmSchema = baseProviderSettingsSchema.extend({
 	litellmBaseUrl: z.string().optional(),
 	litellmApiKey: z.string().optional(),
+	litellmConfigUseEnvVars: z.boolean().optional(),
 	litellmModelId: z.string().optional(),
 	litellmUsePromptCache: z.boolean().optional(),
 })
 
 const cerebrasSchema = apiModelIdProviderModelSchema.extend({
 	cerebrasApiKey: z.string().optional(),
+	cerebrasConfigUseEnvVars: z.boolean().optional(),
 })
 
 const sambaNovaSchema = apiModelIdProviderModelSchema.extend({
 	sambaNovaApiKey: z.string().optional(),
+	sambaNovaConfigUseEnvVars: z.boolean().optional(),	
 })
 
 export const zaiApiLineSchema = z.enum(["international_coding", "international", "china_coding", "china"])
@@ -383,20 +403,24 @@ export type ZaiApiLine = z.infer<typeof zaiApiLineSchema>
 
 const zaiSchema = apiModelIdProviderModelSchema.extend({
 	zaiApiKey: z.string().optional(),
+	zaiConfigUseEnvVars: z.boolean().optional(),
 	zaiApiLine: zaiApiLineSchema.optional(),
 })
 
 const fireworksSchema = apiModelIdProviderModelSchema.extend({
 	fireworksApiKey: z.string().optional(),
+	fireworksConfigUseEnvVars: z.boolean().optional(),
 })
 
 const featherlessSchema = apiModelIdProviderModelSchema.extend({
 	featherlessApiKey: z.string().optional(),
+	featherlessConfigUseEnvVars: z.boolean().optional(),	
 })
 
 const ioIntelligenceSchema = apiModelIdProviderModelSchema.extend({
 	ioIntelligenceModelId: z.string().optional(),
 	ioIntelligenceApiKey: z.string().optional(),
+	ioIntelligenceConfigUseEnvVars: z.boolean().optional(),
 })
 
 const qwenCodeSchema = apiModelIdProviderModelSchema.extend({
@@ -409,6 +433,7 @@ const rooSchema = apiModelIdProviderModelSchema.extend({
 
 const vercelAiGatewaySchema = baseProviderSettingsSchema.extend({
 	vercelAiGatewayApiKey: z.string().optional(),
+	vercelConfigUseEnvVars: z.boolean().optional(),
 	vercelAiGatewayModelId: z.string().optional(),
 })