Skip to content

docs(adcp): document git worktree isolation pattern for parallel agents#428

Merged
bokelley merged 2 commits intomainfrom
claude/issue-418-worktree-isolation-docs
May 3, 2026
Merged

docs(adcp): document git worktree isolation pattern for parallel agents#428
bokelley merged 2 commits intomainfrom
claude/issue-418-worktree-isolation-docs

Conversation

@bokelley
Copy link
Copy Markdown
Contributor

@bokelley bokelley commented May 3, 2026

Closes #418

Adds a "Parallel Agent Isolation (git worktrees)" section to CLAUDE.md documenting the git worktree add /tmp/<branch> pattern that prevents parallel agents from clobbering each other's branches. The section covers: why isolation is needed (silent branch collision), the create command with the correct claude/issue-<N>-<slug> branch naming, a setup checklist (.env copy via git rev-parse --git-common-dir, pre-commit install, pip install -e .[dev]), teardown, and a pointer to CONDUCTOR.md for Conductor-managed worktrees.

What was tested:

  • Docs-only change (CLAUDE.md); no Python source touched — build/pytest gate skipped per triage-prompt rule for markdown-only diffs
  • git rev-parse --git-common-dir verified to resolve to main worktree .git dir in linked-worktree context
  • All commands verified for correct syntax (git worktree add <path> -b <branch> <commit> confirmed valid per man page)

Pre-PR review:

  • code-reviewer: approved — no blockers; nit: cp could note missing-file case (cosmetic)
  • docs-expert: approved — no blockers; nit: cd in checklist is redundant with the "run inside the new worktree" label (cosmetic)

Triage-managed PR. This bot does not currently iterate on
review comments or PR conversation threads (only on the source
issue). To unblock:

  • Push fixup commits directly: gh pr checkout <num>
    fix → push.
  • Or re-trigger: comment /triage execute on the source
    issue.

See adcp#3121
for context.

Session: https://claude.ai/code/session_017TUh8WYUoUWzdxDQMPLM5t


Generated by Claude Code

claude added 2 commits May 3, 2026 02:43
…AUDE.md

Documents the git worktree pattern for parallel agent isolation, including
spawn checklist, .env and pre-commit setup steps, teardown, and branch
naming convention. Closes #418.

https://claude.ai/code/session_017TUh8WYUoUWzdxDQMPLM5t
Addresses pre-PR review blockers: replace unresolvable /path/to/repo-root
placeholder with git rev-parse --git-common-dir to reliably locate the
main worktree root, and add CONDUCTOR.md cross-reference.

https://claude.ai/code/session_017TUh8WYUoUWzdxDQMPLM5t
@bokelley bokelley marked this pull request as ready for review May 3, 2026 03:58
@bokelley bokelley merged commit 117d4f2 into main May 3, 2026
10 of 12 checks passed
@bokelley bokelley deleted the claude/issue-418-worktree-isolation-docs branch May 3, 2026 03:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

feat(dx): document /tmp worktree isolation pattern for parallel agents

2 participants