finish-and-close

/finish-and-close - Complete Feature and Close Epic

Execute the landing strategy determined by the finishing skill. This command handles the actual merge/PR creation and cleanup.

Usage

/finish-and-close --epic {epic-id} --strategy {merge|pr}

Parameters

Parameter	Required	Description
--epic	Yes	The Beads epic ID (e.g., bd-a3f)
--strategy	Yes	Landing strategy: merge or pr

Prerequisites

This command should only be invoked by the finishing skill after verification:

• All tasks closed
• Tests passing
• Landing strategy determined

Execution Steps

Strategy: Merge

When --strategy merge:

Step 1: Ensure Clean State

# Check for uncommitted changes
git status --porcelain

# If changes exist, abort
# User should commit or stash first

Step 2: Update Base Branch

# Read config for base branch
base_branch=$(grep base_branch .threadwork.yaml | cut -d: -f2 | tr -d ' ')

# Fetch and update
git fetch origin
git checkout $base_branch
git pull origin $base_branch

Step 3: Merge Feature Branch

# Get current feature branch name
feature_branch=$(git rev-parse --abbrev-ref HEAD)

# Checkout base and merge
git checkout $base_branch
git merge --no-ff $feature_branch -m "Merge {feature_branch}: {epic title}

Closes epic {epic-id}

Tasks completed:
- {task-1-id}: {task-1-title}
- {task-2-id}: {task-2-title}
...
"

Step 4: Push to Remote

git push origin $base_branch

Step 5: Close Epic in Beads

bd --no-daemon close {epic-id} --reason "Merged to {base_branch}. {N} tasks completed."

Step 6: Cleanup

# Get worktree path
worktree_path=$(git worktree list | grep {feature_branch} | awk '{print $1}')

# Remove worktree (if exists and not current directory)
if [ -n "$worktree_path" ] && [ "$worktree_path" != "$(pwd)" ]; then
    git worktree remove "$worktree_path"
fi

# Delete feature branch
git branch -d {feature_branch}