diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 385ec548..626c8e82 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -11,8 +11,8 @@
   "plugins": [
     {
       "name": "compound-engineering",
-      "description": "AI-powered development tools that get smarter with every use. Make each unit of engineering work easier than the last. Includes 28 specialized agents, 22 commands, and 20 skills.",
-      "version": "2.39.0",
+      "description": "AI-powered development tools that get smarter with every use. Make each unit of engineering work easier than the last. Includes 28 specialized agents and 47 skills.",
+      "version": "2.40.0",
       "author": {
         "name": "Kieran Klaassen",
         "url": "https://github.com/kieranklaassen",
diff --git a/plugins/compound-engineering/.claude-plugin/plugin.json b/plugins/compound-engineering/.claude-plugin/plugin.json
index 1eed22a1..a59c57f7 100644
--- a/plugins/compound-engineering/.claude-plugin/plugin.json
+++ b/plugins/compound-engineering/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "compound-engineering",
-  "version": "2.39.0",
-  "description": "AI-powered development tools. 28 agents, 22 commands, 20 skills, 1 MCP server for code review, research, design, and workflow automation.",
+  "version": "2.40.0",
+  "description": "AI-powered development tools. 28 agents, 47 skills, 1 MCP server for code review, research, design, and workflow automation.",
   "author": {
     "name": "Kieran Klaassen",
     "email": "kieran@every.to",
diff --git a/plugins/compound-engineering/CLAUDE.md b/plugins/compound-engineering/CLAUDE.md
index d21246c8..fc8ed15f 100644
--- a/plugins/compound-engineering/CLAUDE.md
+++ b/plugins/compound-engineering/CLAUDE.md
@@ -34,15 +34,16 @@ agents/
 ├── workflow/   # Workflow automation agents
 └── docs/       # Documentation agents
 
-commands/
-├── ce/         # Core workflow commands (ce:plan, ce:review, etc.)
-├── workflows/  # Deprecated aliases for ce:* commands
-└── *.md        # Utility commands
-
 skills/
-└── *.md        # All skills at root level
+├── ce-*/          # Core workflow skills (ce:plan, ce:review, etc.)
+├── workflows-*/   # Deprecated aliases for ce:* skills
+└── */             # All other skills
 ```
 
+> **Note:** Commands were migrated to skills in v2.39.0. All former
+> `/command-name` slash commands now live under `skills/command-name/SKILL.md`
+> and work identically (Claude Code 2.1.3+ merged the two formats).
+
 ## Command Naming Convention
 
 **Workflow commands** use `ce:` prefix to unambiguously identify them as compound-engineering commands:
diff --git a/plugins/compound-engineering/commands/agent-native-audit.md b/plugins/compound-engineering/skills/agent-native-audit/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/agent-native-audit.md
rename to plugins/compound-engineering/skills/agent-native-audit/SKILL.md
diff --git a/plugins/compound-engineering/commands/ce/brainstorm.md b/plugins/compound-engineering/skills/ce-brainstorm/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/ce/brainstorm.md
rename to plugins/compound-engineering/skills/ce-brainstorm/SKILL.md
diff --git a/plugins/compound-engineering/commands/ce/compound.md b/plugins/compound-engineering/skills/ce-compound/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/ce/compound.md
rename to plugins/compound-engineering/skills/ce-compound/SKILL.md
diff --git a/plugins/compound-engineering/commands/ce/plan.md b/plugins/compound-engineering/skills/ce-plan/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/ce/plan.md
rename to plugins/compound-engineering/skills/ce-plan/SKILL.md
diff --git a/plugins/compound-engineering/commands/ce/review.md b/plugins/compound-engineering/skills/ce-review/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/ce/review.md
rename to plugins/compound-engineering/skills/ce-review/SKILL.md
diff --git a/plugins/compound-engineering/commands/ce/work.md b/plugins/compound-engineering/skills/ce-work/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/ce/work.md
rename to plugins/compound-engineering/skills/ce-work/SKILL.md
diff --git a/plugins/compound-engineering/commands/changelog.md b/plugins/compound-engineering/skills/changelog/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/changelog.md
rename to plugins/compound-engineering/skills/changelog/SKILL.md
diff --git a/plugins/compound-engineering/commands/create-agent-skill.md b/plugins/compound-engineering/skills/create-agent-skill/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/create-agent-skill.md
rename to plugins/compound-engineering/skills/create-agent-skill/SKILL.md
diff --git a/plugins/compound-engineering/commands/deepen-plan.md b/plugins/compound-engineering/skills/deepen-plan/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/deepen-plan.md
rename to plugins/compound-engineering/skills/deepen-plan/SKILL.md
diff --git a/plugins/compound-engineering/commands/deploy-docs.md b/plugins/compound-engineering/skills/deploy-docs/SKILL.md
similarity index 97%
rename from plugins/compound-engineering/commands/deploy-docs.md
rename to plugins/compound-engineering/skills/deploy-docs/SKILL.md
index 93a19d46..3185a204 100644
--- a/plugins/compound-engineering/commands/deploy-docs.md
+++ b/plugins/compound-engineering/skills/deploy-docs/SKILL.md
@@ -15,7 +15,6 @@ Run these checks:
 ```bash
 # Count components
 echo "Agents: $(ls plugins/compound-engineering/agents/*.md | wc -l)"
-echo "Commands: $(ls plugins/compound-engineering/commands/*.md | wc -l)"
 echo "Skills: $(ls -d plugins/compound-engineering/skills/*/ 2>/dev/null | wc -l)"
 
 # Validate JSON
diff --git a/plugins/compound-engineering/commands/feature-video.md b/plugins/compound-engineering/skills/feature-video/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/feature-video.md
rename to plugins/compound-engineering/skills/feature-video/SKILL.md
diff --git a/plugins/compound-engineering/commands/generate_command.md b/plugins/compound-engineering/skills/generate_command/SKILL.md
similarity index 92%
rename from plugins/compound-engineering/commands/generate_command.md
rename to plugins/compound-engineering/skills/generate_command/SKILL.md
index a9cbe7cc..47e2cfcd 100644
--- a/plugins/compound-engineering/commands/generate_command.md
+++ b/plugins/compound-engineering/skills/generate_command/SKILL.md
@@ -7,7 +7,7 @@ disable-model-invocation: true
 
 # Create a Custom Claude Code Command
 
-Create a new slash command in `.claude/commands/` for the requested task.
+Create a new skill in `.claude/skills/` for the requested task.
 
 ## Goal
 
@@ -128,10 +128,10 @@ Implement #$ARGUMENTS following these steps:
 
 ## Creating the Command File
 
-1. **Create the file** at `.claude/commands/[name].md` (subdirectories like `workflows/` supported)
+1. **Create the directory** at `.claude/skills/[name]/SKILL.md`
 2. **Start with YAML frontmatter** (see section above)
-3. **Structure the command** using the template above
-4. **Test the command** by using it with appropriate arguments
+3. **Structure the skill** using the template above
+4. **Test the skill** by using it with appropriate arguments
 
 ## Command File Template
 
diff --git a/plugins/compound-engineering/commands/heal-skill.md b/plugins/compound-engineering/skills/heal-skill/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/heal-skill.md
rename to plugins/compound-engineering/skills/heal-skill/SKILL.md
diff --git a/plugins/compound-engineering/commands/lfg.md b/plugins/compound-engineering/skills/lfg/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/lfg.md
rename to plugins/compound-engineering/skills/lfg/SKILL.md
diff --git a/plugins/compound-engineering/commands/report-bug.md b/plugins/compound-engineering/skills/report-bug/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/report-bug.md
rename to plugins/compound-engineering/skills/report-bug/SKILL.md
diff --git a/plugins/compound-engineering/commands/reproduce-bug.md b/plugins/compound-engineering/skills/reproduce-bug/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/reproduce-bug.md
rename to plugins/compound-engineering/skills/reproduce-bug/SKILL.md
diff --git a/plugins/compound-engineering/commands/resolve_parallel.md b/plugins/compound-engineering/skills/resolve_parallel/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/resolve_parallel.md
rename to plugins/compound-engineering/skills/resolve_parallel/SKILL.md
diff --git a/plugins/compound-engineering/commands/resolve_todo_parallel.md b/plugins/compound-engineering/skills/resolve_todo_parallel/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/resolve_todo_parallel.md
rename to plugins/compound-engineering/skills/resolve_todo_parallel/SKILL.md
diff --git a/plugins/compound-engineering/commands/slfg.md b/plugins/compound-engineering/skills/slfg/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/slfg.md
rename to plugins/compound-engineering/skills/slfg/SKILL.md
diff --git a/plugins/compound-engineering/commands/test-browser.md b/plugins/compound-engineering/skills/test-browser/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/test-browser.md
rename to plugins/compound-engineering/skills/test-browser/SKILL.md
diff --git a/plugins/compound-engineering/commands/test-xcode.md b/plugins/compound-engineering/skills/test-xcode/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/test-xcode.md
rename to plugins/compound-engineering/skills/test-xcode/SKILL.md
diff --git a/plugins/compound-engineering/commands/triage.md b/plugins/compound-engineering/skills/triage/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/triage.md
rename to plugins/compound-engineering/skills/triage/SKILL.md
diff --git a/plugins/compound-engineering/commands/workflows/brainstorm.md b/plugins/compound-engineering/skills/workflows-brainstorm/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/workflows/brainstorm.md
rename to plugins/compound-engineering/skills/workflows-brainstorm/SKILL.md
diff --git a/plugins/compound-engineering/commands/workflows/compound.md b/plugins/compound-engineering/skills/workflows-compound/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/workflows/compound.md
rename to plugins/compound-engineering/skills/workflows-compound/SKILL.md
diff --git a/plugins/compound-engineering/commands/workflows/plan.md b/plugins/compound-engineering/skills/workflows-plan/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/workflows/plan.md
rename to plugins/compound-engineering/skills/workflows-plan/SKILL.md
diff --git a/plugins/compound-engineering/commands/workflows/review.md b/plugins/compound-engineering/skills/workflows-review/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/workflows/review.md
rename to plugins/compound-engineering/skills/workflows-review/SKILL.md
diff --git a/plugins/compound-engineering/commands/workflows/work.md b/plugins/compound-engineering/skills/workflows-work/SKILL.md
similarity index 100%
rename from plugins/compound-engineering/commands/workflows/work.md
rename to plugins/compound-engineering/skills/workflows-work/SKILL.md