diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
new file mode 100644
index 00000000..8787e9ad
--- /dev/null
+++ b/.claude-plugin/marketplace.json
@@ -0,0 +1,17 @@
+{
+  "name": "get-shit-done",
+  "owner": {
+    "name": "glittercowboy"
+  },
+  "plugins": [
+    {
+      "name": "get-shit-done",
+      "description": "A meta-prompting, context engineering and spec-driven development system for Claude Code by TÂCHES.",
+      "author": {
+        "name": "TÂCHES"
+      },
+      "version": "1.3.20",
+      "source": "./"
+    }
+  ]
+}
diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
new file mode 100644
index 00000000..c7d13d88
--- /dev/null
+++ b/.claude-plugin/plugin.json
@@ -0,0 +1,31 @@
+{
+  "name": "get-shit-done",
+  "version": "1.3.20",
+  "description": "A meta-prompting, context engineering and spec-driven development system for Claude Code by TÂCHES.",
+  "author": {
+    "name": "TÂCHES"
+  },
+  "license": "MIT",
+  "repository": "https://github.com/glittercowboy/get-shit-done",
+  "commands": [
+    "./commands/gsd/new-project.md",
+    "./commands/gsd/create-roadmap.md",
+    "./commands/gsd/map-codebase.md",
+    "./commands/gsd/plan-phase.md",
+    "./commands/gsd/execute-plan.md",
+    "./commands/gsd/progress.md",
+    "./commands/gsd/complete-milestone.md",
+    "./commands/gsd/discuss-milestone.md",
+    "./commands/gsd/new-milestone.md",
+    "./commands/gsd/add-phase.md",
+    "./commands/gsd/insert-phase.md",
+    "./commands/gsd/discuss-phase.md",
+    "./commands/gsd/research-phase.md",
+    "./commands/gsd/list-phase-assumptions.md",
+    "./commands/gsd/pause-work.md",
+    "./commands/gsd/resume-work.md",
+    "./commands/gsd/consider-issues.md",
+    "./commands/gsd/help.md",
+    "./commands/gsd/auto.md"
+  ]
+}
diff --git a/README.md b/README.md
index 518a89fe..7f71c4c3 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,26 @@ GSD fixes that. It's the context engineering layer that makes Claude Code reliab
 
 People who want to describe what they want and have it built correctly — without pretending they're running a 50-person engineering org.
 
+### Marketplace Installation
+
+Install from the Claude Code marketplace:
+
+```bash
+/plugin marketplace add glittercowboy/get-shit-done
+/plugin install get-shit-done@get-shit-done
+```
+
+### Manual Installation
+
+Clone the repository and tell Claude Code where to find it:
+
+```bash
+git clone https://github.com/glittercowboy/get-shit-done.git
+claude --plugin-dir ./get-shit-done
+```
+
+Useful for development or testing modifications.
+
 ---
 
 ## Why I Built This
@@ -254,6 +274,18 @@ You're never locked in. The system adapts.
 
 ---
 
+## Troubleshooting
+
+**Plugin not found after install?**
+- Restart Claude Code to reload plugins
+- Check `/plugins` to see installed plugins
+
+**Commands showing as unavailable?**
+- Verify plugin directory structure: should have `.claude-plugin/plugin.json`
+- Try `/gsd:help` - if it works, plugin is loaded correctly
+
+---
+
 ## License
 
 MIT License. See [LICENSE](LICENSE) for details.
diff --git a/commands/gsd/add-phase.md b/commands/gsd/add-phase.md
index 5bc93d46..4aaa71a8 100644
--- a/commands/gsd/add-phase.md
+++ b/commands/gsd/add-phase.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:add-phase
 description: Add phase to end of current milestone in roadmap
 argument-hint: <description>
 allowed-tools:
diff --git a/commands/gsd/complete-milestone.md b/commands/gsd/complete-milestone.md
index 5bc0e95c..6e2395c8 100644
--- a/commands/gsd/complete-milestone.md
+++ b/commands/gsd/complete-milestone.md
@@ -1,5 +1,6 @@
 ---
 type: prompt
+name: gsd:complete-milestone
 description: Archive completed milestone and prepare for next version
 argument-hint: <version>
 allowed-tools:
diff --git a/commands/gsd/consider-issues.md b/commands/gsd/consider-issues.md
index b0e7341b..862dfe97 100644
--- a/commands/gsd/consider-issues.md
+++ b/commands/gsd/consider-issues.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:consider-issues
 description: Review deferred issues with codebase context, close resolved ones, identify urgent ones
 allowed-tools:
   - Read
diff --git a/commands/gsd/create-roadmap.md b/commands/gsd/create-roadmap.md
index a01444c9..218a7391 100644
--- a/commands/gsd/create-roadmap.md
+++ b/commands/gsd/create-roadmap.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:create-roadmap
 description: Create roadmap with phases for the project
 allowed-tools:
   - Read
diff --git a/commands/gsd/discuss-milestone.md b/commands/gsd/discuss-milestone.md
index 43da5c9e..221e3d2d 100644
--- a/commands/gsd/discuss-milestone.md
+++ b/commands/gsd/discuss-milestone.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:discuss-milestone
 description: Gather context for next milestone through adaptive questioning
 ---
 
diff --git a/commands/gsd/discuss-phase.md b/commands/gsd/discuss-phase.md
index 34427b8c..3670d6f7 100644
--- a/commands/gsd/discuss-phase.md
+++ b/commands/gsd/discuss-phase.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:discuss-phase
 description: Gather phase context through adaptive questioning before planning
 argument-hint: "[phase]"
 ---
diff --git a/commands/gsd/execute-plan.md b/commands/gsd/execute-plan.md
index 18550517..a301c8bd 100644
--- a/commands/gsd/execute-plan.md
+++ b/commands/gsd/execute-plan.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:execute-plan
 description: Execute a PLAN.md file
 argument-hint: "[path-to-PLAN.md]"
 allowed-tools:
diff --git a/commands/gsd/help.md b/commands/gsd/help.md
index 4d3d3599..e11ac212 100644
--- a/commands/gsd/help.md
+++ b/commands/gsd/help.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:help
 description: Show available GSD commands and usage guide
 ---
 
diff --git a/commands/gsd/insert-phase.md b/commands/gsd/insert-phase.md
index 5678278a..1f5509e6 100644
--- a/commands/gsd/insert-phase.md
+++ b/commands/gsd/insert-phase.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:insert-phase
 description: Insert urgent work as decimal phase (e.g., 72.1) between existing phases
 argument-hint: <after> <description>
 allowed-tools:
diff --git a/commands/gsd/list-phase-assumptions.md b/commands/gsd/list-phase-assumptions.md
index 2b74014d..4f7a0a99 100644
--- a/commands/gsd/list-phase-assumptions.md
+++ b/commands/gsd/list-phase-assumptions.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:list-phase-assumptions
 description: Surface Claude's assumptions about a phase approach before planning
 argument-hint: "[phase]"
 allowed-tools:
diff --git a/commands/gsd/map-codebase.md b/commands/gsd/map-codebase.md
index cadc9356..ff3530e5 100644
--- a/commands/gsd/map-codebase.md
+++ b/commands/gsd/map-codebase.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:map-codebase
 description: Analyze codebase with parallel Explore agents to produce .planning/codebase/ documents
 argument-hint: "[optional: specific area to map, e.g., 'api' or 'auth']"
 allowed-tools:
diff --git a/commands/gsd/new-milestone.md b/commands/gsd/new-milestone.md
index 64d8d6f7..dd8c8f61 100644
--- a/commands/gsd/new-milestone.md
+++ b/commands/gsd/new-milestone.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:new-milestone
 description: Create a new milestone with phases for an existing project
 argument-hint: "[milestone name, e.g., 'v2.0 Features']"
 ---
diff --git a/commands/gsd/new-project.md b/commands/gsd/new-project.md
index e6bb5728..d055a403 100644
--- a/commands/gsd/new-project.md
+++ b/commands/gsd/new-project.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:new-project
 description: Initialize a new project with deep context gathering and PROJECT.md
 allowed-tools:
   - Read
diff --git a/commands/gsd/pause-work.md b/commands/gsd/pause-work.md
index d8441905..63fa4c87 100644
--- a/commands/gsd/pause-work.md
+++ b/commands/gsd/pause-work.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:pause-work
 description: Create context handoff when pausing work mid-phase
 allowed-tools:
   - Read
diff --git a/commands/gsd/plan-phase.md b/commands/gsd/plan-phase.md
index 4f32e587..7477bee1 100644
--- a/commands/gsd/plan-phase.md
+++ b/commands/gsd/plan-phase.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:plan-phase
 description: Create detailed execution plan for a phase (PLAN.md)
 argument-hint: "[phase]"
 allowed-tools:
diff --git a/commands/gsd/progress.md b/commands/gsd/progress.md
index 9b800f3a..b2d9da54 100644
--- a/commands/gsd/progress.md
+++ b/commands/gsd/progress.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:progress
 description: Check project progress, show context, and route to next action (execute or plan)
 allowed-tools:
   - Read
diff --git a/commands/gsd/research-phase.md b/commands/gsd/research-phase.md
index afd08bed..59d4fdcd 100644
--- a/commands/gsd/research-phase.md
+++ b/commands/gsd/research-phase.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:research-phase
 description: Research how to implement a phase before planning
 argument-hint: "[phase]"
 allowed-tools:
diff --git a/commands/gsd/resume-work.md b/commands/gsd/resume-work.md
index 833f8c38..56e2a597 100644
--- a/commands/gsd/resume-work.md
+++ b/commands/gsd/resume-work.md
@@ -1,4 +1,5 @@
 ---
+name: gsd:resume-work
 description: Resume work from previous session with full context restoration
 allowed-tools:
   - Read