Add --remove / -r option to remove a specific worktree

Removes the worktree directory, safely deletes the local branch (-d),
and cleans up empty parent directories.

Author: ZeroErrors

src/git-wt/Commands.cs

@@ -206,6 +206,47 @@ public static int List()
         return 0;
     }
 
+    /// <summary>
+    /// Removes a specific worktree and its local branch.
+    /// </summary>
+    public static int Remove(string branchName)
+    {
+        if (!TryFindBareRepo(out var bareRepoPath, out var repoRoot))
+            return 1;
+
+        var (wtExit, wtOutput, _) = Git.Run(bareRepoPath, "worktree", "list", "--porcelain");
+        if (wtExit != 0)
+        {
+            Console.Error.WriteLine("Error: Failed to list worktrees.");
+            return 1;
+        }
+
+        var worktrees = Parsing.ParseWorktreeList(wtOutput);
+        var match = worktrees.FirstOrDefault(wt => !wt.IsBare && wt.Branch == branchName);
+        if (match is null)
+        {
+            Console.Error.WriteLine($"Error: No worktree found for branch '{branchName}'.");
+            return 1;
+        }
+
+        Console.WriteLine($"Removing worktree '{branchName}'...");
+        if (Git.RunLive(bareRepoPath, "worktree", "remove", match.Path) != 0)
+        {
+            Console.Error.WriteLine("Error: Failed to remove worktree. It may have dirty or untracked changes.");
+            Console.Error.WriteLine("Use 'git worktree remove --force' to remove it anyway.");
+            return 1;
+        }
+
+        var (delExit, _, _) = Git.Run(bareRepoPath, "branch", "-d", branchName);
+        if (delExit != 0)
+            Console.Error.WriteLine($"Warning: Could not delete branch '{branchName}'. Remove manually with: git branch -D {branchName}");
+
+        RemoveEmptyParentDirectories(match.Path, repoRoot);
+
+        Console.WriteLine($"Removed worktree and branch '{branchName}'.");
+        return 0;
+    }
+
     /// <summary>
     /// Removes worktrees whose upstream branch has been deleted (gone),
     /// then cleans up empty parent directories.

src/git-wt/Program.cs

@@ -16,6 +16,11 @@
     Description = "Remove worktrees whose upstream branch is gone and delete empty parent directories"
 };
 
+var removeOption = new Option<string>("--remove", "-r")
+{
+    Description = "Remove a worktree and its local branch"
+};
+
 var setupOption = new Option<string>("--setup", "-s")
 {
     Description = "Clone a repository into a bare worktree layout: <name>/.bare + default branch worktree"
@@ -26,6 +31,7 @@
     branchArg,
     listOption,
     pruneOption,
+    removeOption,
     setupOption
 };
 
@@ -41,6 +47,10 @@
     if (parseResult.GetValue(pruneOption))
         return Commands.Prune();
 
+    var removeBranch = parseResult.GetValue(removeOption);
+    if (!string.IsNullOrEmpty(removeBranch))
+        return Commands.Remove(removeBranch);
+
     var branchName = parseResult.GetValue(branchArg);
     if (string.IsNullOrEmpty(branchName))
     {