diff --git a/.agents/plugins/marketplace.json b/.agents/plugins/marketplace.json
index 7fadec61..5d45bf7f 100644
--- a/.agents/plugins/marketplace.json
+++ b/.agents/plugins/marketplace.json
@@ -1126,6 +1126,18 @@
       },
       "category": "Productivity"
     },
+    {
+      "name": "tanstack",
+      "source": {
+        "source": "local",
+        "path": "./plugins/tanstack"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "Framework"
+    },
     {
       "name": "run-verify",
       "source": {
@@ -1151,10 +1163,108 @@
       "category": "UI"
     },
     {
-      "name": "tanstack",
+      "name": "shunt-codex",
       "source": {
-        "source": "local",
-        "path": "./plugins/tanstack"
+        "source": "git-subdir",
+        "url": "https://github.com/pleaseai/shunt.git",
+        "path": "./plugins/shunt-codex",
+        "ref": "main"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "AI"
+    },
+    {
+      "name": "shunt-xai",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/pleaseai/shunt.git",
+        "path": "./plugins/shunt-xai",
+        "ref": "main"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "AI"
+    },
+    {
+      "name": "shunt-kimi",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/pleaseai/shunt.git",
+        "path": "./plugins/shunt-kimi",
+        "ref": "main"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "AI"
+    },
+    {
+      "name": "shunt-deepseek",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/pleaseai/shunt.git",
+        "path": "./plugins/shunt-deepseek",
+        "ref": "main"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "AI"
+    },
+    {
+      "name": "shunt-zai",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/pleaseai/shunt.git",
+        "path": "./plugins/shunt-zai",
+        "ref": "main"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "AI"
+    },
+    {
+      "name": "shunt-minimax",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/pleaseai/shunt.git",
+        "path": "./plugins/shunt-minimax",
+        "ref": "main"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "AI"
+    },
+    {
+      "name": "shunt-mimo",
+      "source": {
+        "source": "git-subdir",
+        "url": "https://github.com/pleaseai/shunt.git",
+        "path": "./plugins/shunt-mimo",
+        "ref": "main"
+      },
+      "policy": {
+        "installation": "AVAILABLE",
+        "authentication": "ON_INSTALL"
+      },
+      "category": "AI"
+    },
+    {
+      "name": "spring",
+      "source": {
+        "source": "url",
+        "url": "https://github.com/pleaseai/spring-plugin.git"
       },
       "policy": {
         "installation": "AVAILABLE",
diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 77b0165f..3ace2da6 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -1653,6 +1653,33 @@
         "ref": "main"
       },
       "homepage": "https://github.com/pleaseai/shunt/tree/main/plugins/shunt-mimo"
+    },
+    {
+      "name": "spring",
+      "description": "Answers Spring questions from the reference documentation of the version your project declares, not the newest release.",
+      "category": "framework",
+      "keywords": ["spring", "spring-boot", "java", "kotlin", "documentation"],
+      "tags": ["framework", "docs", "skills"],
+      "source": {
+        "source": "github",
+        "repo": "pleaseai/spring-plugin"
+      },
+      "homepage": "https://github.com/pleaseai/spring-plugin",
+      "relevance": {
+        "topic": "Spring",
+        "signals": {
+          "filesRead": [
+            "**/src/main/resources/application*.yml",
+            "**/src/main/resources/application*.yaml",
+            "**/src/main/resources/application*.properties"
+          ],
+          "manifestDeps": [
+            { "file": "[/\\\\]pom\\.xml$", "pattern": "spring-boot" },
+            { "file": "[/\\\\]build\\.gradle(\\.kts)?$", "pattern": "org\\.springframework\\.boot" },
+            { "file": "[/\\\\]libs\\.versions\\.toml$", "pattern": "org\\.springframework\\.boot" }
+          ]
+        }
+      }
     }
   ]
 }
diff --git a/.cursor-plugin/marketplace.json b/.cursor-plugin/marketplace.json
index ff31f0a7..8c1b1899 100644
--- a/.cursor-plugin/marketplace.json
+++ b/.cursor-plugin/marketplace.json
@@ -364,15 +364,15 @@
       "source": "./plugins/greptile",
       "description": "Greptile agent skills for PR quality: check PR review comments and status checks, run Greptile CLI reviews on local branches, and iteratively improve PRs until they score 5/5"
     },
-    {
-      "name": "shadcn-ui",
-      "source": "./plugins/shadcn-ui",
-      "description": "Manages shadcn/ui components and projects — adding, searching, fixing, styling, and composing UI — plus migrating from Radix UI to Base UI."
-    },
     {
       "name": "tanstack",
       "source": "./plugins/tanstack",
       "description": "Version-aware skills for the TanStack ecosystem (Query, Router, Start, Table, Form, DB, Virtual, ...) via the official @tanstack/intent CLI — loads skills shipped inside the installed npm packages"
+    },
+    {
+      "name": "shadcn-ui",
+      "source": "./plugins/shadcn-ui",
+      "description": "Manages shadcn/ui components and projects — adding, searching, fixing, styling, and composing UI — plus migrating from Radix UI to Base UI."
     }
   ]
 }