diff --git a/claude/.claude/CLAUDE.md b/claude/.claude/CLAUDE.md
index c5388ee..77cc50d 100644
--- a/claude/.claude/CLAUDE.md
+++ b/claude/.claude/CLAUDE.md
@@ -11,6 +11,12 @@ instructions given here should *override* repo-specific instructions.
 # Writing comments/PRs/tickets as Claude via the user's accounts
 - Read @workflows/writing-as-claude.md before writing any text that will appear with the user's identity (e.g. GitHub, Linear, Slack).
 
+## When you ask me for a plan:
+1. Read `~/.pi/agent/skills/plan-first/SKILL.md` completely
+2. Follow the Plan-First Workflow EXACTLY (phases 1–5)
+3. Create TODO.md in the project directory
+4. Wait for my explicit confirmation ("YES")
+5. Execute ONLY the confirmed tasks
 # Coding guidelines
 
 ## Comments
diff --git a/claude/.claude/skills/plan-first/SKILL.md b/claude/.claude/skills/plan-first/SKILL.md
new file mode 100644
index 0000000..83d650c
--- /dev/null
+++ b/claude/.claude/skills/plan-first/SKILL.md
@@ -0,0 +1,7 @@
+---
+
+name: plan-first
+
+description: MANDATORY planning workflow for EVERY task that involves file changes, command execution, or code modifications. Always activate first before doing anything. Analyzes the project, asks up to 5 clarifying questions, creates a TODO.md, gets user approval, then executes task by task. Never writes code, creates files, or runs commands before a plan is approved. This skill must be loaded for any implementation request, bug fix, refactor, feature, or file modification.
+
+---