anistark · Sep 27, 2026 · Sep 27, 2026 · Sep 27, 2026
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -36,7 +36,7 @@ With the following content:
 
 The `tags` field is **required** and must include **at least one** of the component types below. It tells users what your plugin provides:
 
-- `skills` — skill directories with `SKILL.md`
+- `skills` — skill directories with `SKILL.md`, at `skills/<name>/SKILL.md` in the plugin or wherever its `plugin.json` `skills` field points. The weekly audit flags a plugin tagged `skills` that ships none there, since apps that install skills from AgentHub filter on this tag
 - `agents` — subagent markdown files
 - `commands` — slash command markdown files
 - `hooks` — event hooks (`hooks.json`)

diff --git a/plugins/ask-questions-if-underspecified.json b/plugins/ask-questions-if-underspecified.json
diff --git a/plugins/axiom-apple-skills.json b/plugins/axiom-apple-skills.json
@@ -1,8 +1,9 @@
 {
   "name": "axiom-apple-skills",
   "source": {
-    "source": "github",
-    "repo": "CharlesWiltgen/Axiom"
+    "source": "git-subdir",
+    "url": "https://github.com/CharlesWiltgen/Axiom.git",
+    "path": ".claude-plugin/plugins/axiom"
   },
   "description": "Battle-tested skills for iOS, iPadOS, watchOS, and tvOS development",
   "version": "1.0.0",

diff --git a/plugins/c4-architecture.json b/plugins/c4-architecture.json
@@ -13,7 +13,8 @@
   },
   "category": "documentation",
   "tags": [
-    "skills"
+    "agents",
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/ccpm.json b/plugins/ccpm.json
@@ -1,8 +1,9 @@
 {
   "name": "ccpm",
   "source": {
-    "source": "github",
-    "repo": "automazeio/ccpm"
+    "source": "git-subdir",
+    "url": "https://github.com/automazeio/ccpm.git",
+    "path": "skill/ccpm"
   },
   "description": "Project management for Claude Code using GitHub Issues",
   "version": "1.0.0",

diff --git a/plugins/claude-aws-cost-saver.json b/plugins/claude-aws-cost-saver.json
@@ -1,8 +1,9 @@
 {
   "name": "claude-aws-cost-saver",
   "source": {
-    "source": "github",
-    "repo": "prajapatimehul/claude-aws-cost-saver"
+    "source": "git-subdir",
+    "url": "https://github.com/prajapatimehul/claude-aws-cost-saver.git",
+    "path": "plugins/aws-cost-saver"
   },
   "description": "Finds AWS cost savings with 163 checks across 30+ services",
   "version": "1.0.0",

diff --git a/plugins/coding-tutor.json b/plugins/coding-tutor.json
diff --git a/plugins/compound-engineering.json b/plugins/compound-engineering.json
@@ -1,9 +1,8 @@
 {
   "name": "compound-engineering",
   "source": {
-    "source": "git-subdir",
-    "url": "https://github.com/EveryInc/compound-engineering-plugin.git",
-    "path": "plugins/compound-engineering"
+    "source": "github",
+    "repo": "EveryInc/compound-engineering-plugin"
   },
   "description": "AI-powered development tools that get smarter with every use. Make each unit of engineering work easier than the last.",
   "version": "1.0.0",

diff --git a/plugins/cto-toolkit.json b/plugins/cto-toolkit.json
@@ -12,7 +12,6 @@
   },
   "category": "development",
   "tags": [
-    "skills",
     "agents",
     "hooks",
     "commands"

diff --git a/plugins/debug-buttercup.json b/plugins/debug-buttercup.json
diff --git a/plugins/dev-skills.json b/plugins/dev-skills.json
@@ -3,7 +3,7 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/shinpr/claude-code-workflows.git",
-    "path": "skills-only"
+    "path": "dev-skills"
   },
   "description": "Lightweight skills for users with existing workflows - coding best practices, testing principles, and design guidelines without recipe workflows or agents",
   "version": "1.0.0",

diff --git a/plugins/dev-workflows-frontend.json b/plugins/dev-workflows-frontend.json
@@ -3,7 +3,7 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/shinpr/claude-code-workflows.git",
-    "path": "frontend"
+    "path": "dev-workflows-frontend"
   },
   "description": "Skills + Subagents for React/TypeScript - Use skills for coding guidance, or run recipe workflows for full orchestrated agentic coding with specialized agents",
   "version": "1.0.0",

diff --git a/plugins/dev-workflows.json b/plugins/dev-workflows.json
@@ -3,7 +3,7 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/shinpr/claude-code-workflows.git",
-    "path": "backend"
+    "path": "dev-workflows"
   },
   "description": "Skills + Subagents for backend development - Use skills for coding guidance, or run recipe workflows for full orchestrated agentic coding with specialized agents",
   "version": "1.0.0",

diff --git a/plugins/developer-kit-devops.json b/plugins/developer-kit-devops.json
@@ -13,7 +13,7 @@
   },
   "category": "devops",
   "tags": [
-    "skills"
+    "agents"
   ],
   "license": "MIT"
 }
diff --git a/plugins/developer-kit-project-management.json b/plugins/developer-kit-project-management.json
@@ -13,7 +13,7 @@
   },
   "category": "productivity",
   "tags": [
-    "skills"
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/elastic-cloud.json b/plugins/elastic-cloud.json
@@ -3,9 +3,9 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/elastic/agent-skills.git",
-    "path": "skills/cloud"
+    "path": "plugins/cloud"
   },
-  "description": "Elastic Cloud skills \u2014 project setup, access management, network security, and Serverless project lifecycle",
+  "description": "Elastic Cloud skills — project setup, access management, network security, and Serverless project lifecycle",
   "version": "0.2.1",
   "author": {
     "username": "elastic",

diff --git a/plugins/elastic-elasticsearch.json b/plugins/elastic-elasticsearch.json
@@ -3,9 +3,9 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/elastic/agent-skills.git",
-    "path": "skills/elasticsearch"
+    "path": "plugins/elasticsearch"
   },
-  "description": "Elasticsearch skills \u2014 ES|QL queries, data ingestion, security (authn, authz, audit), and troubleshooting",
+  "description": "Elasticsearch skills — ES|QL queries, data ingestion, security (authn, authz, audit), and troubleshooting",
   "version": "0.2.1",
   "author": {
     "username": "elastic",

diff --git a/plugins/elastic-kibana.json b/plugins/elastic-kibana.json
@@ -3,9 +3,9 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/elastic/agent-skills.git",
-    "path": "skills/kibana"
+    "path": "plugins/kibana"
   },
-  "description": "Kibana skills \u2014 dashboards, alerting rules, connectors, Vega visualizations, Agent Builder, streams, and audit logging",
+  "description": "Kibana skills — dashboards, alerting rules, connectors, Vega visualizations, Agent Builder, streams, and audit logging",
   "version": "0.2.1",
   "author": {
     "username": "elastic",

diff --git a/plugins/elastic-observability.json b/plugins/elastic-observability.json
@@ -3,9 +3,9 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/elastic/agent-skills.git",
-    "path": "skills/observability"
+    "path": "plugins/observability"
   },
-  "description": "Elastic Observability skills \u2014 OpenTelemetry instrumentation and migration (.NET, Java, Python), LLM observability, log search, SLOs, and service health",
+  "description": "Elastic Observability skills — OpenTelemetry instrumentation and migration (.NET, Java, Python), LLM observability, log search, SLOs, and service health",
   "version": "0.2.1",
   "author": {
     "username": "elastic",

diff --git a/plugins/elastic-security.json b/plugins/elastic-security.json
@@ -3,9 +3,9 @@
   "source": {
     "source": "git-subdir",
     "url": "https://github.com/elastic/agent-skills.git",
-    "path": "skills/security"
+    "path": "plugins/security"
   },
-  "description": "Elastic Security skills \u2014 alert triage, case management, detection rule management, and sample data generation",
+  "description": "Elastic Security skills — alert triage, case management, detection rule management, and sample data generation",
   "version": "0.2.1",
   "author": {
     "username": "elastic",

diff --git a/plugins/flow.json b/plugins/flow.json
diff --git a/plugins/git-cleanup.json b/plugins/git-cleanup.json
@@ -13,7 +13,7 @@
   },
   "category": "development",
   "tags": [
-    "skills"
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/github-spec-kit.json b/plugins/github-spec-kit.json
@@ -13,7 +13,7 @@
   },
   "category": "development",
   "tags": [
-    "skills"
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/gt-sdlc.json b/plugins/gt-sdlc.json
@@ -13,7 +13,7 @@
   },
   "category": "development",
   "tags": [
-    "skills"
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/herald.json b/plugins/herald.json
@@ -13,7 +13,7 @@
   },
   "category": "development",
   "tags": [
-    "skills"
+    "hooks"
   ],
   "license": "MIT"
 }
diff --git a/plugins/insecure-defaults.json b/plugins/insecure-defaults.json
@@ -13,7 +13,7 @@
   },
   "category": "security",
   "tags": [
-    "skills"
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/learning-opportunities-auto.json b/plugins/learning-opportunities-auto.json
@@ -13,7 +13,7 @@
   },
   "category": "productivity",
   "tags": [
-    "skills"
+    "hooks"
   ],
   "license": "CC-BY-4.0"
 }
diff --git a/plugins/mcp-toolkit.json b/plugins/mcp-toolkit.json
@@ -13,7 +13,8 @@
   },
   "category": "development",
   "tags": [
-    "skills"
+    "mcp-servers",
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/meigen-ai-design.json b/plugins/meigen-ai-design.json
@@ -13,7 +13,8 @@
   },
   "category": "design",
   "tags": [
-    "skills"
+    "agents",
+    "commands"
   ],
   "license": "MIT"
 }
diff --git a/plugins/metronome.json b/plugins/metronome.json
@@ -12,7 +12,7 @@
   },
   "category": "productivity",
   "tags": [
-    "skills"
+    "hooks"
   ],
   "license": "MIT"
 }
diff --git a/plugins/nothing-design-skill.json b/plugins/nothing-design-skill.json
@@ -1,8 +1,9 @@
 {
   "name": "nothing-design-skill",
   "source": {
-    "source": "github",
-    "repo": "dominikmartn/nothing-design-skill"
+    "source": "git-subdir",
+    "url": "https://github.com/dominikmartn/nothing-design-skill.git",
+    "path": "nothing-design"
   },
   "description": "UI generation skill in Nothing design language with dot matrix aesthetics",
   "version": "1.0.0",

diff --git a/plugins/oh-my-paper.json b/plugins/oh-my-paper.json
@@ -12,7 +12,6 @@
   },
   "category": "other",
   "tags": [
-    "skills",
     "agents",
     "commands",
     "hooks"

diff --git a/plugins/sdlc.json b/plugins/sdlc.json
@@ -13,7 +13,8 @@
   },
   "category": "productivity",
   "tags": [
-    "skills"
+    "agents",
+    "commands"
   ],
   "license": "MIT"
 }