Skip to content

SKILL.md

Latest commit

 

History

History
244 lines (171 loc) · 6.27 KB

SKILL.md

File metadata and controls

244 lines (171 loc) · 6.27 KB
name using-git-worktrees
description TRIGGER: 开始隔离性的 feature 开发、refactor、brownfield 大改之前；或 TriaDev 执行 plan 前需要分支隔离。创建 git worktree 并做 gitignore 校验 + baseline test 验证。 Adapted from obra/superpowers `using-git-worktrees` skill for TriaDev workflow.
version 1.0
triggers
create worktree
isolated workspace
refactor in isolation
branch isolation
git worktree
开分支
隔离工作区
新分支做

Using Git Worktrees

Adapted from obra/superpowers skills/using-git-worktrees/, simplified for TriaDev (no OpenClaw-specific global path).

Overview

Git worktrees create isolated workspaces sharing the same repository, allowing work on multiple branches simultaneously without switching.

Core principle: Systematic directory selection + safety verification = reliable isolation.

Announce at start: "I'm using the using-git-worktrees skill to set up an isolated workspace."

When To Use

Use when:

  • Brownfield refactor that touches many files (risk of polluting main branch)
  • TriaDev Extended path execution on a change that should be reviewable as a unit
  • Experimental change you want to discard cleanly if it doesn't pan out
  • Working on 2+ branches concurrently without constant git checkout overhead

Skip when:

  • Single-file / small change (worktree overhead exceeds benefit)
  • Doc-only edits
  • The project's workflow doesn't use feature branches

Directory Selection Process

Follow this priority order:

1. Check Existing Directories

ls -d .worktrees 2>/dev/null     # Preferred (hidden)
ls -d worktrees 2>/dev/null      # Alternative

If found: Use that directory. If both exist, .worktrees wins.

2. Check CLAUDE.md

grep -i "worktree.*director" CLAUDE.md 2>/dev/null

If preference specified: Use it without asking.

3. Ask User

If no directory exists and no CLAUDE.md preference:

No worktree directory found. Where should I create worktrees?

1. .worktrees/ (project-local, hidden, requires .gitignore entry)
2. <custom-path>/ (user-provided)

Which would you prefer?

Safety Verification

For Project-Local Directories (.worktrees or worktrees)

MUST verify directory is ignored before creating worktree:

# Check if directory is ignored (respects local, global, and system gitignore)
git check-ignore -q .worktrees 2>/dev/null || git check-ignore -q worktrees 2>/dev/null

If NOT ignored:

  1. Add appropriate line to .gitignore
  2. Commit the change
  3. Proceed with worktree creation

Why critical: Prevents accidentally committing worktree contents to repository.

Creation Steps

1. Detect Project Name

project=$(basename "$(git rev-parse --show-toplevel)")

2. Create Worktree

# Using project-local directory:
path=".worktrees/$BRANCH_NAME"
git worktree add "$path" -b "$BRANCH_NAME"
cd "$path"

3. Run Project Setup

Auto-detect and run appropriate setup:

# Node.js
if [ -f package.json ]; then npm install; fi

# Rust
if [ -f Cargo.toml ]; then cargo build; fi

# Python
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
if [ -f pyproject.toml ]; then poetry install; fi

# Go
if [ -f go.mod ]; then go mod download; fi

4. Verify Clean Baseline

Run tests to ensure worktree starts clean:

# Use project-appropriate command
npm test
cargo test
pytest
go test ./...

If tests fail: Report failures, ask whether to proceed or investigate.

If tests pass: Report ready.

5. Report Location

Worktree ready at <full-path>
Tests passing (<N> tests, 0 failures)
Ready to implement <feature-name>

Quick Reference

Situation Action
.worktrees/ exists Use it (verify ignored)
worktrees/ exists Use it (verify ignored)
Both exist Use .worktrees/
Neither exists Check CLAUDE.md → Ask user
Directory not ignored Add to .gitignore + commit
Tests fail during baseline Report failures + ask
No package.json / Cargo.toml / etc. Skip dependency install

Common Mistakes

Skipping ignore verification

  • Problem: Worktree contents get tracked, pollute git status
  • Fix: Always use git check-ignore before creating project-local worktree

Assuming directory location

  • Problem: Creates inconsistency, violates project conventions
  • Fix: Follow priority: existing > CLAUDE.md > ask

Proceeding with failing tests

  • Problem: Can't distinguish new bugs from pre-existing issues
  • Fix: Report failures, get explicit permission to proceed

Hardcoding setup commands

  • Problem: Breaks on projects using different tools
  • Fix: Auto-detect from project files (package.json, etc.)

Example Workflow

You: I'm using the using-git-worktrees skill to set up an isolated workspace.

[Check .worktrees/ - exists]
[Verify ignored - git check-ignore confirms .worktrees/ is ignored]
[Create worktree: git worktree add .worktrees/auth -b feature/auth]
[Run npm install]
[Run npm test - 47 passing]

Worktree ready at <project>/.worktrees/auth
Tests passing (47 tests, 0 failures)
Ready to implement auth feature

Red Flags

Never:

  • Create worktree without verifying it's ignored (project-local)
  • Skip baseline test verification
  • Proceed with failing tests without asking
  • Assume directory location when ambiguous
  • Skip CLAUDE.md check

Always:

  • Follow directory priority: existing > CLAUDE.md > ask
  • Verify directory is ignored for project-local
  • Auto-detect and run project setup
  • Verify clean test baseline

TriaDev Integration

Called by:

  • triadev Extended path — OPTIONAL pre-implementation step when the change is high-risk (brownfield refactor, breaking API change). Announced in triadev's Phase 4 start.
  • Any skill wanting isolated workspace

Pairs with:

  • verification-before-completion — REQUIRED before merging worktree back or deleting it (verify baseline still passes)

Cleanup

After work is complete and merged:

# Remove worktree
git worktree remove .worktrees/<branch-name>

# Or force-remove if dirty
git worktree remove --force .worktrees/<branch-name>

# List remaining worktrees
git worktree list