vrr/spawn
2
0
Fork 0
mirror of https://github.com/OpenRouterTeam/spawn.git synced 2026-05-05 23:50:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

feat: Add git worktree and commit marker conventions to SKILL.md (#67)

Browse source 
Document the mandatory git conventions for all agent team scripts:
always pull main before creating worktrees, use worktrees for parallel
branch work, include Agent: trailers in commits, and clean up worktrees
at end of cycle.

Agent: team-lead

Co-authored-by: A <6723574+louisgv@users.noreply.github.com>
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
A 2026-02-09 03:16:12 -08:00 • committed by GitHub
parent a61c378f4c
commit 782da8945c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 60 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

61
.claude/skills/setup-trigger-service/SKILL.md
View file

@ -227,7 +227,7 @@ printf '<secret-from-step-2>' | gh secret set <SERVICE_NAME>_TRIGGER_SECRET --re
The target script (e.g., `refactor.sh`, `improve.sh`) MUST:
1. **Run a single cycle and exit** — no `while true` loops
2. **Sync with origin before work** — `git fetch && git reset --hard origin/main`
2. **Sync with origin before work** — `git fetch origin main && git pull origin main`
3. **Exit cleanly** — so the trigger server marks it as "not running" and accepts the next trigger
If converting from a looping script, remove the `while true` / `sleep` and keep only the body of one iteration.
@ -236,6 +236,65 @@ If converting from a looping script, remove the `while true` / `sleep` and keep
- `improve.sh` — Continuous improvement loop for spawn (already single-cycle ready)
- `refactor.sh` — Refactoring team service (already single-cycle ready)
## Git Conventions for Agent Team Scripts
All agent team scripts (`improve.sh`, `refactor.sh`, and any future scripts) MUST instruct their agents to follow these conventions:
### 1. Always pull main before creating worktrees
Agents MUST fetch and pull the latest main before starting any branch work:
```bash
git fetch origin main
git pull origin main
```
### 2. Use git worktrees for all branch work
When multiple agents work in parallel, they MUST use worktrees instead of `git checkout -b` to avoid clobbering each other's uncommitted changes:
```bash
# Fetch latest main first
git fetch origin main
# Create worktree from latest origin/main
git worktree add /tmp/spawn-worktrees/BRANCH-NAME -b BRANCH-NAME origin/main
# Work inside the worktree
cd /tmp/spawn-worktrees/BRANCH-NAME
# ... make changes ...
# Commit, push, create PR, merge
git push -u origin BRANCH-NAME
gh pr create --title "..." --body "..."
gh pr merge --squash --delete-branch
# Clean up
git worktree remove /tmp/spawn-worktrees/BRANCH-NAME
```
### 3. Include Agent markers in commits
Every agent commit MUST include an `Agent:` trailer identifying which agent authored it:
```
feat: Add RunPod cloud provider
Agent: cloud-scout
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
```
### 4. Clean up worktrees at end of cycle
The team lead or cleanup function must prune stale worktrees:
```bash
git worktree prune
rm -rf /tmp/spawn-worktrees
```
These conventions are already embedded in the prompts of `improve.sh` and `refactor.sh`. When adding new service scripts, copy the same patterns.
## Step 9: Commit and push
Commit the workflow file and .gitignore changes (but NOT the wrapper script):