Current branch: !git branch --show-current Default branch: !git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@' Uncommitted changes: !git status --short Worktrees: !git worktree list

Steps:

Capture context - record the current branch name as FEATURE_BRANCH and the default branch (usually main) as BASE_BRANCH. Refuse to continue if they are equal.
Verify merge - run gh pr view --json state,mergedAt,headRefName for the current branch. Abort if state != MERGED. Do not delete unmerged work.
Check working tree - if uncommitted changes exist, stop and ask the user before any destructive step.
Detect worktree - run git worktree list --porcelain. If $FEATURE_BRANCH is checked out in a worktree other than the main repo path, record it as FEATURE_WORKTREE. If the current session is inside $FEATURE_WORKTREE, ask the user to switch to the main repo path first; do not proceed.
Switch and update - git checkout $BASE_BRANCH && git pull --ff-only origin $BASE_BRANCH (run from main repo path, not from $FEATURE_WORKTREE).
Remove worktree - if $FEATURE_WORKTREE exists: git worktree remove $FEATURE_WORKTREE. If it refuses due to untracked/modified files inside, list them and ask the user before retrying with --force.
Delete local branch - git branch -d $FEATURE_BRANCH. If git refuses (not fully merged into base via fast-forward, e.g. squash merge), confirm the PR was merged via step 2 then use git branch -D $FEATURE_BRANCH.
Delete remote branch - first check whether the remote branch still exists with git ls-remote --exit-code --heads origin $FEATURE_BRANCH. If it exists, ask the user for explicit confirmation before running git push origin --delete $FEATURE_BRANCH. Skip silently if the remote branch was already deleted by GitHub auto-delete.
Prune stale refs - git fetch --prune && git worktree prune.
Report - confirm: worktree removed (if applicable), branch deleted locally and remotely, and on $BASE_BRANCH at latest commit.

Rules:

Never run destructive deletes without confirming PR merge state via gh.
Use gh CLI for all GitHub operations.
Stop and ask the user if any step fails unexpectedly.

Más de este repositorio

mismo repositorio

audit

bertini36/dotfiles

Run full production audit on the current project

2026-07-092

create-pull-request

bertini36/dotfiles

Create a GitHub pull request following project conventions. Use whenever a pull request is about to be created, whether the user asked directly or another skill or workflow (e.g. superpowers finishing-a-development-branch) reached its PR step. Always takes precedence over inline gh pr create instructions in other skills. Handles commit analysis, branch management, the repo's PULL_REQUEST_TEMPLATE, and PR creation using the gh CLI tool.

2026-07-092

ddd-patterns

bertini36/dotfiles

DDD patterns - Entities, Aggregate Roots, value objects, Repositories, Domain Services, Domain Events, Specifications. Use when designing domain layer, creating entities, repositories, or domain services.

2026-07-092

django-patterns

bertini36/dotfiles

Django architecture patterns, REST API design with Pydantic for validation and serialization, ORM best practices, caching, signals, middleware, and production-grade Django apps.

2026-07-092

fix-until-green

bertini36/dotfiles

Loop project checks and pre-commit, dispatching a fixer subagent per failure, until everything passes or 5 iterations. Use in the Verify stage or standalone when checks fail.

2026-07-092

grill-me

bertini36/dotfiles

Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree. Use when user wants to stress-test a plan, get grilled on their design, mentions "grill me", or right after superpowers:writing-plans produces an implementation plan.

2026-07-092

name	end-feature
description	Finalize a merged PR by switching to main, pulling, and removing the merged feature branch locally and remotely

Finalize work after a feature PR has been merged.

Steps:

Capture context - record the current branch name as FEATURE_BRANCH and the default branch (usually main) as BASE_BRANCH. Refuse to continue if they are equal.
Verify merge - run gh pr view --json state,mergedAt,headRefName for the current branch. Abort if state != MERGED. Do not delete unmerged work.
Check working tree - if uncommitted changes exist, stop and ask the user before any destructive step.
Detect worktree - run git worktree list --porcelain. If $FEATURE_BRANCH is checked out in a worktree other than the main repo path, record it as FEATURE_WORKTREE. If the current session is inside $FEATURE_WORKTREE, ask the user to switch to the main repo path first; do not proceed.
Switch and update - git checkout $BASE_BRANCH && git pull --ff-only origin $BASE_BRANCH (run from main repo path, not from $FEATURE_WORKTREE).
Remove worktree - if $FEATURE_WORKTREE exists: git worktree remove $FEATURE_WORKTREE. If it refuses due to untracked/modified files inside, list them and ask the user before retrying with --force.
Delete local branch - git branch -d $FEATURE_BRANCH. If git refuses (not fully merged into base via fast-forward, e.g. squash merge), confirm the PR was merged via step 2 then use git branch -D $FEATURE_BRANCH.
Delete remote branch - first check whether the remote branch still exists with git ls-remote --exit-code --heads origin $FEATURE_BRANCH. If it exists, ask the user for explicit confirmation before running git push origin --delete $FEATURE_BRANCH. Skip silently if the remote branch was already deleted by GitHub auto-delete.
Prune stale refs - git fetch --prune && git worktree prune.
Report - confirm: worktree removed (if applicable), branch deleted locally and remotely, and on $BASE_BRANCH at latest commit.

Rules:

Never run destructive deletes without confirming PR merge state via gh.
Use gh CLI for all GitHub operations.
Stop and ask the user if any step fails unexpectedly.