cleanup-merged

Cleanup Merged — Post-Merge Worktree Reclaimer

Remove the local artifacts (worktree, local branch, remote branch, handoff file) that were created for a feature branch once its PR is merged or closed.

Announce at start: "Running cleanup-merged to reclaim worktrees and branches for merged PRs..."

---

Invocation

Argument pattern	Behavior
cleanup-merged <pr-number>	Clean up exactly one PR's handoff
cleanup-merged (no argument)	Scan .feature-flow/handoffs/*.yml, clean up every handoff whose PR is MERGED or CLOSED

---

Process

Step 1: Resolve handoff files to process

CWD to base repo first. Handoff files live at .feature-flow/handoffs/ relative to the base repo root. If this skill is invoked from inside a worktree (or any other subdirectory), relative paths in the subsequent discovery would silently miss the handoffs. Resolve the base repo root up front and cd there:

BASE_REPO=$(git rev-parse --show-toplevel 2>/dev/null || git rev-parse --git-common-dir 2>/dev/null | xargs dirname)
if [ -z "$BASE_REPO" ] || [ ! -d "$BASE_REPO/.feature-flow/handoffs" ]; then
  echo "cleanup-merged: no base repo or no .feature-flow/handoffs/ directory — nothing to clean up."
  exit 0
fi
cd "$BASE_REPO"

If a specific PR number was provided:

ls .feature-flow/handoffs/<pr-number>.yml 2>/dev/null

If the file does not exist, announce: cleanup-merged: no handoff found for PR #<pr-number> — nothing to clean up. Exit cleanly.

If no argument was provided (batch mode):

Use find (not ls) to avoid literal-pattern pitfalls under nullglob unset:

find .feature-flow/handoffs -maxdepth 1 -type f -name '*.yml' 2>/dev/null

If no files match, announce: cleanup-merged: no handoff files found — nothing to clean up. Exit cleanly (this is the expected no-op path when no sessions have completed).

Exclude .feature-flow/handoffs/.log from the list (it is not a handoff YAML file).