diff --git a/.changeset/auto-61dbddc18a508d13.md b/.changeset/auto-61dbddc18a508d13.md
new file mode 100644
index 0000000..c20dfe0
--- /dev/null
+++ b/.changeset/auto-61dbddc18a508d13.md
@@ -0,0 +1,5 @@
+---
+"claude-auto": patch
+---
+
+- Planned removal of npm publishing from release workflow
diff --git a/.changeset/auto-6996d801abfae4bd.md b/.changeset/auto-6996d801abfae4bd.md
new file mode 100644
index 0000000..07528d5
--- /dev/null
+++ b/.changeset/auto-6996d801abfae4bd.md
@@ -0,0 +1,5 @@
+---
+"claude-auto": patch
+---
+
+- Fixed release workflow to skip marketplace.json during version bumps
diff --git a/.changeset/auto-8bd793cd5c28600d.md b/.changeset/auto-8bd793cd5c28600d.md
new file mode 100644
index 0000000..d41bf60
--- /dev/null
+++ b/.changeset/auto-8bd793cd5c28600d.md
@@ -0,0 +1,5 @@
+---
+"claude-auto": patch
+---
+
+- Updated internal planning documentation to reflect completed work
diff --git a/.changeset/auto-a0ddc7c827a626a0.md b/.changeset/auto-a0ddc7c827a626a0.md
new file mode 100644
index 0000000..89934cc
--- /dev/null
+++ b/.changeset/auto-a0ddc7c827a626a0.md
@@ -0,0 +1,6 @@
+---
+"claude-auto": patch
+---
+
+- Removed legacy npm publish step from the release pipeline
+- Rewired downstream release gates to trigger from the version step
diff --git a/.changeset/auto-af5944bf2772eac0.md b/.changeset/auto-af5944bf2772eac0.md
new file mode 100644
index 0000000..e636e3e
--- /dev/null
+++ b/.changeset/auto-af5944bf2772eac0.md
@@ -0,0 +1,5 @@
+---
+"claude-auto": patch
+---
+
+- Updated internal planning notes to reflect completed work
diff --git a/.changeset/auto-cd0ce7bb235c2fa2.md b/.changeset/auto-cd0ce7bb235c2fa2.md
new file mode 100644
index 0000000..b1e62f6
--- /dev/null
+++ b/.changeset/auto-cd0ce7bb235c2fa2.md
@@ -0,0 +1,5 @@
+---
+"claude-auto": patch
+---
+
+- Fixed CI version-bump loop to skip marketplace.json, preventing unintended modifications during releases
diff --git a/.changeset/auto-fdc865e426431265.md b/.changeset/auto-fdc865e426431265.md
new file mode 100644
index 0000000..1c3ee44
--- /dev/null
+++ b/.changeset/auto-fdc865e426431265.md
@@ -0,0 +1,9 @@
+---
+"claude-auto": minor
+---
+
+- Migrated to plugin-only mode with native Claude Code plugin support via BeOnAuto/auto-plugins marketplace
+- Removed legacy npx installation, CLI system, and associated commands (install, doctor, repair, status, reminders, tui)
+- Added runtime config management with overrides and first-setup guidance via new /claude-auto:config skill
+- Fixed commit validation to respect validateCommit.mode off setting
+- Fixed plugin path resolution for skills context when only CLAUDE_PLUGIN_ROOT is set
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6dc3c1c..595c8d6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -108,7 +108,6 @@ jobs:
         with:
           node-version: 20
           cache: 'pnpm'
-          registry-url: 'https://registry.npmjs.org'
 
       - name: Install dependencies
         run: pnpm install --ignore-scripts
@@ -129,6 +128,7 @@ jobs:
         run: pnpm build
 
       - name: Version packages
+        id: version
         if: steps.check.outputs.has_changesets == 'true'
         run: |
           git config user.name "github-actions[bot]"
@@ -137,39 +137,27 @@ jobs:
           VERSION=$(node -p "require('./package.json').version")
           node -e "
             const fs = require('fs');
-            for (const f of ['plugin.json', 'marketplace.json']) {
-              const path = '.claude-plugin/' + f;
-              const data = JSON.parse(fs.readFileSync(path, 'utf8'));
-              if (data.version) data.version = '${VERSION}';
-              if (data.plugins) data.plugins.forEach(p => { if (p.name === 'claude-auto') p.version = '${VERSION}'; });
-              fs.writeFileSync(path, JSON.stringify(data, null, 2) + '\n');
-            }
+            const path = '.claude-plugin/plugin.json';
+            const data = JSON.parse(fs.readFileSync(path, 'utf8'));
+            data.version = '${VERSION}';
+            fs.writeFileSync(path, JSON.stringify(data, null, 2) + '\n');
           "
           git add .
           git commit -m "chore(release): version packages" || echo "No changes to commit"
           git push
+          echo "versioned=true" >> $GITHUB_OUTPUT
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Publish to npm
-        if: steps.check.outputs.has_changesets == 'true'
-        id: publish
-        run: |
-          git pull --rebase
-          pnpm publish --no-git-checks
-          echo "published=true" >> $GITHUB_OUTPUT
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
       - name: Create Git Tag
-        if: steps.publish.outputs.published == 'true'
+        if: steps.version.outputs.versioned == 'true'
         run: |
           VERSION=$(node -p "require('./package.json').version")
           git tag -a "v${VERSION}" -m "Release v${VERSION}"
           git push origin "v${VERSION}"
 
       - name: Create GitHub Release
-        if: steps.publish.outputs.published == 'true'
+        if: steps.version.outputs.versioned == 'true'
         run: |
           VERSION=$(node -p "require('./package.json').version")
           gh release create "v${VERSION}" \
@@ -180,7 +168,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Update marketplace
-        if: steps.publish.outputs.published == 'true'
+        if: steps.version.outputs.versioned == 'true'
         run: |
           VERSION=$(node -p "require('./package.json').version")
           gh api repos/BeOnAuto/auto-plugins/dispatches \
diff --git a/ketchup-plan.md b/ketchup-plan.md
index e69de29..13d23d6 100644
--- a/ketchup-plan.md
+++ b/ketchup-plan.md
@@ -0,0 +1,8 @@
+# Ketchup Plan: Fix release workflow after marketplace.json removal
+
+## TODO
+
+## DONE
+
+- [x] Burst 2: Remove legacy npm publish from release workflow, rewire tag/release/marketplace gates (a21da44)
+- [x] Burst 1: Remove `marketplace.json` from version-bump loop in ci.yml (2e153e9)