feat: removed migration

Author: Cloudsky01

cmd/rivet/config.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/Cloudsky01/gh-rivet/internal/config"
 	"github.com/Cloudsky01/gh-rivet/internal/git"
-	"github.com/Cloudsky01/gh-rivet/internal/migration"
 	"github.com/Cloudsky01/gh-rivet/internal/paths"
 )
 
@@ -62,13 +61,6 @@ Configuration Precedence (lowest to highest):
 		Long:  `Remove the user configuration file to reset to defaults.`,
 		RunE:  runConfigReset,
 	}
-
-	configMigrateCmd = &cobra.Command{
-		Use:   "migrate",
-		Short: "Migrate legacy configuration",
-		Long:  `Migrate from legacy .rivet.yaml to the new multi-tier configuration system.`,
-		RunE:  runConfigMigrate,
-	}
 )
 
 func init() {
@@ -77,7 +69,6 @@ func init() {
 	configCmd.AddCommand(configShowCmd)
 	configCmd.AddCommand(configEditCmd)
 	configCmd.AddCommand(configResetCmd)
-	configCmd.AddCommand(configMigrateCmd)
 }
 
 func runConfigPath(cmd *cobra.Command, args []string) error {
@@ -133,30 +124,14 @@ func runConfigPath(cmd *cobra.Command, args []string) error {
 }
 
 func runConfigShow(cmd *cobra.Command, args []string) error {
-	// Detect project root
-	projectRoot, _ := git.GetGitRepositoryRoot()
-
-	// Create paths
-	var p *paths.Paths
-	var err error
-	if projectRoot != "" {
-		p, err = paths.NewWithProject(projectRoot)
-	} else {
-		p, err = paths.New()
-	}
-	if err != nil {
-		return fmt.Errorf("failed to initialize paths: %w", err)
-	}
-
-	// Load merged config
-	cfg, err := config.LoadMultiTier(p, configPath)
+	// Try to load config from the given path
+	cfg, err := config.Load(configPath)
 	if err != nil {
 		return fmt.Errorf("failed to load configuration: %w", err)
 	}
 
-	fmt.Println("Merged Configuration")
+	fmt.Println("Configuration")
 	fmt.Println("════════════════════════════════════════════════════════════")
-	fmt.Printf("Source: %s\n", cfg.GetConfigSource())
 	fmt.Printf("Path:   %s\n", cfg.GetConfigPath())
 	fmt.Println()
 
@@ -168,13 +143,6 @@ func runConfigShow(cmd *cobra.Command, args []string) error {
 
 	fmt.Println(string(data))
 
-	// Show which configs contributed
-	fmt.Println("════════════════════════════════════════════════════════════")
-	fmt.Println("Active Configuration Files:")
-	for _, path := range p.GetConfigPaths() {
-		fmt.Printf("  • %s (%s)\n", path, p.GetConfigSource(path))
-	}
-
 	return nil
 }
 
@@ -287,68 +255,6 @@ func runConfigReset(cmd *cobra.Command, args []string) error {
 	return nil
 }
 
-func runConfigMigrate(cmd *cobra.Command, args []string) error {
-	// Detect project root
-	projectRoot, _ := git.GetGitRepositoryRoot()
-
-	// Create paths
-	var p *paths.Paths
-	var err error
-	if projectRoot != "" {
-		p, err = paths.NewWithProject(projectRoot)
-	} else {
-		p, err = paths.New()
-	}
-	if err != nil {
-		return fmt.Errorf("failed to initialize paths: %w", err)
-	}
-
-	// Check if migration is needed
-	needsMigration, legacyPath := migration.NeedsMigration(p)
-	if !needsMigration {
-		fmt.Println("✓ Configuration is already up to date.")
-		fmt.Println("  No legacy config found or migration already complete.")
-		return nil
-	}
-
-	// Show migration prompt
-	fmt.Print(migration.GetMigrationPrompt(legacyPath))
-
-	// Read user choice
-	reader := bufio.NewReader(os.Stdin)
-	response, err := reader.ReadString('\n')
-	if err != nil {
-		return fmt.Errorf("failed to read input: %w", err)
-	}
-
-	response = strings.TrimSpace(response)
-
-	// Parse choice
-	var choice migration.MigrationChoice
-	switch response {
-	case "1":
-		choice = migration.MigrateToUser
-	case "2":
-		choice = migration.KeepAsTeam
-	case "3":
-		choice = migration.Skip
-		return nil
-	default:
-		fmt.Println("Invalid choice. Migration cancelled.")
-		return nil
-	}
-
-	// Perform migration
-	if err := migration.Migrate(p, legacyPath, choice); err != nil {
-		return fmt.Errorf("migration failed: %w", err)
-	}
-
-	// Show success message
-	migration.ShowMigrationSuccess(p)
-
-	return nil
-}
-
 // Helper functions
 
 func fileExists(path string) bool {

internal/config/config.go

@@ -24,15 +24,14 @@ type Preferences struct {
 
 type Config struct {
 	Repository  string       `yaml:"repository"`
-	Preferences *Preferences `yaml:"preferences,omitempty"` // User preferences (new, optional)
+	Preferences *Preferences `yaml:"preferences,omitempty"` // User preferences (optional)
 	Groups      []Group      `yaml:"groups,omitempty"`
 
 	// Internal fields (not serialized)
-	configSource paths.ConfigSource `yaml:"-"` // Track where this config came from
-	configPath   string             `yaml:"-"` // Path to the config file
+	configPath string `yaml:"-"` // Path to the config file
 }
 
-// GetRefreshInterval returns the refresh interval, checking preferences first
+// GetRefreshInterval returns the refresh interval from preferences
 func (c *Config) GetRefreshInterval() int {
 	if c.Preferences != nil {
 		return c.Preferences.RefreshInterval
@@ -48,11 +47,6 @@ func (c *Config) SetRefreshInterval(interval int) {
 	c.Preferences.RefreshInterval = interval
 }
 
-// GetConfigSource returns the source of this config
-func (c *Config) GetConfigSource() paths.ConfigSource {
-	return c.configSource
-}
-
 // GetConfigPath returns the path to this config file
 func (c *Config) GetConfigPath() string {
 	return c.configPath
@@ -113,8 +107,8 @@ func Load(path string) (*Config, error) {
 	return &config, nil
 }
 
-// LoadFromPath loads a config from a specific path with source tracking
-func LoadFromPath(path string, source paths.ConfigSource) (*Config, error) {
+// LoadFromPath loads a config from a specific path
+func LoadFromPath(path string) (*Config, error) {
 	data, err := os.ReadFile(path)
 	if err != nil {
 		return nil, fmt.Errorf("failed to read config file: %w", err)
@@ -125,150 +119,11 @@ func LoadFromPath(path string, source paths.ConfigSource) (*Config, error) {
 		return nil, fmt.Errorf("failed to parse config: %w", err)
 	}
 
-	config.configSource = source
 	config.configPath = path
 
 	return &config, nil
 }
 
-// LoadMultiTier loads config from multiple sources and merges them
-// The order of precedence (lowest to highest):
-// 1. Repository default (.github/.rivet.yaml)
-// 2. User global config (~/.config/rivet/config.yaml)
-// 3. Project user config (.git/.rivet/config.yaml)
-// 4. Environment variables (RIVET_*)
-// 5. Explicit path via CLI flag (if provided)
-func LoadMultiTier(p *paths.Paths, explicitPath string) (*Config, error) {
-	var baseConfig *Config
-	var err error
-
-	if explicitPath != "" {
-		// CLI flag has highest priority - load only this file
-		baseConfig, err = LoadFromPath(explicitPath, paths.SourceCLIFlag)
-		if err != nil {
-			return nil, fmt.Errorf("failed to load config from %s: %w", explicitPath, err)
-		}
-	} else {
-		// Load and merge from multiple sources
-		configPaths := p.GetConfigPaths()
-
-		if len(configPaths) == 0 {
-			// No config files found, check for legacy config
-			if legacyPath, found := p.FindLegacyConfig(); found {
-				return LoadFromPath(legacyPath, paths.SourceRepoDefault)
-			}
-			return nil, fmt.Errorf("no configuration file found")
-		}
-
-		// Start with the first (lowest priority) config
-		baseConfig, err = LoadFromPath(configPaths[0], p.GetConfigSource(configPaths[0]))
-		if err != nil {
-			return nil, fmt.Errorf("failed to load base config from %s: %w", configPaths[0], err)
-		}
-
-		// Merge higher priority configs
-		for i := 1; i < len(configPaths); i++ {
-			overrideConfig, err := LoadFromPath(configPaths[i], p.GetConfigSource(configPaths[i]))
-			if err != nil {
-				// Log warning but continue with partial config
-				fmt.Fprintf(os.Stderr, "Warning: failed to load config from %s: %v\n", configPaths[i], err)
-				continue
-			}
-
-			baseConfig = MergeConfigs(baseConfig, overrideConfig)
-		}
-	}
-
-	// Apply environment variable overrides
-	applyEnvOverrides(baseConfig)
-
-	return baseConfig, nil
-}
-
-// MergeConfigs merges two configs, with override taking precedence
-// Only non-empty values from override are applied to base
-func MergeConfigs(base, override *Config) *Config {
-	merged := &Config{
-		Repository:   base.Repository,
-		Preferences:  base.Preferences,
-		Groups:       base.Groups,
-		configSource: base.configSource,
-		configPath:   base.configPath,
-	}
-
-	// Override repository if specified
-	if override.Repository != "" {
-		merged.Repository = override.Repository
-		merged.configSource = override.configSource
-		merged.configPath = override.configPath
-	}
-
-	// Merge preferences
-	if override.Preferences != nil {
-		if merged.Preferences == nil {
-			merged.Preferences = &Preferences{}
-		}
-
-		if override.Preferences.RefreshInterval != 0 {
-			merged.Preferences.RefreshInterval = override.Preferences.RefreshInterval
-		}
-		if override.Preferences.Theme != "" {
-			merged.Preferences.Theme = override.Preferences.Theme
-		}
-		if override.Preferences.Keybindings != "" {
-			merged.Preferences.Keybindings = override.Preferences.Keybindings
-		}
-		if len(override.Preferences.CustomSettings) > 0 {
-			if merged.Preferences.CustomSettings == nil {
-				merged.Preferences.CustomSettings = make(map[string]string)
-			}
-			for k, v := range override.Preferences.CustomSettings {
-				merged.Preferences.CustomSettings[k] = v
-			}
-		}
-	}
-
-	// Override groups if specified (full replacement, not merge)
-	if len(override.Groups) > 0 {
-		merged.Groups = override.Groups
-	}
-
-	return merged
-}
-
-// applyEnvOverrides applies environment variable overrides to the config
-func applyEnvOverrides(config *Config) {
-	// Check for RIVET_REPOSITORY
-	if repo := os.Getenv("RIVET_REPOSITORY"); repo != "" {
-		config.Repository = repo
-		config.configSource = paths.SourceEnvVar
-	}
-
-	// Check for RIVET_REFRESH_INTERVAL
-	if interval := os.Getenv("RIVET_REFRESH_INTERVAL"); interval != "" {
-		var val int
-		if _, err := fmt.Sscanf(interval, "%d", &val); err == nil {
-			config.SetRefreshInterval(val)
-		}
-	}
-
-	// Check for RIVET_PREFERENCES_THEME
-	if theme := os.Getenv("RIVET_PREFERENCES_THEME"); theme != "" {
-		if config.Preferences == nil {
-			config.Preferences = &Preferences{}
-		}
-		config.Preferences.Theme = theme
-	}
-
-	// Check for RIVET_PREFERENCES_KEYBINDINGS
-	if kb := os.Getenv("RIVET_PREFERENCES_KEYBINDINGS"); kb != "" {
-		if config.Preferences == nil {
-			config.Preferences = &Preferences{}
-		}
-		config.Preferences.Keybindings = kb
-	}
-}
-
 func LoadWithViper(path string) (*Config, *viper.Viper, error) {
 	v := viper.New()