Merge branch 'main' into feature/docs-custom-commands

Author: m7medVision

README.md

@@ -60,7 +60,7 @@ lazycommit commit | fzf --prompt='Pick commit> ' | xargs -r -I {} git commit -m
 
 ## Configuration
 
-Configuration file: `.lazycommit.yaml` in $HOME or project root.
+- Config directory (`~/.config/.lazycommit.yaml`
 
 ```yaml
 active_provider: copilot # default if a GitHub token is found

internal/config/config.go

@@ -11,37 +11,28 @@ import (
 	"github.com/spf13/viper"
 )
 
-// ProviderConfig holds the configuration for a single LLM provider.
 type ProviderConfig struct {
 	APIKey string `mapstructure:"api_key"`
 	Model  string `mapstructure:"model"`
 }
 
-// Config is the main configuration structure for the application.
 type Config struct {
 	Providers      map[string]ProviderConfig `mapstructure:"providers"`
 	ActiveProvider string                    `mapstructure:"active_provider"`
 }
 
 var cfg *Config
 
-// InitConfig initializes the configuration from environment variables and config files.
 func InitConfig() {
 	viper.SetConfigName(".lazycommit")
 	viper.SetConfigType("yaml")
-	home, err := os.UserHomeDir()
-	if err != nil {
-		fmt.Println("Error getting home directory:", err)
-		os.Exit(1)
-	}
-	viper.AddConfigPath(home)
-	viper.AddConfigPath(".") // Also look in the current directory
+	viper.AddConfigPath(getConfigDir())
+	viper.SetConfigFile(filepath.Join(getConfigDir(), ".lazycommit.yaml"))
 
-	// Set defaults based on available credentials
 	if token, err := LoadGitHubToken(); err == nil && token != "" {
 		viper.SetDefault("active_provider", "copilot")
 		viper.SetDefault("providers.copilot.api_key", token)
-		viper.SetDefault("providers.copilot.model", "openai/gpt-4o") // Use GitHub Models format
+		viper.SetDefault("providers.copilot.model", "openai/gpt-4o")
 	} else {
 		viper.SetDefault("active_provider", "openai")
 		viper.SetDefault("providers.openai.model", "gpt-3.5-turbo")
@@ -50,7 +41,17 @@ func InitConfig() {
 	viper.AutomaticEnv()
 
 	if err := viper.ReadInConfig(); err != nil {
-		if _, ok := err.(viper.ConfigFileNotFoundError); !ok {
+		if _, ok := err.(viper.ConfigFileNotFoundError); ok {
+			cfgDir := getConfigDir()
+			_ = os.MkdirAll(cfgDir, 0o755)
+			cfgPath := filepath.Join(cfgDir, ".lazycommit.yaml")
+			if writeErr := viper.WriteConfigAs(cfgPath); writeErr != nil {
+				fmt.Println("Error creating default config file:", writeErr)
+			} else {
+				fmt.Printf("Created default config at %s\n", cfgPath)
+			}
+			_ = viper.ReadInConfig()
+		} else {
 			fmt.Println("Error reading config file:", err)
 		}
 	}
@@ -61,15 +62,13 @@ func InitConfig() {
 	}
 }
 
-// GetProvider returns the active provider's name.
 func GetProvider() string {
 	if cfg == nil {
 		InitConfig()
 	}
 	return cfg.ActiveProvider
 }
 
-// GetActiveProviderConfig returns the configuration for the currently active provider.
 func GetActiveProviderConfig() (*ProviderConfig, error) {
 	if cfg == nil {
 		InitConfig()
@@ -82,7 +81,6 @@ func GetActiveProviderConfig() (*ProviderConfig, error) {
 	return &providerConfig, nil
 }
 
-// GetAPIKey returns the API key for the active provider.
 func GetAPIKey() (string, error) {
 	if cfg == nil {
 		InitConfig()
@@ -115,7 +113,6 @@ func GetAPIKey() (string, error) {
 	return apiKey, nil
 }
 
-// GetModel returns the model for the active provider.
 func GetModel() (string, error) {
 	providerConfig, err := GetActiveProviderConfig()
 	if err != nil {
@@ -127,7 +124,6 @@ func GetModel() (string, error) {
 	return providerConfig.Model, nil
 }
 
-// SetProvider sets the active provider and saves the config.
 func SetProvider(provider string) error {
 	if cfg == nil {
 		InitConfig()
@@ -137,7 +133,6 @@ func SetProvider(provider string) error {
 	return viper.WriteConfig()
 }
 
-// SetModel sets the model for the active provider and saves the config.
 func SetModel(model string) error {
 	if cfg == nil {
 		InitConfig()
@@ -147,7 +142,6 @@ func SetModel(model string) error {
 	return viper.WriteConfig()
 }
 
-// SetAPIKey sets the API key for a specific provider and saves the config.
 func SetAPIKey(provider, apiKey string) error {
 	if cfg == nil {
 		InitConfig()
@@ -156,23 +150,17 @@ func SetAPIKey(provider, apiKey string) error {
 	return viper.WriteConfig()
 }
 
-// LoadGitHubToken tries to load a GitHub token with models scope from standard locations.
 func LoadGitHubToken() (string, error) {
-	// First check environment variable (recommended approach)
 	if token := os.Getenv("GITHUB_TOKEN"); token != "" {
 		return token, nil
 	}
 
-	// Also check for a GitHub Models specific token
 	if token := os.Getenv("GITHUB_MODELS_TOKEN"); token != "" {
 		return token, nil
 	}
 
-	// Fallback: try to find tokens from GitHub Copilot IDE installations
-	// Note: These tokens may not have the required 'models' scope
 	configDir := getConfigDir()
 
-	// Try both hosts.json and apps.json files
 	filePaths := []string{
 		filepath.Join(configDir, "github-copilot", "hosts.json"),
 		filepath.Join(configDir, "github-copilot", "apps.json"),