Merge pull request #611 from dgageot/fix-dead-code

Remove dead code

Author: dgageot

pkg/config/config.go

@@ -3,6 +3,7 @@ package config
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"os"
 	"path/filepath"
 	"strings"
@@ -61,18 +62,20 @@ func LoadConfig(path string, fs filesystem.FS) (*latest.Config, error) {
 //
 // This allows exiting early with a proper error message instead of failing later when trying to use a model or tool.
 func CheckRequiredEnvVars(ctx context.Context, cfg *latest.Config, env environment.Provider, runtimeConfig RuntimeConfig) error {
-	requiredEnv, err := GatherMissingEnvVars(ctx, cfg, env, runtimeConfig)
+	missing, err := gatherMissingEnvVars(ctx, cfg, env, runtimeConfig)
 	if err != nil {
-		return fmt.Errorf("gathering required environment variables: %w", err)
+		// If there's a tool preflight error, log it but continue
+		slog.Warn("Failed to preflight toolset environment variables; continuing", "error", err)
 	}
 
-	if len(requiredEnv) == 0 {
-		return nil
+	// Return error if there are missing environment variables
+	if len(missing) > 0 {
+		return &environment.RequiredEnvError{
+			Missing: missing,
+		}
 	}
 
-	return &environment.RequiredEnvError{
-		Missing: requiredEnv,
-	}
+	return nil
 }
 
 func parseCurrentVersion(dir string, data []byte, version any) (any, error) {

pkg/config/gather.go

@@ -12,9 +12,9 @@ import (
 	"github.com/docker/cagent/pkg/model/provider"
 )
 
-// GatherMissingEnvVars finds out which environment variables are required by the models and tools.
+// gatherMissingEnvVars finds out which environment variables are required by the models and tools.
 // It returns the missing variables and any non-fatal error encountered during tool discovery.
-func GatherMissingEnvVars(ctx context.Context, cfg *latest.Config, env environment.Provider, runtimeConfig RuntimeConfig) (missing []string, toolErr error) {
+func gatherMissingEnvVars(ctx context.Context, cfg *latest.Config, env environment.Provider, runtimeConfig RuntimeConfig) (missing []string, toolErr error) {
 	requiredEnv := map[string]bool{}
 
 	// Models

pkg/teamloader/teamloader.go

@@ -262,24 +262,6 @@ func findAgentPaths(agentsPathOrDirectory string) ([]string, error) {
 	return agents, nil
 }
 
-// checkRequiredEnvVars checks which environment variables are required by the models and tools.
-// This allows exiting early with a proper error message instead of failing later when trying to use a model or tool.
-func checkRequiredEnvVars(ctx context.Context, cfg *latest.Config, env environment.Provider, runtimeConfig config.RuntimeConfig) error {
-	missing, toolErr := config.GatherMissingEnvVars(ctx, cfg, env, runtimeConfig)
-
-	// If there's a tool preflight error, log it but continue
-	if toolErr != nil {
-		slog.Warn("Failed to preflight toolset environment variables; continuing", "error", toolErr)
-	}
-
-	// Return error if there are missing environment variables
-	if len(missing) > 0 {
-		return &environment.RequiredEnvError{Missing: missing}
-	}
-
-	return nil
-}
-
 type loadOptions struct {
 	modelOverrides  []string
 	toolsetRegistry *ToolsetRegistry
@@ -344,7 +326,7 @@ func Load(ctx context.Context, p string, runtimeConfig config.RuntimeConfig, opt
 	}
 
 	// Early check for required env vars before loading models and tools.
-	if err := checkRequiredEnvVars(ctx, cfg, env, runtimeConfig); err != nil {
+	if err := config.CheckRequiredEnvVars(ctx, cfg, env, runtimeConfig); err != nil {
 		return nil, err
 	}