@torka/claude-workflows 0.7.0 → 0.7.1

package/commands/git-local-cleanup-push-pr.md

@@ -37,8 +37,12 @@ Before any operations, verify the environment is safe:
 
 8. **Build worktree inventory**: Run `git worktree list --porcelain` to detect all worktrees.
    - Parse the output to build a map: `{ branch_name -> worktree_path }`
-   - **For each worktree path, verify it exists on the filesystem**
-   - **If a path doesn't exist (stale entry), run `git worktree prune` to clean it up before continuing**
+   - **For each worktree path:**
+     a) Verify the directory exists on the filesystem
+     b) If it exists, verify git metadata is valid: `git -C <path> rev-parse --git-dir 2>/dev/null`
+     c) If directory exists but git command fails, this is a **stale worktree** (metadata broken but directory remains)
+   - **If any paths don't exist OR have invalid git metadata, run `git worktree prune` to clean up before continuing**
+   - After pruning, re-run `git worktree list --porcelain` to get the updated inventory
    - Identify which worktree is the main worktree vs linked worktrees
    - For each branch, record if it's checked out in a worktree and where
 
@@ -132,6 +136,8 @@ Store the WIP branches list for use in subsequent phases. Also maintain a separa
 
 ## Phase 3: Cleanup Merged Branches
 
+**Note on GitHub auto-delete:** Many repositories have "Automatically delete head branches" enabled in GitHub settings. When enabled, merged/squash-merged PR branches are automatically deleted from the remote. The workflow handles this gracefully - if remote deletion fails because the branch is already gone, it continues normally.
+
 For all branches identified as merged (via regular merge OR squash merge):
 
 ### Step 1: Categorize merged branches by worktree status
@@ -190,8 +196,14 @@ Options:
    - WARN: "Worktree at '<path>' has uncommitted changes that will be LOST"
    - Ask for explicit confirmation: "Proceed anyway?" / "Skip this worktree"
    - If skip, move to next branch
-3. Remove worktree: `git worktree remove <worktree-path>`
-4. If removal fails (locked, etc.), inform user and skip
+3. Remove worktree: `git worktree remove --force <worktree-path>`
+   - The `--force` flag is needed because worktrees often contain untracked build artifacts (.next, node_modules, coverage, etc.)
+   - This is safe here because we already: (a) confirmed the branch is merged/squash-merged, (b) warned about uncommitted changes if any
+4. If removal still fails (locked, etc.):
+   a) Run `git worktree prune` to clean up stale metadata
+   b) If directory still exists, inform user: "Leftover directory at '<path>' needs manual removal: `rm -rf '<path>'`"
+   c) **Do NOT attempt `rm -rf` directly** - this may be blocked by safety hooks in some environments
+   d) Continue with branch deletion if possible
 5. Proceed to delete branch (now safe)
 
 **If option 2 (Skip):**
@@ -207,7 +219,10 @@ Options:
 
 For each branch now eligible for deletion:
 - Delete local: `git branch -d <branch>` (use `-D` for squash-merged branches that git doesn't recognize as merged)
-- Delete remote (if exists): `git push <remote> --delete <branch>`
+- Delete remote (if tracking branch exists):
+  1. First check if remote branch exists: `git ls-remote --heads <remote> <branch>`
+  2. If output is empty, remote branch is already deleted (likely by GitHub auto-delete) - skip remote deletion
+  3. If remote branch exists: `git push <remote> --delete <branch>`
 
 ### Step 6: Clean up orphaned tracking branches
 
@@ -407,7 +422,7 @@ If the workflow fails at any point, display:
 
 ### Worktree Safety Rules
 - NEVER remove a worktree with uncommitted changes without explicit user confirmation
-- NEVER force remove a worktree (`git worktree remove --force`) - always handle uncommitted changes properly
+- `--force` flag for worktree removal IS allowed when: (a) branch is confirmed merged/squash-merged, AND (b) uncommitted changes have been checked and user warned if any exist. The `--force` is needed to handle untracked build artifacts (.next, node_modules, etc.)
 - ALWAYS check worktree status (`git -C <path> status --porcelain`) before attempting branch deletion
 - ALWAYS run `git worktree prune` after removing worktrees to clean up stale entries
 - NEVER attempt to remove the main worktree (git will error, but check anyway)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@torka/claude-workflows",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "Claude Code workflow helpers: epic automation, git cleanup, agents, and design workflows",
   "keywords": [
     "claude-code",