diff --git a/src/resources/skills/create-skill/SKILL.md b/src/resources/skills/create-skill/SKILL.md
index 1ba685a25..d7bddcb37 100644
--- a/src/resources/skills/create-skill/SKILL.md
+++ b/src/resources/skills/create-skill/SKILL.md
@@ -87,9 +87,9 @@ Then proceed directly to the workflow.
 <quick_reference>
 ## Skill Structure Quick Reference
 
-**Skill directories:**
-- Global: `~/.sf/agent/skills/{skill-name}/`
-- Project-local: `.pi/agent/skills/{skill-name}/`
+**Skill directories (SF scans all four):**
+- Global: `~/.agents/skills/{skill-name}/` or `~/.claude/skills/{skill-name}/`
+- Project-local: `<project>/.agents/skills/{skill-name}/` or `<project>/.claude/skills/{skill-name}/`
 
 **Simple skill (single file):**
 ```yaml
diff --git a/src/resources/skills/create-skill/workflows/audit-skill.md b/src/resources/skills/create-skill/workflows/audit-skill.md
index 81f6a2e31..5665fd471 100644
--- a/src/resources/skills/create-skill/workflows/audit-skill.md
+++ b/src/resources/skills/create-skill/workflows/audit-skill.md
@@ -13,25 +13,27 @@
 
 **DO NOT use AskUserQuestion** - there may be many skills.
 
-Enumerate skills from both directories:
+Enumerate skills from all four directories:
 ```bash
 echo "=== Global skills ==="
-ls ~/.sf/agent/skills/ 2>/dev/null || echo "(none)"
+ls ~/.agents/skills/ 2>/dev/null || echo "(none)"
+ls ~/.claude/skills/ 2>/dev/null || echo "(none)"
 
 echo "=== Project-local skills ==="
-ls .pi/agent/skills/ 2>/dev/null || echo "(none)"
+ls .agents/skills/ 2>/dev/null || echo "(none)"
+ls .claude/skills/ 2>/dev/null || echo "(none)"
 ```
 
 Present as:
 ```
 Available skills:
 
-Global (~/.sf/agent/skills/):
+Global (~/.agents/skills/ + ~/.claude/skills/):
 1. create-skill
 2. manage-stripe
 ...
 
-Project-local (.pi/agent/skills/):
+Project-local (.agents/skills/ + .claude/skills/):
 3. project-deploy
 ...
 ```
diff --git a/src/resources/skills/create-skill/workflows/create-new-skill.md b/src/resources/skills/create-skill/workflows/create-new-skill.md
index eb4f04f07..9eacc5915 100644
--- a/src/resources/skills/create-skill/workflows/create-new-skill.md
+++ b/src/resources/skills/create-skill/workflows/create-new-skill.md
@@ -15,8 +15,8 @@
 **Ask the user:**
 "Should this skill be global or project-local?"
 
-1. **Global** (`~/.sf/agent/skills/`) — Available in all SF sessions
-2. **Project-local** (`.pi/agent/skills/`) — Available only in this project
+1. **Global** (`~/.agents/skills/` or `~/.claude/skills/`) — Available in all SF sessions
+2. **Project-local** (`<project>/.agents/skills/` or `<project>/.claude/skills/`) — Available only in this project
 
 ## Step 2: Adaptive Requirements Gathering
 
@@ -99,11 +99,11 @@ See references/recommended-structure.md for templates.
 ## Step 5: Create Directory
 
 Use the scope selected in Step 1 to determine the base path:
-- **Global:** `~/.sf/agent/skills/{skill-name}`
-- **Project-local:** `.pi/agent/skills/{skill-name}`
+- **Global:** `~/.agents/skills/{skill-name}` (or `~/.claude/skills/{skill-name}`)
+- **Project-local:** `<project>/.agents/skills/{skill-name}` (or `<project>/.claude/skills/{skill-name}`)
 
 ```bash
-BASE_PATH="{selected-base}/agent/skills/{skill-name}"
+BASE_PATH="{selected-base}/skills/{skill-name}"
 mkdir -p $BASE_PATH
 # If complex:
 mkdir -p $BASE_PATH/workflows