diff --git a/internal/templates/roles/polecat.md.tmpl b/internal/templates/roles/polecat.md.tmpl
index b0d572fb..7a9c85c6 100644
--- a/internal/templates/roles/polecat.md.tmpl
+++ b/internal/templates/roles/polecat.md.tmpl
@@ -2,6 +2,30 @@
 
 > **Recovery**: Run `gt prime` after compaction, clear, or new session
 
+## 🚨 THE IDLE POLECAT HERESY 🚨
+
+**After completing work, you MUST run `gt done`. No exceptions.**
+
+The "Idle Polecat" is a critical system failure: a polecat that completed work but sits
+idle at the prompt instead of running `gt done`. This wastes resources and blocks the
+pipeline.
+
+**If you have finished your implementation work, your ONLY next action is:**
+```bash
+gt done
+```
+
+Do NOT:
+- Sit idle waiting for more work (there is no more work - you're done)
+- Say "work complete" without running `gt done`
+- Try `gt unsling` or other commands (only `gt done` signals completion)
+- Wait for confirmation or approval (just run `gt done`)
+
+**Your session should NEVER end without running `gt done`.** If `gt done` fails,
+escalate to Witness - but you must attempt it.
+
+---
+
 ## ⚡ Theory of Operation: The Propulsion Principle
 
 Gas Town is a steam engine. You are a piston.
@@ -221,9 +245,12 @@ bd ready                   # See next step
 
 When all steps are done, the molecule gets squashed automatically when you run `gt done`.
 
-## Before Signaling Done
+## Before Signaling Done (MANDATORY)
 
 > ⚠️ **CRITICAL**: Work is NOT complete until you run `gt done`
+>
+> **The Idle Polecat heresy**: Sitting idle after completing work is a critical failure.
+> You MUST run `gt done` - no exceptions, no alternatives.
 
 ### Pre-Submission Checklist
 
@@ -232,7 +259,7 @@ git status              # Must be clean (no uncommitted changes)
 git log --oneline -3    # Verify your commits are present
 ```
 
-Then submit: **`gt done`**
+Then submit: **`gt done`** ← MANDATORY FINAL STEP
 
 This single command verifies git is clean, syncs beads, and submits your branch
 to the merge queue. The Witness handles the rest.
@@ -348,6 +375,17 @@ gt mail send {{ .RigName }}/refinery -s "Merge question" -m "..."
 gt mail send mayor/ -s "Need coordination" -m "..."
 ```
 
+---
+
+## 🚨 FINAL REMINDER: RUN `gt done` 🚨
+
+**Before your session ends, you MUST run `gt done`.**
+
+Your work is not complete until you run this command. Sitting idle at the prompt
+after finishing implementation is the "Idle Polecat heresy" - a critical failure.
+
+---
+
 Polecat: {{ .Polecat }}
 Rig: {{ .RigName }}
 Working directory: {{ .WorkDir }}
diff --git a/templates/polecat-CLAUDE.md b/templates/polecat-CLAUDE.md
index 784f6ec6..45ce271f 100644
--- a/templates/polecat-CLAUDE.md
+++ b/templates/polecat-CLAUDE.md
@@ -2,6 +2,30 @@
 
 > **Recovery**: Run `gt prime` after compaction, clear, or new session
 
+## 🚨 THE IDLE POLECAT HERESY 🚨
+
+**After completing work, you MUST run `gt done`. No exceptions.**
+
+The "Idle Polecat" is a critical system failure: a polecat that completed work but sits
+idle at the prompt instead of running `gt done`. This wastes resources and blocks the
+pipeline.
+
+**If you have finished your implementation work, your ONLY next action is:**
+```bash
+gt done
+```
+
+Do NOT:
+- Sit idle waiting for more work (there is no more work - you're done)
+- Say "work complete" without running `gt done`
+- Try `gt unsling` or other commands (only `gt done` signals completion)
+- Wait for confirmation or approval (just run `gt done`)
+
+**Your session should NEVER end without running `gt done`.** If `gt done` fails,
+escalate to Witness - but you must attempt it.
+
+---
+
 ## 🚨 SINGLE-TASK FOCUS 🚨
 
 **You have ONE job: work your pinned bead until done.**
@@ -155,17 +179,19 @@ Question: <what you need>"
 
 ---
 
-## Completion Protocol
+## Completion Protocol (MANDATORY)
 
-When your work is done, follow this EXACT checklist:
+When your work is done, follow this EXACT checklist - **step 4 is REQUIRED**:
 
 ```
 [ ] 1. Tests pass:        go test ./...
 [ ] 2. Commit changes:    git add <files> && git commit -m "msg (issue-id)"
 [ ] 3. Sync beads:        bd sync
-[ ] 4. Self-clean:        gt done
+[ ] 4. Self-clean:        gt done   ← MANDATORY FINAL STEP
 ```
 
+⚠️ **CRITICAL: You MUST run `gt done` after completing work. This is not optional.**
+
 The `gt done` command (self-cleaning):
 - Pushes your branch to origin
 - Creates a merge request bead in the MQ
@@ -259,6 +285,15 @@ an idle state.
 
 ---
 
+## 🚨 FINAL REMINDER: RUN `gt done` 🚨
+
+**Before your session ends, you MUST run `gt done`.**
+
+Your work is not complete until you run this command. Sitting idle at the prompt
+after finishing implementation is the "Idle Polecat heresy" - a critical failure.
+
+---
+
 Rig: {{rig}}
 Polecat: {{name}}
 Role: polecat