diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 0a6d800..bb9248a 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -7,9 +7,15 @@
   },
   "plugins": [
     {
-      "name": "core",
-      "source": "./claude/core",
-      "description": "Core commands for project maintenance.",
+      "name": "api",
+      "source": "./claude/api",
+      "description": "API client generation helpers",
+      "version": "0.1.0"
+    },
+    {
+      "name": "ci",
+      "source": "./claude/ci",
+      "description": "CI integration - GitHub Actions, test automation",
       "version": "0.1.0"
     },
     {
@@ -24,6 +30,36 @@
       "description": "Data collection via Borg CLI - /collect:github, /collect:website, /collect:excavate, /collect:papers",
       "version": "0.1.0"
     },
+    {
+      "name": "coolify",
+      "source": "./claude/coolify",
+      "description": "Coolify deployment helpers",
+      "version": "0.1.0"
+    },
+    {
+      "name": "core",
+      "source": "./claude/core",
+      "description": "Core commands for project maintenance",
+      "version": "0.1.0"
+    },
+    {
+      "name": "issue",
+      "source": "./claude/issue",
+      "description": "Integration with GitHub Issues",
+      "version": "0.1.0"
+    },
+    {
+      "name": "perf",
+      "source": "./claude/perf",
+      "description": "Performance profiling helpers for Go and PHP",
+      "version": "0.1.0"
+    },
+    {
+      "name": "qa",
+      "source": "./claude/qa",
+      "description": "Quality assurance - iterative fix loops, lint enforcement",
+      "version": "0.1.0"
+    },
     {
       "name": "review",
       "source": "./claude/review",
@@ -35,33 +71,6 @@
       "source": "./claude/verify",
       "description": "Work verification - ensure tests pass, no debug statements",
       "version": "0.1.0"
-    },
-    {
-      "name": "qa",
-      "source": "./claude/qa",
-      "description": "Quality assurance - iterative fix loops, lint enforcement",
-      "version": "0.1.0"
-    },
-    {
-      "name": "ci",
-      "source": "./claude/ci",
-      "description": "CI integration - GitHub Actions, test automation",
-      "version": "0.1.0"
-    },
-    {
-      "name": "core",
-      "source": "./claude/core",
-      "description": "Laravel migration helpers for the Host UK monorepo",
-      "name": "perf",
-      "source": "./claude/perf",
-      "description": "Performance profiling helpers for Go and PHP.",
-      "name": "core",
-      "source": "./claude/core",
-      "description": "Core functionality - release management",
-      "name": "issue",
-      "source": "./claude/issue",
-      "description": "Integration with GitHub Issues",
-      "version": "0.1.0"
     }
   ]
 }
diff --git a/claude/code/hooks.json b/claude/code/hooks.json
index f1e847f..f8f6c42 100644
--- a/claude/code/hooks.json
+++ b/claude/code/hooks.json
@@ -11,6 +11,12 @@
           }
         ],
         "description": "Capture session history before each tool use"
+      },
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
             "command": "${CLAUDE_PLUGIN_ROOT}/scripts/detect-module.sh"
           }
         ],
@@ -46,6 +52,8 @@
           }
         ],
         "description": "Validate branch names follow conventions"
+      },
+      {
         "matcher": "tool == \"Write\" || tool == \"Edit\"",
         "hooks": [
           {
diff --git a/codex/code/hooks.json b/codex/code/hooks.json
index f1e847f..f8f6c42 100644
--- a/codex/code/hooks.json
+++ b/codex/code/hooks.json
@@ -11,6 +11,12 @@
           }
         ],
         "description": "Capture session history before each tool use"
+      },
+      {
+        "matcher": "*",
+        "hooks": [
+          {
+            "type": "command",
             "command": "${CLAUDE_PLUGIN_ROOT}/scripts/detect-module.sh"
           }
         ],
@@ -46,6 +52,8 @@
           }
         ],
         "description": "Validate branch names follow conventions"
+      },
+      {
         "matcher": "tool == \"Write\" || tool == \"Edit\"",
         "hooks": [
           {