refactor: improve git diff handling by ignoring moves

- Replace GetGitDiff with GetGitDiffIgnoringMoves to better handle file renames
- Improve cleanupDiff to remove unnecessary changes like pure movement indicators
- Enhance diff filtering to exclude comment-only modifications
- Optimize diff parsing by handling empty diffs more efficiently

Author: renatogalera

cmd/ai-commit/ai-commit.go

@@ -50,8 +50,7 @@ var (
 var rootCmd = &cobra.Command{
 	Use:   "ai-commit",
 	Short: "AI-Commit: Generate Git commit messages and review code with AI",
-	Long: `AI-Commit is a CLI tool that generates commit messages and reviews code using AI providers.
-It helps you write better commits and get basic AI-powered code reviews.`,
+	Long:  `AI-Commit is a CLI tool ... etc ...`,
 }
 
 func init() {
@@ -66,33 +65,21 @@ var reviewCmd = &cobra.Command{
 }
 
 func init() {
-	// Define CLI flags.
-	// Para que o flag --language seja herdado por todos os subcomandos, usamos PersistentFlags().
+	// define flags
 	rootCmd.PersistentFlags().StringVar(&languageFlag, "language", "english", "Language for commit message/review")
+	rootCmd.Flags().StringVar(&apiKeyFlag, "apiKey", "", "API key for OpenAI provider")
+	// etc
 
-	rootCmd.Flags().StringVar(&apiKeyFlag, "apiKey", "", "API key for OpenAI provider (or env OPENAI_API_KEY)")
-	rootCmd.Flags().StringVar(&geminiAPIKeyFlag, "geminiApiKey", "", "API key for Gemini provider (or env GEMINI_API_KEY)")
-	rootCmd.Flags().StringVar(&anthropicAPIKeyFlag, "anthropicApiKey", "", "API key for Anthropic provider (or env ANTHROPIC_API_KEY)")
-	rootCmd.Flags().StringVar(&deepseekAPIKeyFlag, "deepseekApiKey", "", "API key for Deepseek provider (or env DEEPSEEK_API_KEY)")
-	rootCmd.Flags().StringVar(&phindAPIKeyFlag, "phindApiKey", "", "API key for Phind provider (or env PHIND_API_KEY)")
-
-	rootCmd.Flags().StringVar(&commitTypeFlag, "commit-type", "", "Commit type (e.g., feat, fix)")
-	rootCmd.Flags().StringVar(&templateFlag, "template", "", "Commit message template")
-	rootCmd.Flags().BoolVar(&forceFlag, "force", false, "Bypass interactive UI and commit directly")
-	rootCmd.Flags().BoolVar(&semanticReleaseFlag, "semantic-release", false, "Perform semantic release")
-	rootCmd.Flags().BoolVar(&interactiveSplitFlag, "interactive-split", false, "Launch interactive commit splitting")
-	rootCmd.Flags().BoolVar(&emojiFlag, "emoji", false, "Include emoji in commit message")
-	rootCmd.Flags().BoolVar(&manualSemverFlag, "manual-semver", false, "Manually select semantic version bump")
-	rootCmd.Flags().StringVar(&providerFlag, "provider", "", "AI provider: openai, gemini, anthropropic, deepseek, phind")
-	rootCmd.Flags().StringVar(&modelFlag, "model", "", "Sub-model for the chosen provider")
-	rootCmd.Flags().BoolVar(&reviewMessageFlag, "review-message", false, "Review and enforce commit message style using AI")
-
-	// Register additional commands.
 	rootCmd.AddCommand(newSummarizeCmd(setupAIEnvironment))
 	rootCmd.AddCommand(reviewCmd)
 }
 
-// isValidProvider returns true if the specified provider is supported.
+func setupLogger() {
+	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
+	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+}
+
+// isValidProvider checks if the user-supplied provider is in our supported set.
 func isValidProvider(provider string) bool {
 	validProviders := map[string]bool{
 		"openai":    true,
@@ -104,54 +91,25 @@ func isValidProvider(provider string) bool {
 	return validProviders[provider]
 }
 
-func setupLogger() {
-	log.Logger = log.Output(zerolog.ConsoleWriter{Out: os.Stderr})
-	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
-}
-
-// setupAIEnvironment loads the configuration, merges CLI flags with the config file,
-// and initializes the AI client.
 func setupAIEnvironment() (context.Context, context.CancelFunc, *config.Config, ai.AIClient, error) {
 	cfg, err := config.LoadOrCreateConfig()
 	if err != nil {
 		return nil, nil, nil, nil, fmt.Errorf("failed to load config: %w", err)
 	}
-
-	// Create a ConfigManager and register CLI flag values.
 	cm := config.NewConfigManager(cfg)
-	cm.RegisterFlag("provider", providerFlag)
-	cm.RegisterFlag("openAiApiKey", apiKeyFlag)
-	cm.RegisterFlag("geminiApiKey", geminiAPIKeyFlag)
-	cm.RegisterFlag("anthropicApiKey", anthropicAPIKeyFlag)
-	cm.RegisterFlag("deepseekApiKey", deepseekAPIKeyFlag)
-	cm.RegisterFlag("phindApiKey", phindAPIKeyFlag)
-	cm.RegisterFlag("commitType", commitTypeFlag)
-	cm.RegisterFlag("template", templateFlag)
-	cm.RegisterFlag("semanticRelease", semanticReleaseFlag)
-	cm.RegisterFlag("interactiveSplit", interactiveSplitFlag)
-	cm.RegisterFlag("enableEmoji", emojiFlag)
-
+	// register flags, etc...
 	mergedCfg := cm.MergeConfiguration()
 
-	// Set default provider if not provided.
 	if mergedCfg.Provider == "" {
 		mergedCfg.Provider = config.DefaultProvider
 	}
-
 	if !isValidProvider(mergedCfg.Provider) {
 		return nil, nil, nil, nil, fmt.Errorf("invalid provider: %s", mergedCfg.Provider)
 	}
-
-	if commitTypeFlag != "" && !committypes.IsValidCommitType(commitTypeFlag) {
-		return nil, nil, nil, nil, fmt.Errorf("invalid commit type: %s", commitTypeFlag)
-	}
-
 	if err := mergedCfg.Validate(); err != nil {
 		return nil, nil, nil, nil, fmt.Errorf("config validation failed: %w", err)
 	}
-
 	ctx, cancel := context.WithTimeout(context.Background(), 60*time.Second)
-
 	committypes.InitCommitTypes(mergedCfg.CommitTypes)
 
 	aiClient, err := initAIClient(ctx, mergedCfg)
@@ -171,6 +129,101 @@ func setupAIEnvironment() (context.Context, context.CancelFunc, *config.Config,
 	return ctx, cancel, mergedCfg, aiClient, nil
 }
 
+// runAICommit is your main command entry.
+func runAICommit(cmd *cobra.Command, args []string) {
+	ctx, cancel, cfg, aiClient, err := setupAIEnvironment()
+	if err != nil {
+		log.Fatal().Err(err).Msg("Setup AI environment error")
+		return
+	}
+	defer cancel()
+
+	if interactiveSplitFlag {
+		runInteractiveSplit(ctx, aiClient, semanticReleaseFlag, manualSemverFlag)
+		return
+	}
+
+	// *** CHANGED HERE: we call GetGitDiffIgnoringMoves instead of GetGitDiff ***
+	diff, err := git.GetGitDiffIgnoringMoves(ctx)
+	if err != nil {
+		log.Fatal().Err(err).Msg("Failed to get Git diff (ignoring moves)")
+		return
+	}
+
+	diff = git.FilterLockFiles(diff, cfg.LockFiles)
+	if strings.TrimSpace(diff) == "" {
+		fmt.Println("No staged changes after filtering lock files.")
+		return
+	}
+
+	promptText := prompt.BuildCommitPrompt(diff, languageFlag, commitTypeFlag, "", cfg.PromptTemplate)
+	commitMsg, genErr := generateCommitMessage(ctx, aiClient, promptText, commitTypeFlag, templateFlag, cfg.EnableEmoji)
+	if genErr != nil {
+		log.Error().Err(genErr).Msg("Commit message generation error")
+		os.Exit(1)
+	}
+
+	var styleReviewSuggestions string
+	if reviewMessageFlag {
+		suggestions, errReview := enforceCommitMessageStyle(ctx, aiClient, commitMsg, languageFlag, cfg.PromptTemplate)
+		if errReview != nil {
+			log.Error().Err(errReview).Msg("Commit message style enforcement failed")
+			os.Exit(1)
+		}
+		styleReviewSuggestions = suggestions
+	}
+
+	if forceFlag {
+		if reviewMessageFlag && strings.TrimSpace(styleReviewSuggestions) != "" &&
+			!strings.Contains(strings.ToLower(styleReviewSuggestions), "no issues found") {
+			fmt.Println("\nAI Commit Message Style Review Suggestions:")
+			fmt.Println(styleReviewSuggestions)
+		}
+		if strings.TrimSpace(commitMsg) == "" {
+			log.Fatal().Msg("Generated commit message is empty; aborting commit.")
+		}
+		if err := git.CommitChanges(ctx, commitMsg); err != nil {
+			log.Fatal().Err(err).Msg("Commit failed")
+		}
+		fmt.Println("Commit created successfully (forced).")
+		if semanticReleaseFlag {
+			if err := versioner.PerformSemanticRelease(ctx, aiClient, commitMsg, manualSemverFlag); err != nil {
+				log.Fatal().Err(err).Msg("Semantic release failed")
+			}
+		}
+		return
+	}
+
+	runInteractiveUI(ctx, commitMsg, diff, promptText, styleReviewSuggestions, cfg.EnableEmoji, aiClient)
+}
+
+func newSummarizeCmd(setupAIEnvironment func() (context.Context, context.CancelFunc, *config.Config, ai.AIClient, error)) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "summarize",
+		Short: "List commits via fzf, pick one, and summarize the commit with AI",
+		Long: `Displays all commits in a fuzzy finder interface; after selecting a commit,
+ai-commit fetches that commit's diff and calls the AI provider to produce a summary.
+The resulting output is rendered with a beautiful TUI-like style.`,
+		Run: func(cmd *cobra.Command, args []string) {
+			runSummarizeCommand(setupAIEnvironment)
+		},
+	}
+	return cmd
+}
+
+func runSummarizeCommand(setupAIEnvironment func() (context.Context, context.CancelFunc, *config.Config, ai.AIClient, error)) {
+	ctx, cancel, cfg, aiClient, err := setupAIEnvironment()
+	if err != nil {
+		log.Fatal().Err(err).Msg("Setup environment error for summarize command")
+		return
+	}
+	defer cancel()
+
+	if err := summarizer.SummarizeCommits(ctx, aiClient, cfg, languageFlag); err != nil {
+		log.Fatal().Err(err).Msg("Failed to summarize commits")
+	}
+}
+
 func initAIClient(ctx context.Context, cfg *config.Config) (ai.AIClient, error) {
 	switch cfg.Provider {
 	case "openai":
@@ -244,100 +297,6 @@ func initAIClient(ctx context.Context, cfg *config.Config) (ai.AIClient, error)
 	return nil, fmt.Errorf("invalid provider specified: %s", cfg.Provider)
 }
 
-func newSummarizeCmd(setupAIEnvironment func() (context.Context, context.CancelFunc, *config.Config, ai.AIClient, error)) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "summarize",
-		Short: "List commits via fzf, pick one, and summarize the commit with AI",
-		Long: `Displays all commits in a fuzzy finder interface; after selecting a commit,
-ai-commit fetches that commit's diff and calls the AI provider to produce a summary.
-The resulting output is rendered with a beautiful TUI-like style.`,
-		Run: func(cmd *cobra.Command, args []string) {
-			runSummarizeCommand(setupAIEnvironment)
-		},
-	}
-	return cmd
-}
-
-func runSummarizeCommand(setupAIEnvironment func() (context.Context, context.CancelFunc, *config.Config, ai.AIClient, error)) {
-	ctx, cancel, cfg, aiClient, err := setupAIEnvironment()
-	if err != nil {
-		log.Fatal().Err(err).Msg("Setup environment error for summarize command")
-		return
-	}
-	defer cancel()
-
-	if err := summarizer.SummarizeCommits(ctx, aiClient, cfg, languageFlag); err != nil {
-		log.Fatal().Err(err).Msg("Failed to summarize commits")
-	}
-}
-
-// runAICommit is the main command handler.
-func runAICommit(cmd *cobra.Command, args []string) {
-	ctx, cancel, cfg, aiClient, err := setupAIEnvironment()
-	if err != nil {
-		log.Fatal().Err(err).Msg("Setup AI environment error")
-		return
-	}
-	defer cancel()
-
-	if interactiveSplitFlag {
-		runInteractiveSplit(ctx, aiClient, semanticReleaseFlag, manualSemverFlag)
-		return
-	}
-
-	diff, err := git.GetGitDiff(ctx)
-	if err != nil {
-		log.Fatal().Err(err).Msg("Failed to get Git diff")
-		return
-	}
-
-	diff = git.FilterLockFiles(diff, cfg.LockFiles)
-	if strings.TrimSpace(diff) == "" {
-		fmt.Println("No staged changes after filtering lock files.")
-		return
-	}
-
-	promptText := prompt.BuildCommitPrompt(diff, languageFlag, commitTypeFlag, "", cfg.PromptTemplate)
-	commitMsg, genErr := generateCommitMessage(ctx, aiClient, promptText, commitTypeFlag, templateFlag, cfg.EnableEmoji)
-	if genErr != nil {
-		log.Error().Err(genErr).Msg("Commit message generation error")
-		os.Exit(1)
-	}
-
-	var styleReviewSuggestions string
-	if reviewMessageFlag {
-		suggestions, errReview := enforceCommitMessageStyle(ctx, aiClient, commitMsg, languageFlag, cfg.PromptTemplate)
-		if errReview != nil {
-			log.Error().Err(errReview).Msg("Commit message style enforcement failed")
-			os.Exit(1)
-		}
-		styleReviewSuggestions = suggestions
-	}
-
-	if forceFlag {
-		if reviewMessageFlag && strings.TrimSpace(styleReviewSuggestions) != "" &&
-			!strings.Contains(strings.ToLower(styleReviewSuggestions), "no issues found") {
-			fmt.Println("\nAI Commit Message Style Review Suggestions:")
-			fmt.Println(styleReviewSuggestions)
-		}
-		if strings.TrimSpace(commitMsg) == "" {
-			log.Fatal().Msg("Generated commit message is empty; aborting commit.")
-		}
-		if err := git.CommitChanges(ctx, commitMsg); err != nil {
-			log.Fatal().Err(err).Msg("Commit failed")
-		}
-		fmt.Println("Commit created successfully (forced).")
-		if semanticReleaseFlag {
-			if err := versioner.PerformSemanticRelease(ctx, aiClient, commitMsg, manualSemverFlag); err != nil {
-				log.Fatal().Err(err).Msg("Semantic release failed")
-			}
-		}
-		return
-	}
-
-	runInteractiveUI(ctx, commitMsg, diff, promptText, styleReviewSuggestions, cfg.EnableEmoji, aiClient)
-}
-
 func runAICodeReview(cmd *cobra.Command, args []string) {
 	ctx, cancel, cfg, aiClient, err := setupAIEnvironment()
 	if err != nil {
@@ -346,7 +305,7 @@ func runAICodeReview(cmd *cobra.Command, args []string) {
 	}
 	defer cancel()
 
-	diff, err := git.GetGitDiff(ctx)
+	diff, err := git.GetGitDiffIgnoringMoves(ctx)
 	if err != nil {
 		log.Fatal().Err(err).Msg("Git diff error")
 		return