git-pr

name	git-pr
version	1.2.1
description	Git branch management and GitHub PR workflow using worktrees
dependencies	{"skills":[]}

Git PR Skill

Repository Setup

All repos are cached at ~/.swat/repos/. First time clones, subsequent operations reuse.

REPO_NAME="<repo-name>"  # e.g. swat
REPO_URL="<repo-url>"    # e.g. https://github.com/LangSensei/swat
REPO_DIR="$HOME/.swat/repos/$REPO_NAME"

# First time: clone. Subsequent: fetch.
if [ -d "$REPO_DIR" ]; then
  cd "$REPO_DIR" && git fetch --all --prune
else
  git clone --bare "$REPO_URL" "$REPO_DIR"
  cd "$REPO_DIR"
  git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
fi

Worktree Workflow

Each operation gets its own worktree — isolated branch, shared .git objects, millisecond creation.

Mode A: New Branch (default)

Use when starting a fresh PR from the default branch.

BRANCH="swat/{operation-id}"
WORK_DIR="$(pwd)"  # operation dir

cd "$REPO_DIR"
git worktree add -b "$BRANCH" "$WORK_DIR/repo" origin/main

cd "$WORK_DIR/repo"
# ... make changes ...

Mode B: Resume Existing Branch

Use when the brief specifies an existing branch (e.g. fixing review comments on an open PR).

EXISTING_BRANCH="<branch-from-brief>"  # e.g. feat/mcp-only-flag
WORK_DIR="$(pwd)"

cd "$REPO_DIR"
git fetch origin
git worktree add "$WORK_DIR/repo" "origin/$EXISTING_BRANCH"
cd "$WORK_DIR/repo"
git checkout -B "$EXISTING_BRANCH" "origin/$EXISTING_BRANCH"

# ... make changes, commit, push ...

How to decide: If the operation brief contains a branch name or PR reference with an existing branch, use Mode B. Otherwise use Mode A.

Mode C: Read-Only

Use when only reading repo code — no changes, no commits, no PR.

WORK_DIR="$(pwd)"

cd "$REPO_DIR"
git worktree add "$WORK_DIR/repo" origin/main --detach

cd "$WORK_DIR/repo"
# ... read files, grep, explore ...
# Do NOT commit or push.

# Cleanup at seal:
cd "$REPO_DIR"
git worktree remove "$WORK_DIR/repo" --force

How to decide: If the operation only needs to read source code for analysis (no writes, no PR), use Mode C.

Worktree Cleanup

Mandatory at seal time. After push (Mode A/B) or after reading (Mode C), clean up. Squads using this skill must clean up in their playbook's seal/delivery phase.

cd "$REPO_DIR"
git worktree remove "$WORK_DIR/repo" --force

Commit & Push

git add -A
git commit -m "feat: description"
git push origin HEAD

Open PR

gh pr create --title "feat: ..." --body "..." --base main

Conventional Commits

Format: <type>: <description>

Types:

• feat: — New feature
• fix: — Bug fix
• refactor: — Code restructuring
• docs: — Documentation only
• test: — Tests
• chore: — Maintenance

PR Description Template

## What
Brief description of the change.

## Why
Context and motivation.

## Changes
- file1: description
- file2: description

## How to Test
Steps to verify.

Rules

• Never push directly to the default branch — always open a PR
• One logical change per commit
• PR title follows conventional commits
• Always clone/fetch to ~/.swat/repos/ — never clone into operation dir directly
• Always clean up worktree at seal — do not leave orphaned worktrees