diff --git a/CLAUDE.md b/CLAUDE.md
index 9f5bba849..0b194400e 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -176,6 +176,20 @@ When producing many files (wiki pages, content batches, bulk docs):
 
 Key: writers use Write tool directly (no transcription bottleneck), librarian catches contradictions early, split work by domain not volume.
 
+### Team monitoring (stuck agent detection)
+
+When leading a team (sprint, workshop, or any multi-agent session):
+
+**Agent heartbeat rule** — include in every agent spawn prompt:
+> If you have been working on a single task for more than 15 minutes
+> without making progress, message the team lead with what is blocking
+> you. Do not keep retrying the same approach silently.
+
+**Team lead proactive checks:**
+- If an agent has not sent a message in ~20 minutes, ping them for a status update.
+- **Bottleneck detection:** if other agents are idle and waiting on one agent's output, that agent's silence is a red flag — check on them immediately, do not wait for the next natural message.
+- When checking on a stuck agent, offer to reassign the task or pull in another agent to help.
+
 ### Local services
 - Gitea: `http://git.schweitz.internal` (login: `schweitz`)
 - Qdrant: `http://tower-of-joy:6333/`