diff --git a/.claude-plugin/marketplace.json b/.claude-plugin/marketplace.json
index 2cfb93c..bf3b278 100644
--- a/.claude-plugin/marketplace.json
+++ b/.claude-plugin/marketplace.json
@@ -37,6 +37,11 @@
       "name": "sandbox-ssh-fix",
       "source": "./sandbox-ssh-fix",
       "strict": true
+    },
+    {
+      "name": "plan-review",
+      "source": "./plan-review",
+      "strict": true
     }
   ]
 }
diff --git a/README.md b/README.md
index 9a70e0c..ef3feb5 100644
--- a/README.md
+++ b/README.md
@@ -22,6 +22,7 @@ claude plugin marketplace add cblecker/claude-plugins
 | [gws](./gws)                                 | Google Workspace CLI skills for Gmail, Calendar, Drive, Docs, Sheets, Slides, and Meet          |
 | [rh-dataverse](./rh-dataverse)               | Red Hat Dataverse MCP server                                                                    |
 | [sandbox-ssh-fix](./sandbox-ssh-fix)         | Fixes git-over-SSH in the Claude Code sandbox on macOS by replacing the broken BSD nc SOCKS5 proxy |
+| [plan-review](./plan-review)                 | Pre-flight review of plan files before context clear                                             |
 
 ## License
 
diff --git a/plan-review/.claude-plugin/plugin.json b/plan-review/.claude-plugin/plugin.json
new file mode 100644
index 0000000..c221311
--- /dev/null
+++ b/plan-review/.claude-plugin/plugin.json
@@ -0,0 +1,10 @@
+{
+  "$schema": "https://json.schemastore.org/claude-plugin.json",
+  "name": "plan-review",
+  "version": "0.1.0",
+  "description": "Pre-flight review of plan files before context clear",
+  "author": {
+    "name": "cblecker",
+    "email": "admin@toph.ca"
+  }
+}
diff --git a/plan-review/README.md b/plan-review/README.md
new file mode 100644
index 0000000..6bb224e
--- /dev/null
+++ b/plan-review/README.md
@@ -0,0 +1,31 @@
+# Plan Review
+
+Pre-flight review of plan files before context clear. Ensures key decisions,
+file names, commands, and constraints from the conversation are captured in the
+plan file so a fresh context can execute it.
+
+## Usage
+
+```text
+/plan-review:finalize-plan
+```
+
+Invoke this while in plan mode, before accepting the plan and clearing context.
+
+## How It Works
+
+The skill runs three phases:
+
+1. **Pre-flight** — confirms plan mode is active. If not, it stops immediately.
+2. **Review** — reads the plan file and scans the conversation for details that
+   would be lost on context clear. It checks five categories:
+   - Decisions the user made between alternatives
+   - User corrections ("no, do it this way")
+   - Specific names (files, functions, types, CLI flags, tools, MCP resources)
+   - Exact build/test/run commands the user specified
+   - Constraints (ordering, compatibility, "don't touch X", style preferences)
+3. **Report** — if the plan already covers everything, says so in one sentence.
+   Otherwise lists gaps as brief bullets and offers to update the plan file.
+
+The skill skips anything a competent agent can rediscover from the codebase
+itself (line numbers, import paths, boilerplate structure).
diff --git a/plan-review/skills/finalize-plan/SKILL.md b/plan-review/skills/finalize-plan/SKILL.md
new file mode 100644
index 0000000..b73a105
--- /dev/null
+++ b/plan-review/skills/finalize-plan/SKILL.md
@@ -0,0 +1,38 @@
+---
+name: finalize-plan
+description: >-
+  Review a plan for completeness before accepting — ensures key decisions,
+  file names, commands, and constraints from the conversation are captured
+  in the plan file so a fresh context can execute it.
+---
+
+## Pre-flight: confirm plan mode
+
+Check your system context for a "Plan mode is active" reminder. If you are
+**not** in plan mode, tell the user and stop — this skill only applies during
+planning.
+
+## Review the plan
+
+Read the plan file (path is in the plan-mode system reminder).
+
+Scan the conversation for details that a **fresh context with only the plan
+file** would need to faithfully execute the work. Focus on:
+
+- **Decisions** — choices the user made between alternatives
+- **User corrections** — anything the user said "no, do it this way" about
+- **Specific names** — files, functions, types, CLI flags, tools, or MCP
+  resources the user referenced or you agreed to use
+- **Commands** — exact build/test/run commands the user specified
+- **Constraints** — ordering, compatibility, "don't touch X", style preferences
+
+Skip anything a competent agent can rediscover from the codebase itself (line
+numbers, import paths, boilerplate structure, surrounding code context).
+
+## Report
+
+If the plan already covers everything: say so in one sentence.
+
+Otherwise list what's missing — brief bullets, each naming the gap and
+suggesting what to add. Then offer to update the plan file with the missing
+details.