Add comprehensive error handling, validation, and interactive enhancements

- Implement standardized Result<T> error handling patterns across all commands
- Add comprehensive input validation with security focus (shell injection prevention)
- Enhance interactive mode with fuzzy search capabilities using dialoguer and skim
- Add safety features for destructive operations with confirmation dialogs
- Implement output buffering for better performance
- Add optimized git command operations to reduce git calls
- Fix all test failures with proper non-interactive mode support
- Add backup and checkpoint functionality for destructive operations
- Strengthen validation for commit hashes, branch names, and file paths

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: simeg

.claude/settings.local.json

@@ -26,7 +26,9 @@
       "Bash(git x bisect reset)",
       "Bash(git x bisect:*)",
       "Bash(git-x:*)",
-      "Bash(git log:*)"
+      "Bash(git log:*)",
+      "Bash(git checkout:*)",
+      "Bash(GIT_X_NON_INTERACTIVE=1 cargo test test_clean_branches_run_function_actual_delete)"
     ],
     "deny": []
   }

Cargo.lock

@@ -25,7 +25,9 @@ path = "src/main.rs"
 clap = { version = "4.5", features = ["derive"] }
 console = "0.16"
 chrono = "0.4"
-dialoguer = "0.11"
+dialoguer = { version = "0.11", features = ["fuzzy-select"] }
+fuzzy-matcher = "0.3"
+atty = "0.2"
 
 [dev-dependencies]
 assert_cmd = "2.0"

Cargo.toml

@@ -1,3 +1,4 @@
+use crate::common::Safety;
 use crate::{GitXError, Result};
 use std::process::Command;
 
@@ -9,14 +10,22 @@ pub fn run(dry_run: bool) {
 }
 
 fn run_clean_branches(dry_run: bool) -> Result<String> {
+    // Safety check: ensure working directory is clean
+    if !dry_run {
+        Safety::ensure_clean_working_directory()?;
+    }
+
     let output = Command::new("git")
         .args(get_git_branch_args())
         .output()
-        .map_err(|e| GitXError::Io(e))?;
+        .map_err(GitXError::Io)?;
 
     if !output.status.success() {
         let stderr = String::from_utf8_lossy(&output.stderr);
-        return Err(GitXError::GitCommand(format!("Failed to list merged branches: {}", stderr.trim())));
+        return Err(GitXError::GitCommand(format!(
+            "Failed to list merged branches: {}",
+            stderr.trim()
+        )));
     }
 
     let stdout = String::from_utf8_lossy(&output.stdout);
@@ -26,6 +35,19 @@ fn run_clean_branches(dry_run: bool) -> Result<String> {
         .filter(|branch| !is_protected_branch(branch))
         .collect();
 
+    // Safety confirmation for destructive operation
+    if !dry_run && !branches.is_empty() {
+        let details = format!(
+            "This will delete {} merged branches: {}",
+            branches.len(),
+            branches.join(", ")
+        );
+
+        if !Safety::confirm_destructive_operation("Clean merged branches", &details)? {
+            return Ok("Operation cancelled by user.".to_string());
+        }
+    }
+
     let mut deleted = Vec::new();
     let mut result = String::new();
 
@@ -39,7 +61,7 @@ fn run_clean_branches(dry_run: bool) -> Result<String> {
             let status = Command::new("git")
                 .args(delete_args)
                 .status()
-                .map_err(|e| GitXError::Io(e))?;
+                .map_err(GitXError::Io)?;
 
             if status.success() {
                 deleted.push(branch);
@@ -48,7 +70,7 @@ fn run_clean_branches(dry_run: bool) -> Result<String> {
     }
 
     if deleted.is_empty() {
-        result.push_str(&format_no_branches_message());
+        result.push_str(format_no_branches_message());
     } else {
         result.push_str(&format_deletion_summary(deleted.len(), dry_run));
         result.push('\n');

src/clean_branches.rs

@@ -12,13 +12,16 @@ fn run_color_graph() -> Result<String> {
     let output = Command::new("git")
         .args(get_color_git_log_args())
         .output()
-        .map_err(|e| GitXError::Io(e))?;
+        .map_err(GitXError::Io)?;
 
     if output.status.success() {
         Ok(String::from_utf8_lossy(&output.stdout).to_string())
     } else {
         let stderr = String::from_utf8_lossy(&output.stderr);
-        Err(GitXError::GitCommand(format!("git log failed: {}", stderr.trim())))
+        Err(GitXError::GitCommand(format!(
+            "git log failed: {}",
+            stderr.trim()
+        )))
     }
 }