Home / komluk / scaffolding · skills/worktree-management/SKILL.md · GitHub

worktree-management skillA

worktree-management is agent-read markdown (skill) from komluk/scaffolding: Scaffolding worktree lifecycle, diagnostics, and recovery. TRIGGER when: debugging worktree isolation, recovering a stuck worktree, or managing task isolation. SKIP: ordinary branch/commit/merge operations (use git-operations)..

Indexed from public GitHub and served as immutable, content-addressed versions. Install it pinned to an exact SHA-256 with the mdr CLI, and every file is verified against the hash recorded here before it reaches your agent. The deterministic audit below grades the latest version, and the same file always earns the same grade.

What the file says

# Worktree Management Skill

## Purpose
Scaffolding.tool-specific worktree lifecycle management, diagnostics, and recovery procedures.

Live worktrees:
!`git worktree list 2>/dev/null || true`

## CRITICAL: Only gitops Touches Git

Other agents (developer, architect) do NOT commit. The worktree flow is:
1. Agent writes code/tests in worktree
2. **gitops** commits, merges to main, pushes, cleans up

If a worktree has no new commits after an agent finishes, the changes are uncommitted — gitops must commit them BEFORE merge.

## Parallel Teammates: Isolation + Serialized Merge

When Agent Teams is enabled (`CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1`, see
`docs/agent-teams.md`), multiple writer teammates may run concurrently. The
worktree model makes this safe ONLY if both hold:

- **Per-teammate isolation:** every writer gets its OWN worktree
  `.scaffolding/worktrees/{task_id[:12]}` AND its OWN unique `SCAFFOLDING_TASK_ID`.
  No two writers share a working tree or a `/tmp/scaffolding-mtime-${TASK_ID}.json`
  staleness store — sharing would trip `file-staleness-check.sh` between them and
  produce unattributable interleaved changes.
…

Read the whole file at its exact version.

How to install

Latest version
mdr add komluk/scaffolding/worktree-management@git:20260627.c37d831
Exact content
mdr add komluk/scaffolding/worktree-management@sha256:fd298eb92866faac

Pin to a label to follow the author's releases, or to a sha256 to freeze the exact bytes forever. Either way the resolved hash is written to mdr.lock, and mdr install reproduces it on any machine.

Badge

mdr badge

[![mdr](https://markdownregistry.com/badge/art_y4ow4cmolan5ppvd.svg)](https://markdownregistry.com/a/art_y4ow4cmolan5ppvd)

1 badge views in 30 days

Versions

versioncommittedcommitsizeaudit
git:20260627.c37d831 latest2026-06-27 c37d831 3,464 BA view · diff
git:20260627.a92d1322026-06-27 a92d132 3,406 BA view · diff
git:20260520.3aa374b2026-05-20 3aa374b 2,526 BA view · diff
git:20260409.25dc3ca2026-04-09 25dc3ca 2,436 BA view

Audit of the latest version

A  17 of 17 checks passed. Deterministic, no model, same answer every run.
  • pass: Frontmatter block present
  • pass: Frontmatter declares a name
  • pass: Frontmatter declares a description
  • pass: Size between 200 bytes and 200 KB (3464 bytes)
  • pass: No zero-width or bidi control characters
  • pass: No instruction hidden inside an HTML comment
  • pass: No link to an exfiltration or paste host
  • pass: No credential-shaped string
  • pass: No instruction to send local credentials anywhere
  • pass: No text hidden with inline styles
  • pass: No prompt-injection phrasing
  • pass: No curl or wget piped into a shell
  • pass: No recursive delete of root, home or parent
  • pass: No instruction to read or print local credentials
  • pass: No base64 blob over 200 characters
  • pass: No link to a raw IP address
  • pass: No script tag

Source

GitHub

komluk/scaffolding · 15 stars · license MIT · pushed 2026-09-21 · branch main

API

GET https://markdownregistry.com/api/v1/artifacts/art_y4ow4cmolan5ppvd
GET https://markdownregistry.com/api/v1/resolve?ref=komluk/scaffolding/worktree-management
GET https://markdownregistry.com/api/v1/blob/fd298eb92866faac28b2dfb13896c11fedafa13878126ec713fd8271a1c8cec8

Your agent does the legwork. You hear about the deals worth your word. Hand yours the standing instructions at modelranch.com and it joins the network that reads files like this one.

More from komluk/scaffolding

CLAUDE.md claude
komluk/scaffolding · CLAUDE.md
git:20260705.06a321d · audit A · 15 stars
agent-comms skill
komluk/scaffolding · skills/agent-comms/SKILL.md · SendMessage recipient validation and worktreePath safety (CWE-59). TRIGGER when: validating a SendMessage `to:`…
git:20260705.958c030 · audit A · 15 stars
agent-memory skill
komluk/scaffolding · skills/agent-memory/SKILL.md · 3-tier markdown memory protocol (shared/agent/conversation) for cross-session knowledge. TRIGGER when: reading or…
git:20260606.ad5816e · audit A · 15 stars
api-design skill
komluk/scaffolding · skills/api-design/SKILL.md · RESTful API design standards: resource naming, HTTP methods, status codes, pagination, versioning. TRIGGER when…
git:20260520.3aa374b · audit A · 15 stars
context-engineering skill
komluk/scaffolding · skills/context-engineering/SKILL.md · Optimize Claude Code context-window usage for accuracy and cost. TRIGGER when: hitting context limits, structuring…
git:20260627.c37d831 · audit A · 15 stars
database-optimization skill
komluk/scaffolding · skills/database-optimization/SKILL.md · Schema design, index strategy, migration safety, and query analysis. TRIGGER when: designing tables or indexes, writing…
git:20260614.9d809af · audit A · 15 stars
distill skill
komluk/scaffolding · skills/distill/SKILL.md · Knowledge distillation methodology: candidate extraction, confidence scoring, tier routing, conversation-scoped mode…
git:20260702.49d89e4 · audit A · 15 stars
docker-templates skill
komluk/scaffolding · skills/docker-templates/SKILL.md · Docker multi-stage build templates, image security, and docker-compose patterns. TRIGGER when: writing a Dockerfile…
git:20260520.3aa374b · audit A · 15 stars
error-handling skill
komluk/scaffolding · skills/error-handling/SKILL.md · Consistent error handling across frontend and backend layers. TRIGGER when: implementing error boundaries, exception…
git:20260614.9d809af · audit A · 15 stars
git-operations skill
komluk/scaffolding · skills/git-operations/SKILL.md · Git command patterns, branching strategy, and safety protocols. TRIGGER when: managing branches, resolving merge…
git:20260627.c37d831 · audit A · 15 stars
github-actions-template skill
komluk/scaffolding · skills/github-actions-template/SKILL.md · GitHub Actions CI pipeline templates and workflow YAML patterns. TRIGGER when: creating or editing a CI workflow…
git:20260520.3aa374b · audit A · 15 stars
logging-standards skill
komluk/scaffolding · skills/logging-standards/SKILL.md · Structured logging standards: log levels, structured fields, correlation IDs, PII masking, and event naming. TRIGGER…
git:20260627.c37d831 · audit A · 15 stars

Every file in komluk/scaffolding

Browse by kind, by grade A, or by owner.