Agent skill
workflow-finish
Cleanup branch after PR is merged. Use when user says /workflow finish or /workflow-finish.
Install this agent skill to your Project
npx add-skill https://github.com/majiayu000/claude-skill-registry/tree/main/skills/other/other/workflow-finish
SKILL.md
CI E2E Runner Workflow Finish
Purpose
Cleanup git branches after a PR is merged. Removes local branch, remote branch, and workflow context files.
Quick Reference
- Deletes: Local branch, remote branch, workflow context
- Requires: Branch name or current branch
- Safe: Verifies PR is merged before deleting
Usage
/workflow-finish # Current branch
/workflow-finish feat/add-retry-logic # Specify branch name
Procedure
Step 1: Resolve Target Branch
| Input | Resolution |
|---|---|
| No argument | Use current branch (git branch --show-current) |
| Branch name | Use directly |
Step 2: Verify PR is Merged
gh pr list --head <branch-name> --state all --json number,state,mergedAt
| State | Action |
|---|---|
MERGED |
Proceed to cleanup |
OPEN |
Warn: "PR not merged. Force finish anyway?" |
CLOSED |
Warn: "PR closed without merge. Force finish anyway?" |
| Not found | Warn: "No PR found. Force finish anyway?" |
Step 3: Switch to Main (if on target branch)
CURRENT=$(git branch --show-current)
if [ "$CURRENT" = "<target-branch>" ]; then
git checkout main
git pull origin main
fi
Step 4: Cleanup
# Delete remote branch
git push origin --delete <branch-name> 2>/dev/null || echo "Remote branch already deleted"
# Delete local branch
git branch -D <branch-name> 2>/dev/null || echo "Local branch already deleted"
# Remove workflow context directory
rm -rf .claude/workflow/<branch-name>/ 2>/dev/null || true
Step 5: Report
Workflow finished for `<branch-name>`
| Item | Status |
|------|--------|
| PR #<number> | Merged |
| Remote branch | Deleted / Already deleted |
| Local branch | Deleted |
| Workflow context | Cleaned |
Safety Rules
- Always verify PR is merged before deleting branches
- Never force-finish without user confirmation if PR is not merged
- Switch to main first if currently on the branch being deleted
- Ignore errors for already-deleted resources (idempotent)
Examples
Finish current branch
/workflow-finish
Uses current branch name.
Finish by branch name
/workflow-finish feat/add-retry-logic-to-e2e-pipeline
Automation
See skill.yaml for patterns.
See sharp-edges.yaml for common pitfalls.
Recommended Agent Skills
Expand your agent's capabilities with these related and highly-rated skills.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
majiayu000/claude-skill-registry
agent-ops-spec
Manage specification documents in .agent/specs/. Use when user provides requirements, acceptance criteria, or feature descriptions that need to be tracked and validated against implementation.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-testing
Test strategy, execution, and coverage analysis. Use when designing tests, running test suites, or analyzing test results beyond baseline checks.
majiayu000/claude-skill-registry
agent-ops-state
Maintain .agent state files. Use at session start, after meaningful steps, and before concluding: read/update constitution/memory/focus/issues/baseline consistently.
Didn't find tool you were looking for?