diff --git a/.ai/skills/ai-add-prompt.md b/.ai/skills/ai-add-prompt.md
index 0629cf0..4d03d9b 100644
--- a/.ai/skills/ai-add-prompt.md
+++ b/.ai/skills/ai-add-prompt.md
@@ -13,7 +13,7 @@ available in both Copilot and Claude Code.
 Before creating any files, check:
 
 - **Copilot prompts active**: `.github/prompts/` directory exists
-- **Claude active**: `CLAUDE.md` file exists (create in `.claude/skills/`)
+- **Claude active**: `CLAUDE.md` file exists (create in `.claude/skills/<name>/`)
 
 ## Steps
 
@@ -44,10 +44,18 @@ Before creating any files, check:
    #file:../../.ai/prompts/<name>.md
    ```
 
-4. **If Claude active** — Create `.claude/skills/<name>.md`:
+4. **If Claude active** — Create `.claude/skills/<name>/SKILL.md`:
 
-   ```text
-   @.ai/prompts/<name>.md
+   ```markdown
+   ---
+   name: <name>
+   description: '<description>'
+   disable-model-invocation: true
+   ---
+
+   $ARGUMENTS
+
+   @../../../.ai/prompts/<name>.md
    ```
 
 5. **Confirm** — Report which files were created.
diff --git a/.ai/skills/ai-add-skill.md b/.ai/skills/ai-add-skill.md
index 8e87186..633c98b 100644
--- a/.ai/skills/ai-add-skill.md
+++ b/.ai/skills/ai-add-skill.md
@@ -13,7 +13,7 @@ Copilot and Claude Code.
 Before creating any files, check:
 
 - **Copilot skills active**: `.github/skills/` directory exists
-- **Claude active**: `CLAUDE.md` file exists (create in `.claude/skills/`)
+- **Claude active**: `CLAUDE.md` file exists (create in `.claude/skills/<name>/`)
 
 ## Steps
 
@@ -47,10 +47,18 @@ Before creating any files, check:
    #file:../../../.ai/skills/<name>.md
    ```
 
-4. **If Claude active** — Create `.claude/skills/<name>.md`:
+4. **If Claude active** — Create `.claude/skills/<name>/SKILL.md`:
 
-   ```text
-   @.ai/skills/<name>.md
+   ```markdown
+   ---
+   name: <name>
+   description: '<description>'
+   disable-model-invocation: true
+   ---
+
+   $ARGUMENTS
+
+   @../../../.ai/skills/<name>.md
    ```
 
 5. **Confirm** — Report which files were created.
diff --git a/.claude/skills/ai-add-instruction.md b/.claude/skills/ai-add-instruction.md
deleted file mode 100644
index 0f99d90..0000000
--- a/.claude/skills/ai-add-instruction.md
+++ /dev/null
@@ -1 +0,0 @@
-@.ai/skills/ai-add-instruction.md
diff --git a/.claude/skills/ai-add-instruction/SKILL.md b/.claude/skills/ai-add-instruction/SKILL.md
new file mode 100644
index 0000000..3d57545
--- /dev/null
+++ b/.claude/skills/ai-add-instruction/SKILL.md
@@ -0,0 +1,9 @@
+---
+name: ai-add-instruction
+description: Create a new shared coding instruction in .ai/instructions/ and register thin wrappers for each AI system detected in the repo.
+disable-model-invocation: true
+---
+
+$ARGUMENTS
+
+@../../../.ai/skills/ai-add-instruction.md
diff --git a/.claude/skills/ai-add-prompt.md b/.claude/skills/ai-add-prompt.md
deleted file mode 100644
index 0948ecb..0000000
--- a/.claude/skills/ai-add-prompt.md
+++ /dev/null
@@ -1 +0,0 @@
-@.ai/skills/ai-add-prompt.md
diff --git a/.claude/skills/ai-add-prompt/SKILL.md b/.claude/skills/ai-add-prompt/SKILL.md
new file mode 100644
index 0000000..e8537cc
--- /dev/null
+++ b/.claude/skills/ai-add-prompt/SKILL.md
@@ -0,0 +1,9 @@
+---
+name: ai-add-prompt
+description: Create a new shared user-invokable prompt in .ai/prompts/ and register thin wrappers for each AI system detected in the repo.
+disable-model-invocation: true
+---
+
+$ARGUMENTS
+
+@../../../.ai/skills/ai-add-prompt.md
diff --git a/.claude/skills/ai-add-skill.md b/.claude/skills/ai-add-skill.md
deleted file mode 100644
index cc28354..0000000
--- a/.claude/skills/ai-add-skill.md
+++ /dev/null
@@ -1 +0,0 @@
-@.ai/skills/ai-add-skill.md
diff --git a/.claude/skills/ai-add-skill/SKILL.md b/.claude/skills/ai-add-skill/SKILL.md
new file mode 100644
index 0000000..59e6198
--- /dev/null
+++ b/.claude/skills/ai-add-skill/SKILL.md
@@ -0,0 +1,9 @@
+---
+name: ai-add-skill
+description: Create a new shared reusable workflow skill in .ai/skills/ and register thin wrappers for each AI system detected in the repo.
+disable-model-invocation: true
+---
+
+$ARGUMENTS
+
+@../../../.ai/skills/ai-add-skill.md
diff --git a/.claude/skills/plan-writing.md b/.claude/skills/plan-writing.md
deleted file mode 100644
index 01fe6e8..0000000
--- a/.claude/skills/plan-writing.md
+++ /dev/null
@@ -1 +0,0 @@
-@.ai/skills/plan-writing.md
diff --git a/.claude/skills/plan-writing/SKILL.md b/.claude/skills/plan-writing/SKILL.md
new file mode 100644
index 0000000..4a3e4fd
--- /dev/null
+++ b/.claude/skills/plan-writing/SKILL.md
@@ -0,0 +1,9 @@
+---
+name: plan-writing
+description: Write an implementation plan for a non-trivial change. Use when asked to plan a feature, workflow, or architectural change before creating a branch.
+disable-model-invocation: true
+---
+
+$ARGUMENTS
+
+@../../../.ai/skills/plan-writing.md
diff --git a/.claude/skills/verify-unresolved-pr-comments.md b/.claude/skills/verify-unresolved-pr-comments.md
deleted file mode 100644
index 3a6a110..0000000
--- a/.claude/skills/verify-unresolved-pr-comments.md
+++ /dev/null
@@ -1 +0,0 @@
-@.ai/prompts/verify-unresolved-pr-comments.md
diff --git a/.claude/skills/verify-unresolved-pr-comments/SKILL.md b/.claude/skills/verify-unresolved-pr-comments/SKILL.md
new file mode 100644
index 0000000..9f66c6e
--- /dev/null
+++ b/.claude/skills/verify-unresolved-pr-comments/SKILL.md
@@ -0,0 +1,9 @@
+---
+name: verify-unresolved-pr-comments
+description: Analyze all unresolved review comments on the active PR and return a triage chart with severity, fix recommendation, suggestion validity, and required action.
+disable-model-invocation: true
+---
+
+$ARGUMENTS
+
+@../../../.ai/prompts/verify-unresolved-pr-comments.md