@dcode-dev/dcode-cli 1.0.1 → 1.0.3

package/cmd/agent_v2.go

@@ -79,7 +79,7 @@ func runAgentV2(cmd *cobra.Command, args []string) error {
 			// Set default models
 			switch provider {
 			case "gemini":
-				cfg.Model.Model = "gemini-2.0-flash-exp"
+				cfg.Model.Model = "gemini-2.5-flash"
 			case "openai":
 				cfg.Model.Model = "gpt-4"
 			case "copilot":
@@ -365,6 +365,7 @@ func handleCommand(input string, agentManager *agents.AgentManager, toolRegistry
 		fmt.Println("\nAvailable Commands:")
 		fmt.Println("  /help, /h       - Show this help")
 		fmt.Println("  /agent          - List and switch agents")
+		fmt.Println("  /model          - Change AI model")
 		fmt.Println("  /tools          - List available tools")
 		fmt.Println("  /auth           - Show authentication status")
 		fmt.Println("  /clear          - Clear conversation history")
@@ -402,6 +403,57 @@ func handleCommand(input string, agentManager *agents.AgentManager, toolRegistry
 		}
 		fmt.Println()
 		return true, true
+	
+	case "/model":
+		// Show current model and allow changing
+		cfg, err := config.LoadConfig()
+		if err != nil {
+			fmt.Printf("❌ Error loading config: %v\n", err)
+			return true, true
+		}
+		
+		provider := cfg.Model.Provider
+		currentModel := cfg.Model.Model
+		
+		fmt.Printf("\n🤖 Current: %s (%s)\n\n", currentModel, provider)
+		
+		// Show available models
+		models := map[string][]string{
+			"gemini": {"gemini-2.5-flash", "gemini-2.0-flash-exp", "gemini-1.5-pro", "gemini-1.5-flash"},
+			"openai": {"gpt-4", "gpt-4-turbo", "gpt-4o", "gpt-4o-mini", "gpt-3.5-turbo", "o1-preview", "o1-mini"},
+			"copilot": {"gpt-4", "gpt-4-turbo", "gpt-4o", "gpt-4o-mini", "gpt-3.5-turbo", "o1-preview", "o1-mini", "claude-3.5-sonnet"},
+			"claude": {"claude-3-5-sonnet-20241022", "claude-3-5-haiku-20241022", "claude-3-opus-20240229"},
+		}
+		
+		if availableModels, ok := models[provider]; ok {
+			fmt.Println("Available models:")
+			for i, model := range availableModels {
+				marker := " "
+				if model == currentModel {
+					marker = "▸"
+				}
+				fmt.Printf("  %s %d. %s\n", marker, i+1, model)
+			}
+			fmt.Print("\nEnter number to switch (or press Enter to keep current): ")
+			
+			var choice string
+			fmt.Scanln(&choice)
+			
+			if choice != "" {
+				var num int
+				if _, err := fmt.Sscanf(choice, "%d", &num); err == nil && num >= 1 && num <= len(availableModels) {
+					cfg.Model.Model = availableModels[num-1]
+					if err := config.SaveConfig(cfg); err != nil {
+						fmt.Printf("❌ Error saving: %v\n", err)
+					} else {
+						fmt.Printf("✅ Switched to: %s\n", cfg.Model.Model)
+						fmt.Println("⚠️  Restart dcode for changes to take effect")
+					}
+				}
+			}
+		}
+		fmt.Println()
+		return true, true
 		
 	case "/clear":
 		agent, _ := agentManager.GetCurrentAgent()

package/cmd/model.go

@@ -0,0 +1,159 @@
+package cmd
+
+import (
+	"fmt"
+	"strconv"
+
+	"github.com/ddhanush1/dcode/internal/config"
+	"github.com/spf13/cobra"
+)
+
+var modelCmd = &cobra.Command{
+	Use:   "model [model-name]",
+	Short: "Select AI model for current provider",
+	Long: `Select which AI model to use with the current provider.
+
+If no model name is provided, shows available models for current provider.
+
+Examples:
+  dcode model              # List available models
+  dcode model gpt-4        # Use GPT-4
+  dcode model gpt-3.5-turbo # Use GPT-3.5 Turbo`,
+	RunE: selectModel,
+}
+
+func init() {
+	rootCmd.AddCommand(modelCmd)
+}
+
+// Available models for each provider
+var providerModels = map[string][]string{
+	"gemini": {
+		"gemini-2.5-flash",
+		"gemini-2.0-flash-exp",
+		"gemini-1.5-pro",
+		"gemini-1.5-flash",
+		"gemini-pro",
+	},
+	"openai": {
+		"gpt-4",
+		"gpt-4-turbo",
+		"gpt-4o",
+		"gpt-4o-mini",
+		"gpt-3.5-turbo",
+		"o1-preview",
+		"o1-mini",
+	},
+	"copilot": {
+		"gpt-4",
+		"gpt-4-turbo",
+		"gpt-4o",
+		"gpt-4o-mini",
+		"gpt-3.5-turbo",
+		"o1-preview",
+		"o1-mini",
+		"claude-3.5-sonnet",
+	},
+	"claude": {
+		"claude-3-5-sonnet-20241022",
+		"claude-3-5-haiku-20241022",
+		"claude-3-opus-20240229",
+		"claude-3-sonnet-20240229",
+		"claude-3-haiku-20240307",
+	},
+}
+
+func selectModel(cmd *cobra.Command, args []string) error {
+	// Load config
+	cfg, err := config.LoadConfig()
+	if err != nil {
+		return fmt.Errorf("failed to load config: %w", err)
+	}
+
+	provider := cfg.Model.Provider
+	if provider == "" {
+		return fmt.Errorf("no provider set. Use 'dcode switch <provider>' first")
+	}
+
+	availableModels, ok := providerModels[provider]
+	if !ok {
+		return fmt.Errorf("unknown provider: %s", provider)
+	}
+
+	// If model name provided, set it directly
+	if len(args) > 0 {
+		modelName := args[0]
+		
+		// Validate model
+		valid := false
+		for _, m := range availableModels {
+			if m == modelName {
+				valid = true
+				break
+			}
+		}
+		
+		if !valid {
+			fmt.Printf("⚠️  Warning: '%s' is not in the list of known models\n", modelName)
+			fmt.Printf("Setting it anyway... (custom models are supported)\n\n")
+		}
+		
+		cfg.Model.Model = modelName
+		if err := config.SaveConfig(cfg); err != nil {
+			return fmt.Errorf("failed to save config: %w", err)
+		}
+		
+		fmt.Printf("✅ Model set to: %s\n", modelName)
+		fmt.Printf("   Provider: %s\n", provider)
+		return nil
+	}
+
+	// Interactive selection
+	fmt.Printf("\n🤖 Available models for %s:\n\n", provider)
+	for i, model := range availableModels {
+		current := ""
+		if model == cfg.Model.Model {
+			current = " (current)"
+		}
+		fmt.Printf("  %d. %s%s\n", i+1, model, current)
+	}
+	
+	fmt.Printf("\n  0. Enter custom model name\n")
+	fmt.Print("\nSelect model (0-" + strconv.Itoa(len(availableModels)) + "): ")
+	
+	var choice int
+	fmt.Scanf("%d", &choice)
+	
+	if choice == 0 {
+		// Custom model
+		fmt.Print("Enter custom model name: ")
+		var customModel string
+		fmt.Scanln(&customModel)
+		
+		if customModel != "" {
+			cfg.Model.Model = customModel
+			if err := config.SaveConfig(cfg); err != nil {
+				return fmt.Errorf("failed to save config: %w", err)
+			}
+			fmt.Printf("\n✅ Model set to: %s\n", customModel)
+		}
+		return nil
+	}
+	
+	if choice < 1 || choice > len(availableModels) {
+		return fmt.Errorf("invalid choice: %d", choice)
+	}
+	
+	selectedModel := availableModels[choice-1]
+	cfg.Model.Model = selectedModel
+	
+	if err := config.SaveConfig(cfg); err != nil {
+		return fmt.Errorf("failed to save config: %w", err)
+	}
+	
+	fmt.Printf("\n✅ Model set to: %s\n", selectedModel)
+	fmt.Printf("   Provider: %s\n", provider)
+	fmt.Println("\nYou can now run: dcode")
+	
+	return nil
+}

package/cmd/switch.go

@@ -86,24 +86,16 @@ func switchProvider(cmd *cobra.Command, args []string) error {
 		cfg.Auth.Provider = provider
 	}
 
-	// Set default models
+	// Set default models (ALWAYS update model when switching provider)
 	switch provider {
 	case "gemini":
-		if cfg.Model.Model == "" {
-			cfg.Model.Model = "gemini-2.0-flash-exp"
-		}
+		cfg.Model.Model = "gemini-2.5-flash"
 	case "openai":
-		if cfg.Model.Model == "" {
-			cfg.Model.Model = "gpt-4"
-		}
+		cfg.Model.Model = "gpt-4"
 	case "claude":
-		if cfg.Model.Model == "" {
-			cfg.Model.Model = "claude-3-5-sonnet-20241022"
-		}
+		cfg.Model.Model = "claude-3-5-sonnet-20241022"
 	case "copilot":
-		if cfg.Model.Model == "" {
-			cfg.Model.Model = "gpt-4"
-		}
+		cfg.Model.Model = "gpt-4"
 	}
 
 	// Save config

package/internal/config/config.go

@@ -209,38 +209,89 @@ func GetConfigDir() (string, error) {
 
 // LoadConfig loads configuration from file and environment
 func LoadConfig() (*Config, error) {
-	cfg := DefaultConfig()
-	
-	// Check environment for provider override first
-	if provider := os.Getenv("AI_PROVIDER"); provider != "" {
-		cfg.Model.Provider = provider
-		cfg.Auth.Provider = provider
-	}
-	
 	// Load from settings.toml if it exists
 	configDir, err := GetConfigDir()
 	if err != nil {
 		return nil, err
 	}
 	
+	homeDir, _ := os.UserHomeDir()
 	settingsPath := filepath.Join(configDir, "settings.toml")
+	var cfg *Config
+	
 	if _, err := os.Stat(settingsPath); err == nil {
+		// File exists - load it WITHOUT defaults to avoid env-based auto-detection
+		cfg = &Config{
+			// Set ONLY structural defaults, no provider detection
+			Agent: AgentConfig{
+				DefaultAgent:    "generalist",
+				EnabledAgents:   []string{"generalist"},
+				AgentDirectory:  filepath.Join(homeDir, ".dcode", "agents"),
+				MaxTurns:        50,
+				EnableSubAgents: true,
+			},
+			Tool: ToolConfig{
+				ToolDirectory:    filepath.Join(homeDir, ".dcode", "tools"),
+				ShellTimeout:     300,
+				WebSearchEnabled: false,
+				ToolSettings:     make(map[string]string),
+			},
+			Server: ServerConfig{
+				Host:      "localhost",
+				Port:      8080,
+				A2APort:   41242,
+			},
+			Telemetry: TelemetryConfig{
+				SampleRate:    1.0,
+				EnableLogging: true,
+				LogLevel:      "info",
+			},
+		}
+		
 		data, err := os.ReadFile(settingsPath)
 		if err != nil {
 			return nil, fmt.Errorf("failed to read settings file: %w", err)
 		}
 		
+		// This will override the structural defaults with saved values
 		if err := toml.Unmarshal(data, cfg); err != nil {
 			return nil, fmt.Errorf("failed to parse settings file: %w", err)
 		}
+		
+		// DEBUG: Print what was loaded
+		// fmt.Printf("DEBUG: Loaded provider=%s model=%s\n", cfg.Model.Provider, cfg.Model.Model)
+	} else {
+		// No file, use full defaults (with env detection)
+		cfg = DefaultConfig()
 	}
 	
-	// Override with environment variables
-	cfg.ApplyEnvironment()
+	// ONLY override if AI_PROVIDER is explicitly set in environment
+	if provider := os.Getenv("AI_PROVIDER"); provider != "" {
+		cfg.Model.Provider = provider
+		cfg.Auth.Provider = provider
+	}
+	
+	// Apply other environment overrides
+	if val := os.Getenv("AI_MODEL"); val != "" {
+		cfg.Model.Model = val
+	}
 	
-	// Auto-detect model if using default OpenAI model with non-OpenAI provider
-	if cfg.Model.Model == "gpt-4o-mini" && cfg.Model.Provider != "openai" {
-		cfg.Model.Model = GetDefaultModelForProvider(cfg.Model.Provider)
+	// Set API keys for current provider
+	switch cfg.Auth.Provider {
+	case "openai":
+		if val := os.Getenv("OPENAI_API_KEY"); val != "" {
+			cfg.Auth.APIKey = val
+		}
+	case "gemini":
+		if val := os.Getenv("GEMINI_API_KEY"); val != "" {
+			cfg.Auth.APIKey = val
+		} else if val := os.Getenv("GOOGLE_API_KEY"); val != "" {
+			cfg.Auth.APIKey = val
+		}
+	case "claude":
+		if val := os.Getenv("ANTHROPIC_API_KEY"); val != "" {
+			cfg.Auth.APIKey = val
+		}
 	}
 	
 	return cfg, nil
@@ -265,11 +316,13 @@ func (c *Config) ApplyEnvironment() {
 	c.mu.Lock()
 	defer c.mu.Unlock()
 	
-	// Auth
+	// ONLY override provider if AI_PROVIDER env var is explicitly set
 	if val := os.Getenv("AI_PROVIDER"); val != "" {
 		c.Auth.Provider = val
 		c.Model.Provider = val
 	}
+	
+	// Set API keys based on current provider
 	if val := os.Getenv("OPENAI_API_KEY"); val != "" && c.Auth.Provider == "openai" {
 		c.Auth.APIKey = val
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcode-dev/dcode-cli",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "DCode - AI-powered coding assistant CLI",
   "keywords": [
     "ai",