From 98f84db171823c7de17ade164abb16908629967a Mon Sep 17 00:00:00 2001 From: David Gageot Date: Thu, 12 Mar 2026 14:57:52 +0100 Subject: [PATCH] Fix --env-file support for the gateway Signed-off-by: David Gageot --- cmd/root/flags.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/cmd/root/flags.go b/cmd/root/flags.go index f68268346..ea352b35d 100644 --- a/cmd/root/flags.go +++ b/cmd/root/flags.go @@ -76,11 +76,14 @@ func addGatewayFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) { userCfg = &userconfig.Config{} } + ctx := cmd.Context() + env := runConfig.EnvProvider() + // Precedence: CLI flag > environment variable > user config if runConfig.ModelsGateway == "" { - if gateway := os.Getenv(envModelsGateway); gateway != "" { + if gateway, _ := env.Get(ctx, envModelsGateway); gateway != "" { runConfig.ModelsGateway = gateway - } else if gateway := os.Getenv(cagentEnvModelsGateway); gateway != "" { + } else if gateway, _ := env.Get(ctx, cagentEnvModelsGateway); gateway != "" { runConfig.ModelsGateway = gateway } else if userCfg.ModelsGateway != "" { runConfig.ModelsGateway = userCfg.ModelsGateway @@ -89,9 +92,9 @@ func addGatewayFlags(cmd *cobra.Command, runConfig *config.RuntimeConfig) { runConfig.ModelsGateway = canonize(runConfig.ModelsGateway) // Precedence for default model: environment variable > user config - if model := os.Getenv(envDefaultModel); model != "" { + if model, _ := env.Get(ctx, envDefaultModel); model != "" { runConfig.DefaultModel = parseModelShorthand(model) - } else if model := os.Getenv(cagentEnvDefaultModel); model != "" { + } else if model, _ := env.Get(ctx, cagentEnvDefaultModel); model != "" { runConfig.DefaultModel = parseModelShorthand(model) } else if userCfg.DefaultModel != nil { runConfig.DefaultModel = &userCfg.DefaultModel.ModelConfig