diff --git a/.augment-plugin/marketplace.json b/.augment-plugin/marketplace.json
new file mode 100644
index 0000000..5124f8f
--- /dev/null
+++ b/.augment-plugin/marketplace.json
@@ -0,0 +1,20 @@
+{
+  "name": "auggie-marketplace",
+  "description": "Official Auggie plugin marketplace with code review and developer productivity tools",
+  "version": "1.0.0",
+  "author": {
+    "name": "Augment Code"
+  },
+  "homepage": "https://github.com/augmentcode/auggie",
+  "repository": "https://github.com/augmentcode/auggie",
+  "plugins": [
+    {
+      "name": "code-review",
+      "description": "Code review commands and agents for local code reviews powered by git diffs against origin/main",
+      "version": "1.0.0",
+      "source": "./plugin_marketplace/code-review",
+      "category": "code-quality",
+      "tags": ["code-review", "git", "commands", "agents"]
+    }
+  ]
+}
diff --git a/plugin_marketplace/code-review/.augment-plugin/plugin.json b/plugin_marketplace/code-review/.augment-plugin/plugin.json
new file mode 100644
index 0000000..316d4fa
--- /dev/null
+++ b/plugin_marketplace/code-review/.augment-plugin/plugin.json
@@ -0,0 +1,9 @@
+{
+  "name": "code-review",
+  "description": "Code review commands and agents for local code reviews",
+  "version": "1.0.0",
+  "author": {
+    "name": "Augment Code"
+  },
+  "keywords": ["code-review", "git", "commands", "agents"]
+}
diff --git a/plugin_marketplace/code-review/agents/local-analyzer.md b/plugin_marketplace/code-review/agents/local-analyzer.md
new file mode 100644
index 0000000..472c16b
--- /dev/null
+++ b/plugin_marketplace/code-review/agents/local-analyzer.md
@@ -0,0 +1,58 @@
+---
+name: code-review-local-analyzer
+description: Fetch local changes (diff against main) to perform code review
+model: "code-review"
+color: yellow
+---
+
+**IMPORTANT: This is a dry-run review. Do NOT post any comments to GitHub. Return all findings as a summary to the user.**
+
+You are a specialized agent that gathers local changes and reviews the code
+
+Scope:
+- Fetch local git diff and changed files against origin/main.
+- Perform code review of these changes
+
+Tooling constraints:
+- Allowed tools: `launch-process`, `view`
+- Disallowed tools: `github-api`
+
+## Steps
+
+1. Run `git fetch origin main` to ensure accurate comparison
+2. Run `git diff origin/main...HEAD` to get the full diff of committed changes
+3. Run `git diff --stat origin/main...HEAD` to get file statistics
+4. Run `git diff --name-only origin/main...HEAD` to list changed files
+5. If there are uncommitted changes, include those as well:
+   - **Staged changes:** `git diff --staged` (changes staged in the index vs HEAD)
+   - **Unstaged changes:** `git diff` (working tree vs index)
+   - Note: These diffs are relative to the current HEAD/index, not origin/main. They represent work-in-progress that hasn't been committed yet.
+
+## Output
+
+Return the following to the parent agent:
+
+```
+## Local Changes Summary
+
+Branch: [branch-name] | Base: origin/main | Commits: [N]
+Files: [N] | +[additions] -[deletions]
+
+[One sentence describing what this change set does]
+
+## Review Findings
+
+1. [file/path.ext]:[line(s)]
+
+   Severity: [low|medium|high]
+   [Description of issue and suggested fix]
+
+2. [file/path.ext]:[line(s)]
+
+   Severity: [low|medium|high]
+   [Description of issue and suggested fix]
+```
+
+Focus on high-signal issues—bugs, security, logic errors. Skip style nitpicks.
+
+**Do NOT post any comments to GitHub. Return findings as a summary only.**
diff --git a/plugin_marketplace/code-review/commands/local.md b/plugin_marketplace/code-review/commands/local.md
new file mode 100644
index 0000000..b5225bf
--- /dev/null
+++ b/plugin_marketplace/code-review/commands/local.md
@@ -0,0 +1,82 @@
+---
+description: "Perform a thorough code review on local changes and return findings as a summary (no comments posted)"
+model: "code-review"
+---
+
+**IMPORTANT: This is a dry-run review. Do NOT post any comments to GitHub. Return all findings as a summary to the user.**
+
+Tooling constraints:
+- Allowed tools: `launch-process`, `view`
+- Disallowed tools: `github-api`
+
+## Step 1: Gather Changes to Review
+
+Run the following git commands to gather local changes:
+
+1. Run `git fetch origin main` to ensure accurate comparison
+2. Run `git diff origin/main...HEAD` to get the full diff of committed changes
+3. Run `git diff --stat origin/main...HEAD` to get file statistics
+4. Run `git diff --name-only origin/main...HEAD` to list changed files
+5. If there are uncommitted changes, include those as well:
+   - **Staged changes:** `git diff --staged` (changes staged in the index vs HEAD)
+   - **Unstaged changes:** `git diff` (working tree vs index)
+   - Note: These diffs are relative to the current HEAD/index, not origin/main. They represent work-in-progress that hasn't been committed yet.
+
+### Changes Summary Format
+
+After gathering the data, organize it as follows:
+
+**Proposed Changes Summary:**
+- [One sentence describing what this change set does]
+- **Files changed:** [count]
+- **Additions:** [+lines] | **Deletions:** [-lines]
+
+## Step 2: Check for Custom Guidelines
+
+Look for custom code review guidelines in the repository:
+- Check if `.augment/code_review_guidelines.yaml` exists in the repository root
+- If the file doesn't exist or can't be read, skip this step and proceed without custom guidelines
+- If found, read the file and identify areas and rules relevant to the changed files:
+  - Match file paths from Step 1 against the `globs` patterns in each area
+  - Collect the matching rules to apply during review
+  - Do not apply custom guidelines to Augment internal files (`.augment/**/*.md`)
+
+When referencing a custom guideline in your review findings, mention it using the format:
+`(Guideline: <guideline_id>)`
+
+## Step 3: Review the Changes
+
+Analyze the diff and identify issues. Apply any custom guidelines loaded in Step 2. Focus on high confidence findings—bugs, security issues, logic errors. Skip low-severity issues unless they indicate a pattern.
+
+## Step 4: Format the Review Summary
+
+Present the review using this format:
+
+```
+## Local Changes Summary
+
+Branch: [branch-name] | Base: origin/main | Commits: [N]
+Files: [N] | +[additions] -[deletions]
+
+[One sentence describing what this change set does]
+
+## Review Findings
+
+1. [file/path.ext]:[line(s)]
+
+   Severity: [low|medium|high]
+   [Description of issue and suggested fix]
+
+2. [file/path.ext]:[line(s)]
+
+   Severity: [low|medium|high]
+   [Description of issue and suggested fix]
+```
+
+## Guidelines
+
+- Be specific with file paths and line numbers
+- Explain *why* something is problematic
+- Skip style nitpicks if there are real bugs
+
+**Do NOT post any comments to GitHub. Return findings as a summary only.**