Skip to content

feat(skills): add worktree-agent skill with router and template integration (ADR-126)#197

Merged
notque merged 1 commit intomainfrom
feat/adr-126-final
Mar 28, 2026
Merged

feat(skills): add worktree-agent skill with router and template integration (ADR-126)#197
notque merged 1 commit intomainfrom
feat/adr-126-final

Conversation

@notque
Copy link
Copy Markdown
Owner

@notque notque commented Mar 28, 2026

Summary

New skill encoding 7 mandatory rules for worktree-isolated agents, plus integration into the /do router and ADR template.

New skill: skills/worktree-agent/SKILL.md — 7 rules preventing worktree isolation failures
Router update: skills/do/SKILL.md — Phase 4 now references worktree-agent rules for worktree dispatch
Template update: pipelines/toolkit-improvement/references/adr-template.md — Worktree execution section references the skill

Rules encoded:

  1. Verify CWD contains .claude/worktrees/
  2. Create feature branch before edits
  3. Use worktree-relative paths
  4. Ignore auto-plan hooks
  5. Stage specific files only
  6. Don't touch main worktree
  7. Conventional commit format

Failure modes prevented:

  • Leaked changes to main worktree
  • Auto-plan hook consuming implementation budget
  • Commits on wrong branches
  • Cross-contamination between parallel agents
  • Branch locked by worktree errors

Test Plan

  • Skill file created with proper frontmatter
  • INDEX files regenerated
  • /do router references worktree-agent in Phase 4
  • ADR template references worktree-agent in execution section

…ration (ADR-126)

New skill encoding 7 mandatory rules for worktree-isolated agents:
verify CWD, create branch first, use relative paths, ignore auto-plan,
stage specific files only, don't touch main worktree, conventional commits.

Integrated into /do router (Phase 4 worktree dispatch guidance) and
ADR template (worktree execution section references the skill).

Prevents 5 failure modes observed during parallel ADR implementation:
leaked changes to main, auto-plan hook confusion, branch collisions,
cross-contamination between agents, and worktree cleanup timing.
@notque notque merged commit d083685 into main Mar 28, 2026
2 of 4 checks passed
@notque notque deleted the feat/adr-126-final branch March 28, 2026 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant