Refactor configuration loading to accept command flags

- Updated loadConfig function to accept command flags for better flexibility.
- Enhanced error handling for configuration loading based on command line inputs.
- Adjusted viper.Unmarshal usage to avoid conflicts when a config file is auto-loaded.

Author: Dumbris

cmd/mcpproxy/main.go

@@ -76,7 +76,7 @@ func main() {
 
 func runServer(cmd *cobra.Command, _ []string) error {
 	// Load configuration first to get logging settings
-	cfg, err := loadConfig()
+	cfg, err := loadConfig(cmd)
 	if err != nil {
 		return fmt.Errorf("failed to load configuration: %w", err)
 	}
@@ -228,7 +228,7 @@ func runServer(cmd *cobra.Command, _ []string) error {
 	return nil
 }
 
-func loadConfig() (*config.Config, error) {
+func loadConfig(cmd *cobra.Command) (*config.Config, error) {
 	var cfg *config.Config
 	var err error
 
@@ -243,11 +243,11 @@ func loadConfig() (*config.Config, error) {
 		return nil, fmt.Errorf("failed to load configuration: %w", err)
 	}
 
-	// Override with command line flags if provided
+	// Override with command line flags ONLY if they were explicitly set
 	if dataDir != "" {
 		cfg.DataDir = dataDir
 	}
-	if listen != "" {
+	if cmd.Flags().Changed("listen") {
 		cfg.Listen = listen
 	}
 	if toolResponseLimit != 0 {

internal/config/loader.go

@@ -57,6 +57,7 @@ func Load() (*Config, error) {
 
 	// Load from config file if specified
 	configPath := viper.GetString("config")
+	configFileAutoLoaded := false
 	if configPath != "" {
 		if err := loadConfigFile(configPath, cfg); err != nil {
 			return nil, fmt.Errorf("failed to load config file %s: %w", configPath, err)
@@ -67,6 +68,7 @@ func Load() (*Config, error) {
 		if err != nil && configFound {
 			return nil, err // Only return error if config was found but couldn't be loaded
 		}
+		configFileAutoLoaded = configFound
 
 		// If no config file was found, create a default one
 		if !configFound {
@@ -94,9 +96,13 @@ func Load() (*Config, error) {
 		}
 	}
 
-	// Override with viper (CLI flags and env vars)
-	if err := viper.Unmarshal(cfg); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal config: %w", err)
+	// Only use viper.Unmarshal if no config file was auto-loaded
+	// When config file is auto-loaded, CLI flags are handled in main.go
+	if !configFileAutoLoaded {
+		// Override with viper (CLI flags and env vars)
+		if err := viper.Unmarshal(cfg); err != nil {
+			return nil, fmt.Errorf("failed to unmarshal config: %w", err)
+		}
 	}
 
 	// Set data directory if not specified
@@ -169,7 +175,6 @@ func findAndLoadConfigFile(cfg *Config) (found bool, path string, err error) {
 			return true, location, loadConfigFile(location, cfg)
 		}
 	}
-
 	return false, "", nil
 }