Agent Skill
2/7/2026

git-worktree-rules

This skill should be used when the user mentions "worktree", "worktrees", "create worktree", or asks about working in a separate branch directory.

S
sttts
1GitHub Stars
1Views
npx skills add sttts/skills

SKILL.md

Namegit-worktree-rules
DescriptionThis skill should be used when the user mentions "worktree", "worktrees", "create worktree", or asks about working in a separate branch directory.

Skills for Claude Code

Claude Code skills for local issue tracking with beads, git worktree management, and prompt recording.

Installation

# Add the marketplace
/plugin marketplace add https://github.com/sttts/skills.git

# Install plugins
/plugin install sttts-beads
/plugin install sttts-worktree
/plugin install sttts-prompt-recording

Plugins

sttts-beads

Local issue tracking workflow integration using the beads CLI.

Triggers on: bd, beads, what's next, add task, add epic, or issue tracking questions

Requires: .beads directory in project root (run bd init to create)

Features

  • Session priming - Run bd prime at session start for AI-optimized context
  • Task discovery - Ask "What's next?" to see in-progress and ready tasks
  • Issue creation - Create tasks and epics with structured IDs
  • State management - Track task status and link to PRs/MRs
  • Session completion - Structured workflow for landing work safely

Issue ID Convention

Use the pattern <prefix>-<epic>-<task>:

  • prefix: domain area (e.g., infra, api, ui)
  • epic: one or two keywords for the epic
  • task: one keyword for the specific task
# Create a task
bd create "Allow blueprints to run in plan only mode" --id infra-blueprint-planonly --type task

# Create an epic
bd create "Expose Terraform errors to conditions" --id infra-tferrors --type epic

# Create a task under an epic
bd create "Phase 1: Enable log subresource" --id infra-tferrors-logsub --type task --parent infra-tferrors

Session Completion Workflow

When ending a session, the skill ensures:

  1. File issues for remaining work
  2. Run quality gates (tests, linters, builds)
  3. Update issue status
  4. Push to remote (mandatory - work is not complete until pushed)
  5. Label tasks with PR/MR URLs
  6. Add handoff comments for the next agent

sttts-worktree

Git worktree management with three skills:

/sttts-worktree:worktree (auto-triggered)

Git worktree commands and usage reference.

Triggers on: worktree, worktrees, create worktree, git worktree

/sttts-worktree:worktree-workflow (explicit only)

Opinionated workflow using .git/checkouts/ convention. Must be loaded explicitly.

  • Create worktrees inside .git/checkouts/
  • Stay in the worktree - don't cd back to main
  • Never touch main when working in a worktree
  • Never delete before confirming merge

Enable per-repo:

git config --local claude.worktrees true

/sttts-worktree:prune-worktrees (auto-triggered)

Clean up worktrees whose branches have been merged. Works with both GitLab (glab) and GitHub (gh).

Triggers on: prune worktrees, cleanup worktrees, remove merged worktrees

  • Detects GitLab or GitHub from remote URL
  • Checks each worktree branch for merged MR/PR
  • Shows dirty/merged/unmerged status
  • Asks for confirmation before removing

sttts-prompt-recording

Record cleaned-up prompts attached to commits (via git notes) and MR/PR descriptions.

Triggers on: record prompt, prompt recording, log prompts

Features

  • Git notes (refs/notes/prompts) - Per-commit prompt history in structured JSON
  • MR/PR description - High-level "Prompt Documentation" section summarizing the whole conversation
  • Sticky opt-in - Enable per-repo with git config --local claude.promptRecording true
  • Dual platform - Works with both GitLab (glab) and GitHub (gh)

Prompt Philosophy

  • Record what the user actually asked for, not what the agent decided
  • Write prompts as actionable instructions that could reproduce the result
  • Capture architecture constraints and rejections - these explain WHY
  • Add context lines after each prompt explaining what it changed

Enable per-repo

git config --local claude.promptRecording true

Usage Examples

# Start a session
bd prime

# Check what to work on
What's next?

# Create a new task
Add task: Implement user authentication

# Create a worktree for an epic
Create a worktree for the auth-refactor epic

# Clean up merged worktrees
/prune-worktrees

# Enable prompt recording
/prompt-recording

# End a session
Land the plane

Requirements

  • beads CLI installed and configured (for sttts-beads)
  • glab or gh CLI installed (for sttts-worktree prune)
  • Git repository

License

MIT

Skills Info
Original Name:git-worktree-rulesAuthor:sttts