Skip to content

Fix --env-file support for the gateway #2085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgageot merged 1 commit into from
Mar 12, 2026
+7 −4
Merged

Fix --env-file support for the gateway #2085

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions cmd/root/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Loading