aiskillstore/orchestrating-parallel-agents
Spawns multiple AI coding agents to work on related GitHub issues concurrently using git worktrees. Use when breaking down a large feature into multiple issues, running parallel agents with --print flag, or managing wave-based execution of related tasks.
This is a copy. The original lives at comeonoliver/orchestrating-parallel-agents.
npx skills add https://github.com/aiskillstore/marketplace --skill orchestrating-parallel-agentsSpawn multiple Claude agents to work on related issues concurrently using git worktrees.
Copy and track progress:
Parallel Agent Orchestration:
- [ ] 1. Break feature into issues (1-3 files each)
- [ ] 2. Organize into waves (independent → dependent)
- [ ] 3. Pre-approve git permissions in settings.local.json
- [ ] 4. Spawn wave with --print flag
- [ ] 5. Monitor progress
- [ ] 6. Complete stragglers manually
- [ ] 7. Merge PRs (rebase between same-file conflicts)
- [ ] 8. Cleanup worktrees
Each issue should be completable in isolation:
## Problem
What's broken or missing.
## Solution
High-level approach.
## Files to Modify
- `path/to/file` - what changes
## Implementation
Code snippets or pseudocode.
## Acceptance Criteria
- [ ] Testable outcomes
Key: Include file paths and code examples. Agents work best with concrete starting points.
Wave 1: Independent changes (no shared files)
Wave 2: Changes that may touch same files (expect conflicts)
Wave 3: Integration/testing (depends on all above)
Rule: Same-file issues go in different waves OR same agent.
Add to .claude/settings.local.json for non-interactive --print mode:
"Bash(git -C /absolute/path/to/worktree add:*)",
"Bash(git -C /absolute/path/to/worktree commit:*)",
"Bash(git -C /absolute/path/to/worktree push:*)"
for issue in 101 102 103; do
(claude --print "/worktree-issue $issue" > "issue-${issue}.log" 2>&1) &
done
ps aux | grep "claude.*worktree" | wc -l # Running agents
git worktree list # Worktrees created
tail -f issue-*.log # Live logs
If agent finishes code but fails on git:
git -C <worktree> add -A
git -C <worktree> commit -m "feat: description"
git -C <worktree> push -u origin <branch>
gh pr create --head <branch> --title "..." --body "Closes #N"
gh pr merge N --squash --delete-branch
If conflicts after prior merges:
cd <worktree> && git fetch origin main && git rebase origin/main
# resolve conflicts
git push --force-with-lease
git worktree remove <path>
git branch -D <branch>
git worktree prune
| Tip | Why |
|-----|-----|
| 1-3 files per issue | Higher success rate |
| Include "Files to Modify" | Agents find code faster |
| Backend-first waves | Fewer frontend conflicts |
| Merge same-file PRs sequentially | Rebase between each |
| Problem | Solution |
|---------|----------|
| Agent stuck on permissions | Complete git manually |
| Merge conflict | Rebase, resolve, force-push |
| Agent went off-scope | Reject PR, clarify issue |
| Too many conflicts | Smaller waves, sequential merge |
Take aiskillstore/orchestrating-parallel-agents from the repository into ~/.claude/skills for personal
use, or into .claude/skills inside a project.
The agent identifies a skill by the name field in its header. Two skills with the
same name cannot sit side by side — one of them will be ignored.