worktree 0.5.1

A powerful CLI tool for managing git worktrees with enhanced features including centralized storage, automatic config file synchronization, and intelligent branch management
Documentation 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90

use anyhow::Result;

use crate::git::GitRepo;
use crate::storage::WorktreeStorage;

/// Cleans up orphaned worktree references and directories
///
/// # Errors
/// Returns an error if git or storage access fails.
pub fn cleanup_worktrees() -> Result<()> {
    let current_dir = std::env::current_dir()?;
    let git_repo = GitRepo::open(&current_dir)?;
    let repo_path = git_repo.get_repo_path();

    let storage = WorktreeStorage::new()?;
    let repo_name = WorktreeStorage::get_repo_name(repo_path)?;

    println!("🔍 Analyzing worktree state...");

    let mut cleaned = Vec::new();

    // Clean up any git worktree references that point to non-existent directories
    match git_repo.list_worktrees_with_paths() {
        Ok(worktrees) => {
            for (name, path, is_prunable) in worktrees {
                if path == current_dir {
                    continue;
                }

                if is_prunable || !path.exists() {
                    println!(
                        "🗑ī¸  Found orphaned git worktree reference: {}",
                        path.display()
                    );
                    match git_repo.remove_worktree(&name) {
                        Ok(_) => {
                            println!("   ✓ Removed git worktree reference: {}", name);
                            cleaned.push(name);
                        }
                        Err(e) => println!(
                            "   ⚠ Warning: Could not remove git worktree reference {}: {}",
                            name, e
                        ),
                    }
                }
            }
        }
        Err(e) => {
            println!("   ⚠ Warning: Could not check git worktree list: {}", e);
        }
    }

    // Prune worktree directories for feature worktrees whose git reference no longer exists
    // (i.e., the dir exists but git doesn't know about that worktree anymore)
    if let Ok(repo_worktrees) = storage.list_repo_worktrees(&repo_name) {
        let git_worktree_paths: Vec<_> = git_repo
            .list_worktrees_with_paths()
            .unwrap_or_default()
            .into_iter()
            .map(|(_, path, _)| path)
            .collect();

        for feature_name in repo_worktrees {
            let path = storage.get_worktree_path(&repo_name, &feature_name);
            if path.exists() && !git_worktree_paths.contains(&path) {
                // Check if git even knows about this path
                // It may be a newly created worktree or an orphan
                // Only remove if we're confident it's orphaned (git prune would handle it)
                // For safety, just report it
                println!(
                    "ℹī¸  Worktree directory exists but may not be registered with git: {} ({})",
                    feature_name,
                    path.display()
                );
            }
        }
    }

    if cleaned.is_empty() {
        println!("✨ Everything looks clean! No orphaned worktree references found.");
    } else {
        println!("\n✅ Cleanup complete!");
        println!(
            "   Removed {} orphaned git worktree reference(s)",
            cleaned.len()
        );
    }

    Ok(())
}