diff --git a/.claude/skills/setup/SKILL.md b/.claude/skills/setup/SKILL.md
index 2041f80..f532ead 100644
--- a/.claude/skills/setup/SKILL.md
+++ b/.claude/skills/setup/SKILL.md
@@ -218,6 +218,6 @@ Tell user to test: send a message in their registered chat. Show: `tail -f logs/
 **Unload service:** macOS: `launchctl unload ~/Library/LaunchAgents/com.nanoclaw.plist` | Linux: `systemctl --user stop nanoclaw`
 
 
-## Diagnostics
+## 9. Diagnostics
 
-Read and follow [diagnostics.md](diagnostics.md).
+Use the Read tool to open `.claude/skills/setup/diagnostics.md` and follow every instruction in it. Do not skip this step.
diff --git a/.claude/skills/setup/diagnostics.md b/.claude/skills/setup/diagnostics.md
index a76b4ab..669ea82 100644
--- a/.claude/skills/setup/diagnostics.md
+++ b/.claude/skills/setup/diagnostics.md
@@ -42,5 +42,5 @@ rm /tmp/nanoclaw-diagnostics.json
 **Never ask again**:
 1. Replace contents of `.claude/skills/setup/diagnostics.md` with `# Diagnostics — opted out`
 2. Replace contents of `.claude/skills/update-nanoclaw/diagnostics.md` with `# Diagnostics — opted out`
-3. Remove the "Diagnostics" section from both `.claude/skills/setup/SKILL.md` and `.claude/skills/update-nanoclaw/SKILL.md`
+3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics (mandatory final step)` section from `.claude/skills/update-nanoclaw/SKILL.md`
 4. `rm /tmp/nanoclaw-diagnostics.json`
diff --git a/.claude/skills/update-nanoclaw/SKILL.md b/.claude/skills/update-nanoclaw/SKILL.md
index 0af5713..1def6c6 100644
--- a/.claude/skills/update-nanoclaw/SKILL.md
+++ b/.claude/skills/update-nanoclaw/SKILL.md
@@ -235,6 +235,6 @@ Tell the user:
   - If running manually: restart `npm run dev`
 
 
-## Diagnostics
+## Diagnostics (mandatory final step)
 
-Read and follow [diagnostics.md](diagnostics.md).
+Use the Read tool to open `.claude/skills/update-nanoclaw/diagnostics.md` and follow every instruction in it. Do not skip this step.
diff --git a/.claude/skills/update-nanoclaw/diagnostics.md b/.claude/skills/update-nanoclaw/diagnostics.md
index bc659ab..f15b45c 100644
--- a/.claude/skills/update-nanoclaw/diagnostics.md
+++ b/.claude/skills/update-nanoclaw/diagnostics.md
@@ -45,5 +45,5 @@ rm /tmp/nanoclaw-diagnostics.json
 **Never ask again**:
 1. Replace contents of `.claude/skills/setup/diagnostics.md` with `# Diagnostics — opted out`
 2. Replace contents of `.claude/skills/update-nanoclaw/diagnostics.md` with `# Diagnostics — opted out`
-3. Remove the "Diagnostics" section from both `.claude/skills/setup/SKILL.md` and `.claude/skills/update-nanoclaw/SKILL.md`
+3. Remove the `## 9. Diagnostics` section from `.claude/skills/setup/SKILL.md` and the `## Diagnostics (mandatory final step)` section from `.claude/skills/update-nanoclaw/SKILL.md`
 4. `rm /tmp/nanoclaw-diagnostics.json`