jpmschweitzer/settled-reach
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(skills): team stays alive through review AND merge — not just approval

Browse Source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
jpmschweitzer
2026-04-19 14:13:47 +02:00
co-authored by Claude Sonnet 4.6
parent 6d50096571
commit e6f5045c2f
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.claude/skills/sprint-start/SKILL.md
+24 -5
View File
@@ -501,7 +501,7 @@ You are now the team lead. Agents work autonomously — monitor via
they arise.
**When all tasks complete:** Do NOT shut down agents. The team stays
alive through the PR review cycle. Follow step 9 (post-work lifecycle).
alive through PR review AND merge. Follow step 9 (post-work lifecycle).
### 9. Post-work lifecycle
@@ -510,7 +510,8 @@ When all tasks are complete (TaskList shows all completed):
#### 9a. Commit and push
Run `/git-commit` to commit all changes, then `/pr-push` to create or
update the PR. Do NOT shut down agents — the team stays alive for review.
update the PR. Do NOT shut down agents — the team stays alive through
review and merge.
#### 9b. Wait for review
@@ -554,10 +555,28 @@ comments):
5. Repeat this loop until review returns APPROVED.
**If APPROVED:**
**If APPROVED (but not yet merged):**
Do NOT shut down. Approval alone is not terminal — reviewers can leave
follow-up comments, the PR can be re-reviewed, or merge conflicts can
surface. Keep the team alive and idle until the PR is merged into main.
1. Report to the user: "Sprint {N} {team} PR #{X} approved. Awaiting
merge. Team remains alive."
2. Agents stay idle. Do not reassign them to unrelated work.
3. Periodically check merge state (or wait for the user to confirm the
merge). The `main` session handles the merge itself.
4. If new review comments arrive between approval and merge, treat it
as CHANGES_REQUESTED and re-enter the fix loop.
5. Once the PR is merged, proceed to 9d.
#### 9d. Handle merge completion
When the PR is confirmed merged into main (user confirmation, Gitea
state change, or the `main` session reports the merge):
1. Send `shutdown_request` to all sprint agents.
2. Wait for all `shutdown_response` confirmations.
3. Call `TeamDelete` to clean up.
4. Report: "Sprint {N} {team} complete. PR #{X} approved and ready for
merge on main."
4. Report: "Sprint {N} {team} complete. PR #{X} merged into main. Team
shut down."