diff --git a/.agents/plugins/marketplace.json b/.agents/plugins/marketplace.json
index 57dfb89..c2a1269 100644
--- a/.agents/plugins/marketplace.json
+++ b/.agents/plugins/marketplace.json
@@ -8,7 +8,7 @@
       "name": "fastsqla",
       "source": {
         "source": "local",
-        "path": "./plugins/fastsqla"
+        "path": "./plugin/fastsqla"
       },
       "policy": {
         "installation": "AVAILABLE",
diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 1fbb661..68c3fb1 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -9,7 +9,7 @@
   "plugins": [
     {
       "name": "fastsqla",
-      "source": "./plugins/fastsqla",
+      "source": "./plugin/fastsqla",
       "description": "Use FastSQLA's current setup, async session, and pagination APIs correctly.",
       "version": "1.0.0",
       "author": {
diff --git a/AGENTS.md b/AGENTS.md
index 17c7cd4..8b19170 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -7,6 +7,8 @@
 - Read the closest applicable `AGENTS.md` before changing files.
 - Inspect `git status` and existing diffs before modifying the worktree.
 - Record complex implementation plans as Bead notes before coding.
+- Keep the shared agent plugin at `plugin/fastsqla`; preserve the provider manifests in
+  `.claude-plugin` and `.codex-plugin`.
 
 ## Engineering
 
diff --git a/context7.json b/context7.json
index 3ebe5f5..79133db 100644
--- a/context7.json
+++ b/context7.json
@@ -4,7 +4,7 @@
   "public_key": "pk_HGTiXpaLrQ2YW61qLOKbF",
   "projectTitle": "FastSQLA",
   "description": "Async SQLAlchemy sessions and pagination for FastAPI, with optional SQLModel support.",
-  "folders": ["docs", "plugins/fastsqla/skills"],
+  "folders": ["docs", "plugin/fastsqla/skills"],
   "excludeFiles": ["CHANGELOG.md"],
   "rules": [
     "Configure FastAPI with fastsqla.lifespan or new_lifespan(); do not construct engines or sessions manually.",
diff --git a/plugins/fastsqla/.claude-plugin/plugin.json b/plugin/fastsqla/.claude-plugin/plugin.json
similarity index 100%
rename from plugins/fastsqla/.claude-plugin/plugin.json
rename to plugin/fastsqla/.claude-plugin/plugin.json
diff --git a/plugins/fastsqla/.codex-plugin/plugin.json b/plugin/fastsqla/.codex-plugin/plugin.json
similarity index 100%
rename from plugins/fastsqla/.codex-plugin/plugin.json
rename to plugin/fastsqla/.codex-plugin/plugin.json
diff --git a/plugins/fastsqla/skills/fastsqla-pagination/SKILL.md b/plugin/fastsqla/skills/fastsqla-pagination/SKILL.md
similarity index 100%
rename from plugins/fastsqla/skills/fastsqla-pagination/SKILL.md
rename to plugin/fastsqla/skills/fastsqla-pagination/SKILL.md
diff --git a/plugins/fastsqla/skills/fastsqla-session/SKILL.md b/plugin/fastsqla/skills/fastsqla-session/SKILL.md
similarity index 100%
rename from plugins/fastsqla/skills/fastsqla-session/SKILL.md
rename to plugin/fastsqla/skills/fastsqla-session/SKILL.md
diff --git a/plugins/fastsqla/skills/fastsqla-setup/SKILL.md b/plugin/fastsqla/skills/fastsqla-setup/SKILL.md
similarity index 100%
rename from plugins/fastsqla/skills/fastsqla-setup/SKILL.md
rename to plugin/fastsqla/skills/fastsqla-setup/SKILL.md