Auto-merge docs PRs, remove manual doc generation requirement

.github/workflows/update-docs.yml

@@ -6,6 +6,11 @@ on:
       - main
     paths:
       - 'plugins/**'
+      - '.claude-plugin/marketplace.json'
+
+concurrency:
+  group: update-docs
+  cancel-in-progress: true
 
 jobs:
   update-docs:
@@ -34,6 +39,7 @@ jobs:
           skillsaw docs -o docs/ --theme crimson-red
 
       - name: Create Pull Request
+        id: create-pr
         uses: peter-evans/create-pull-request@5f6978faf089d4d20b00c7766989d076bb2fc7f1 # v8.1.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -50,3 +56,14 @@ jobs:
           add-paths: |
             docs/
             .claude-plugin/marketplace.json
+
+      - name: Enable auto-merge if only docs changed
+        if: steps.create-pr.outputs.pull-request-number
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          PR_NUMBER="${{ steps.create-pr.outputs.pull-request-number }}"
+          FILES_CHANGED=$(gh pr diff "$PR_NUMBER" --name-only)
+          if [ "$FILES_CHANGED" = "docs/index.html" ]; then
+            gh pr merge "$PR_NUMBER" --auto --squash
+          fi

.skillsaw.yaml

@@ -91,7 +91,6 @@ rules:
 
 # Load custom rules from these files
 custom-rules:
-  - ".skillsaw/plugindocs_rule.py"
   - ".skillsaw/owners_rule.py"
   - ".skillsaw/promptfoo_budget_rule.py"
 

AGENTS.md

@@ -24,7 +24,7 @@ Canonical example: `plugins/hello-world/`
 |---------|------|
 | `make lint` | Before every commit — validates structure, format, and marketplace registration |
 | Bump `version` in `plugin.json` | When modifying plugin commands or skills (not README-only changes) |
-| `make update` | After version bumps — syncs marketplace.json and regenerates docs |
+| `make update` | After version bumps — syncs marketplace.json (docs are auto-generated by CI) |
 
 ## Contributing Rules
 

CONTRIBUTING.md

@@ -9,7 +9,7 @@ Thank you for your interest in contributing to the ai-helpers plugin marketplace
 3. Add at least one command in `commands/`
 4. Add an `OWNERS` file listing approvers and reviewers for your plugin
 5. Register your plugin in `.claude-plugin/marketplace.json`
-6. Run `make lint` to validate, then `make update` to regenerate docs
+6. Run `make lint` to validate
 
 ### OWNERS File
 
@@ -49,8 +49,7 @@ If your PR modifies plugin code (commands, skills, hooks, or plugin.json), you *
 3. Make your changes
 4. Bump the version in `plugin.json` if modifying plugin code
 5. Run `make lint` to validate plugin structure
-6. Run `make update` to regenerate docs
-7. Submit a PR
+6. Submit a PR
 
 ### Testing locally
 
@@ -66,7 +65,7 @@ You can test plugins locally before submitting:
 The following files are auto-generated and should **not** be edited manually:
 - `docs/index.html`
 
-These are regenerated by running `make update` which uses `skillsaw docs`.
+Documentation is automatically regenerated by CI when plugin changes are merged to `main`.
 
 ## Command Frontmatter
 

Makefile

@@ -28,12 +28,14 @@ lint-pull: ## Pull the latest skillsaw image
 	$(CONTAINER_RUNTIME) pull $(SKILLSAW_IMAGE)
 
 .PHONY: update
-update: ## Update plugin documentation and website data
+update: ## Fix frontmatter and sync marketplace versions
 	@echo "Fixing frontmatter quotes, if any..."
 	@python3 scripts/fix_frontmatter_quotes.py
 	@echo "Syncing marketplace versions..."
 	@python3 scripts/sync_marketplace_versions.py
-	@echo "Generating docs..."
+
+.PHONY: docs
+docs: ## Preview generated documentation locally
 	$(CONTAINER_RUNTIME) run --rm --platform linux/amd64 $(SELINUX_OPT) -v $(PWD):/workspace:Z --entrypoint skillsaw $(SKILLSAW_IMAGE) docs -o docs/ --theme crimson-red
 
 EVAL_REPEAT ?= 1