GitPro

Git workflow automation using scripts for atomic, efficient operations.

Architecture

┌─────────────────────────────────────────┐
│ Claude Code PreToolUse hook (Skill)     │
│ - Validates TS, TODOs before gitpro     │
│ - Checkpoint operations skip validation │
└─────────────────────────────────────────┘
                    ↓
┌─────────────────────────────────────────┐
│ GitPro Skill (this file)                │
│ - AI analyzes changes                   │
│ - AI determines parameters              │
│ - AI calls script with parameters       │
└─────────────────────────────────────────┘
                    ↓
┌─────────────────────────────────────────┐
│ Bash Scripts (atomic execution)         │
│ - Handle beads sync                     │
│ - Use --no-verify (validation done)     │
│ - Single script = single operation      │
└─────────────────────────────────────────┘

Quick Start

Core Operations

Checkpoint

Fast timestamped commit without full analysis.

AI Steps:

1. •Determine if user provided a custom message prefix
2. •Call script

Script Call:

~/.claude/skills/gitpro/scripts/gitpro-checkpoint.sh [optional-message]

Examples:

• •User: "checkpoint" → gitpro-checkpoint.sh
• •User: "checkpoint with message Phase 1 complete" → gitpro-checkpoint.sh "Phase 1 complete"
• •AI completing work: → gitpro-checkpoint.sh "Refactored auth module"

Commit

Full conventional commit with changelog and optional branch rename.

AI Steps:

1. •Run git status to see what's changed
2. •Run git diff --staged --name-only (or git diff --name-only if nothing staged)
3. •Analyze changes to determine:
   • •Commit type: feat, fix, refactor, docs, chore, etc.
   • •Commit message: <emoji> <type>: <description>
   • •Branch rename: If current branch is wt-*, determine descriptive name
   • •Changelog entry: If changelog.md exists, write entry text
4. •Load ~/.claude/skills/gitpro/references/commit-types.md for emoji/type reference
5. •Call script with parameters

Script Call:

~/.claude/skills/gitpro/scripts/gitpro-commit.sh \
  --message "✨ feat: add user authentication" \
  --old-branch "wt-petehalsted" \
  --new-branch "add-user-auth" \
  --changelog "- **✨ Add User Authentication** - JWT-based auth with refresh tokens"

Parameters:

What Script Does:

• •Beads sync (pre-commit)
• •Stage all changes
• •Rename branch (if --old-branch/--new-branch provided)
• •Update changelog (if --changelog provided)
• •Commit with --no-verify
• •Beads sync (post-commit)
• •Push to remote (non-main branches)

Merge to Main

Full merge workflow with version bump and cleanup.

AI Steps:

1. •Check for uncommitted changes - if any, do Commit workflow first
2. •Get current branch name: git branch --show-current
3. •Analyze commits to determine version bump type:
   bash

   git log --oneline main..HEAD
   

   • •major: BREAKING CHANGE, ! after type
   • •minor: feat:, ✨
   • •patch: everything else
4. •Get username via whoami command
5. •Call script with parameters

Script Call:

~/.claude/skills/gitpro/scripts/gitpro-merge.sh \
  --source-branch "add-user-auth" \
  --bump-type "minor" \
  --username "petehalsted"

Parameters:

What Script Does:

• •Push source branch
• •Checkout main, pull
• •Merge source branch
• •Bump version, commit, tag
• •Push main and tags (single push!)
• •Delete merged source branch
• •Create fresh wt-{username} branch

Merge from Branch

Pull changes from another branch into current.

AI Steps (no script needed):

1. •git fetch origin
2. •git merge origin/{branch} or git merge {branch}
3. •If conflicts: report and exit
4. •If not main/master: ask user about deleting source branch

New Branch

Create new working branch.

AI Steps (no script needed):

1. •Check for uncommitted changes - offer to commit/checkpoint
2. •git checkout -b {name} (default: wt-$(whoami))
3. •git push -u origin {name}

Commit Types Reference

Validation

Validation happens in Claude Code PreToolUse hook BEFORE this skill runs:

• •TypeScript errors → blocks gitpro (except checkpoint)
• •Invalid TODOs → blocks gitpro (except checkpoint)
• •Toast usage → warning only

Scripts use --no-verify because validation already passed.

Scripts Location

All scripts in: ~/.claude/skills/gitpro/scripts/