create-branch

name	create-branch
description	Create a new branch off the default base (not the current HEAD, so unrelated commits stay behind) and move all uncommitted changes onto it. Use when you started work on the wrong branch or on main.

Context

Current branch: !git branch --show-current

Default base: !git symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null | sed 's|^origin/||' || echo main

Commits ahead of default base on current branch: !git log $(git symbolic-ref --short refs/remotes/origin/HEAD 2>/dev/null | sed 's|^origin/||' || echo main)..HEAD --oneline 2>/dev/null || echo "(none or base not found)"

Uncommitted changes: !git status --short

Potentially relevant ignored files: !git ls-files --others --ignored --exclude-standard 2>/dev/null | head -20 || echo "(none)"

Instructions

Base selection

Default: branch off the default base (e.g. main), NOT the current HEAD.

• If --base <branch> is provided, use it.
• If --keep-base is provided, branch off current HEAD.
• Otherwise, if there are commits ahead of the default base AND those commits look unrelated to the uncommitted diff (different scope/files), branch off the default base.
• If commits ahead look related to the same work (e.g. same files, same feat scope), branch off current HEAD.

When in doubt and the set is small, err on branching off the default base.

Process

1. If there are no uncommitted changes AND no ignored candidates, abort with a message. (If no branch name is provided via $ARGUMENTS, infer one from the uncommitted changes using conventional branch naming: feat/, fix/, chore/, refactor/.)
2. If branching off the default base (not current HEAD):
   • git stash push -u -m "create-branch-skill-transfer" to capture both tracked + untracked
   • git checkout <base> then git checkout -b <branch-name>
   • git stash pop
   • If pop conflicts on files the user did not author, that signals a bad base pick; abort and ask
3. Otherwise (branching off current HEAD): git checkout -b <branch-name>.
4. Stage ALL uncommitted changes with git add -A. NEVER revert, discard, filter, or skip any file.
5. Check for gitignored files that look like they belong to the work (e.g. drizzle migration SQL/snapshot when drizzle/ is in .gitignore): if found, force-add with git add -f <file> AND flag to the user that the .gitignore rule may need fixing.
6. Show git status --short and confirm the branch was created. If files might be unrelated noise, flag them to the user; do NOT revert.
7. Show git log <base>..HEAD --oneline: on the default-base path it should be empty (no stray commits); on the --keep-base / branch-off-HEAD path, confirm only the intended related commits are ahead.

Rules

• Stage only, never commit; kebab-case branch names only (feat/discord-bot, not feat/Discord Bot).
• If the branch already exists, abort with a message; do NOT overwrite. NEVER modify or delete any other branch.
• Destructive ops (git checkout HEAD -- <file>, git restore, git clean) are forbidden unless the user explicitly asks.
• NEVER touch .gitignore unless asked; flag the issue instead.