Skip to content

feat: add mattpocock skills, drop superpowers plugin - #872

Merged
yxtay merged 1 commit into
mainfrom
feat/mattpocock-skills-drop-superpowers
Jul 7, 2026
Merged

feat: add mattpocock skills, drop superpowers plugin#872
yxtay merged 1 commit into
mainfrom
feat/mattpocock-skills-drop-superpowers

Conversation

@yxtay

@yxtay yxtay commented Jul 7, 2026

Copy link
Copy Markdown
Owner

Summary

  • Add mattpocock/skills entries (setup, docs, grilling, domain-modeling, prd/issue drafting, research, codebase-design, tdd, architecture, bug-diagnosing) to the agent skills install list
  • Drop superpowers@claude-plugins-official from claude plugin install list
  • Drop superpowers from opencode plugin list

Test plan

  • pre-commit hooks pass
  • chezmoi apply picks up new skill entries and installs mattpocock skills correctly

Summary by CodeRabbit

  • Chores
    • Expanded the available skill sets configured for repository automation, adding more options for setup, documentation, research, architecture, debugging, and planning workflows.
    • Updated local AI tool/plugin setup to use a streamlined plugin list.
    • Removed one previously included plugin from the OpenCode configuration, keeping the remaining integrations intact.

superpowers forces skill-check before every action, adding overhead
without matching workflow needs. mattpocock skills cover similar
ground (tdd, debugging, prd/issue drafting) with less ceremony.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request removes the 'superpowers' plugin from the Claude setup and opencode templates, and adds several new agent skills from the 'mattpocock/skills' repository. The feedback suggests combining the two separate 'mattpocock/skills' entries into a single line to prevent redundant executions of the installation script and improve performance.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment on lines +32 to +33
mattpocock/skills=setup-matt-pocock-skills,grill-with-docs,grilling,domain-modeling,to-prd,to-issues
mattpocock/skills=research,codebase-design,tdd,improve-codebase-architecture,diagnosing-bugs

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

These two entries for mattpocock/skills can be combined into a single entry. Since each entry in repo_skills triggers a separate npx --yes skills add execution, combining them avoids running npx twice for the same repository, which significantly improves the script's execution speed.

  mattpocock/skills=setup-matt-pocock-skills,grill-with-docs,grilling,domain-modeling,to-prd,to-issues,research,codebase-design,tdd,improve-codebase-architecture,diagnosing-bugs

@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown

Review Change Stack

📝 Walkthrough

Walkthrough

This PR expands the repo_skills array in the agent plugins setup script to add two new mattpocock/skills groups, and removes the superpowers plugin from both the Claude plugin installation script and the OpenCode configuration template.

Changes

Skills Expansion and Superpowers Removal

Layer / File(s) Summary
Add mattpocock/skills groups
chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl
Adds two new skill groups for mattpocock/skills, including setup-matt-pocock-skills, grill-with-docs, grilling, domain-modeling, to-prd, to-issues, research, codebase-design, tdd, improve-codebase-architecture, and diagnosing-bugs.
Remove superpowers plugin
chezmoi/.chezmoiscripts/run_onchange_setup_claude.sh.tmpl, chezmoi/.chezmoitemplates/opencode.json
Removes superpowers@claude-plugins-official from the Claude plugin install list and the corresponding superpowers git-based entry from the OpenCode plugin configuration.

Estimated code review effort: 1 (Trivial) | ~3 minutes

Possibly related PRs

  • yxtay/dotfiles#850: Both PRs modify the Claude plugin install list in the same setup script.
  • yxtay/dotfiles#851: Both PRs modify the same plugins array in run_onchange_setup_claude.sh.tmpl.
  • yxtay/dotfiles#857: Both PRs prune entries from the same Claude plugin installation list.

Poem

A rabbit hops through config trees,
Trimming plugins with gentle ease,
New skills sprout where old ones fade,
A tidier warren, carefully made,
Thump-thump! 🐰✨ the dotfiles cheer.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the main changes: adding mattpocock skills and removing the superpowers plugin.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch feat/mattpocock-skills-drop-superpowers

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

⚠️MegaLinter analysis: Success with warnings

Descriptor Linter Files Fixed Errors Warnings Elapsed time
✅ BASH shfmt 3 0 0 0 0.02s
⚠️ JSON prettier 9 0 1 0 0.43s
⚠️ MARKDOWN markdownlint 6 0 2 0 0.58s
✅ MARKDOWN markdown-table-formatter 6 0 0 0 0.16s
✅ YAML prettier 10 0 0 0 0.51s

Detailed Issues

⚠️ MARKDOWN / markdownlint - 2 errors
chezmoi/private_dot_claude/modify_CLAUDE.md:1 error MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading [Context: "{{- /*chezmoi:modify-template*..."]
chezmoi/private_dot_config/opencode/modify_AGENTS.md:1 error MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading [Context: "{{- /*chezmoi:modify-template*..."]
⚠️ JSON / prettier - 1 error
chezmoi/.chezmoitemplates/claude-settings.json 67ms (unchanged)
chezmoi/.chezmoitemplates/mcp_servers.json 5ms (unchanged)
chezmoi/.chezmoitemplates/opencode-tui.json 2ms (unchanged)
chezmoi/.chezmoitemplates/opencode.json 6ms (unchanged)
[error] chezmoi/private_dot_claude/modify_settings.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
[error] chezmoi/private_dot_config/mcp/modify_mcp_servers.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
[error] chezmoi/private_dot_config/opencode/modify_opencode.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
[error] chezmoi/private_dot_config/opencode/modify_tui.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
renovate.json 5ms (unchanged)

Notices

📣 MegaLinter 9.5.0 is out! Discover the new features and security recommendations in the release announcement. (Skip this info by defining SECURITY_SUGGESTIONS: false)

See detailed reports in MegaLinter artifacts

Your project could benefit from a custom flavor, which would allow you to run only the linters you need, and thus improve runtime performances. (Skip this info by defining FLAVOR_SUGGESTIONS: false)

  • Documentation: Custom Flavors
  • Command: npx mega-linter-runner@9.5.0 --custom-flavor-setup --custom-flavor-linters BASH_SHFMT,JSON_PRETTIER,MARKDOWN_MARKDOWNLINT,MARKDOWN_MARKDOWN_TABLE_FORMATTER,YAML_PRETTIER

MegaLinter is graciously provided by OX Security
Show us your support by starring ⭐ the repository

@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

⚠️MegaLinter analysis: Success with warnings

Descriptor Linter Files Fixed Errors Warnings Elapsed time
✅ BASH bash-exec 3 0 0 0.01s
✅ BASH shellcheck 3 0 0 0.1s
✅ REPOSITORY checkov yes no no 22.52s
✅ REPOSITORY devskim yes no no 1.95s
✅ REPOSITORY dustilock yes no no 0.02s
✅ REPOSITORY gitleaks yes no no 2.09s
✅ REPOSITORY grype yes no no 47.26s
✅ REPOSITORY kingfisher yes no no 9.38s
⚠️ REPOSITORY osv-scanner yes 1 no 0.1s
✅ REPOSITORY secretlint yes no no 1.87s
✅ REPOSITORY syft yes no no 2.03s
✅ REPOSITORY trivy yes no no 10.72s
✅ REPOSITORY trivy-sbom yes no no 0.13s
✅ REPOSITORY trufflehog yes no no 3.93s

Detailed Issues

⚠️ REPOSITORY / osv-scanner - 1 error
Scanning dir .
Starting filesystem walk for root: /
End status: 40 dirs visited, 138 inodes visited, 0 Extract calls, 2.950327ms elapsed, 2.950508ms wall time
No package sources found, --help for usage information.

Notices

📣 MegaLinter 9.5.0 is out! Discover the new features and security recommendations in the release announcement. (Skip this info by defining SECURITY_SUGGESTIONS: false)

See detailed reports in MegaLinter artifacts

Your project could benefit from a custom flavor, which would allow you to run only the linters you need, and thus improve runtime performances. (Skip this info by defining FLAVOR_SUGGESTIONS: false)

  • Documentation: Custom Flavors
  • Command: npx mega-linter-runner@9.5.0 --custom-flavor-setup --custom-flavor-linters BASH_EXEC,BASH_SHELLCHECK,REPOSITORY_CHECKOV,REPOSITORY_DEVSKIM,REPOSITORY_DUSTILOCK,REPOSITORY_GITLEAKS,REPOSITORY_GRYPE,REPOSITORY_OSV_SCANNER,REPOSITORY_SECRETLINT,REPOSITORY_SYFT,REPOSITORY_TRIVY,REPOSITORY_TRIVY_SBOM,REPOSITORY_TRUFFLEHOG,REPOSITORY_KINGFISHER

MegaLinter is graciously provided by OX Security
Show us your support by starring ⭐ the repository

@github-actions

github-actions Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

⚠️MegaLinter analysis: Success with warnings

Descriptor Linter Files Fixed Errors Warnings Elapsed time
✅ ACTION actionlint 5 0 0 0.36s
✅ ACTION zizmor 5 0 0 0 0.87s
✅ BASH bash-exec 3 0 0 0.01s
✅ BASH shellcheck 3 0 0 0.13s
✅ BASH shfmt 3 0 0 0 0.02s
✅ COPYPASTE jscpd yes no no 0.75s
✅ EDITORCONFIG editorconfig-checker 67 0 0 0.12s
⚠️ JSON prettier 9 0 1 0 0.59s
✅ JSON v8r 9 0 0 3.7s
⚠️ MARKDOWN markdownlint 6 0 2 0 0.68s
✅ MARKDOWN markdown-table-formatter 6 0 0 0 0.2s
✅ REPOSITORY checkov yes no no 22.66s
✅ REPOSITORY gitleaks yes no no 1.37s
✅ REPOSITORY git_diff yes no no 0.08s
✅ REPOSITORY grype yes no no 47.29s
⚠️ REPOSITORY osv-scanner yes 1 no 0.19s
✅ REPOSITORY secretlint yes no no 1.19s
✅ REPOSITORY syft yes no no 3.26s
✅ REPOSITORY trivy yes no no 11.1s
✅ REPOSITORY trivy-sbom yes no no 0.17s
✅ REPOSITORY trufflehog yes no no 3.51s
⚠️ SPELL lychee 25 2 0 1.4s
✅ YAML prettier 10 0 0 0 0.48s
✅ YAML v8r 10 0 0 7.71s
✅ YAML yamllint 10 0 0 0.58s

Detailed Issues

⚠️ SPELL / lychee - 2 errors
📝 Summary
---------------------
🔍 Total...........21
🔗 Unique..........16
✅ Successful......19
⏳ Timeouts.........0
🔀 Redirected.......4
👻 Excluded.........0
❓ Unknown..........0
🚫 Errors...........2
⛔ Unsupported......2

Errors in chezmoi/.chezmoitemplates/mcp_servers.json
[406] https://mcp.deepwiki.com/mcp (at 11:15) | Rejected status code: 406 Not Acceptable

Errors in chezmoi/.chezmoitemplates/opencode.json
[406] https://mcp.deepwiki.com/mcp (at 24:15) | Rejected status code: 406 Not Acceptable

Hint: Followed 4 redirects. You might want to consider replacing redirecting URLs with the resolved URLs. Use verbose mode (`-v`/`-vv`) to see redirection details.
Hint: You can configure accepted/rejected response codes with `-a` or `--accept`
⚠️ MARKDOWN / markdownlint - 2 errors
chezmoi/private_dot_claude/modify_CLAUDE.md:1 error MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading [Context: "{{- /*chezmoi:modify-template*..."]
chezmoi/private_dot_config/opencode/modify_AGENTS.md:1 error MD041/first-line-heading/first-line-h1 First line in a file should be a top-level heading [Context: "{{- /*chezmoi:modify-template*..."]
⚠️ REPOSITORY / osv-scanner - 1 error
Scanning dir .
Starting filesystem walk for root: /
End status: 40 dirs visited, 138 inodes visited, 0 Extract calls, 5.528882ms elapsed, 5.529092ms wall time
No package sources found, --help for usage information.
⚠️ JSON / prettier - 1 error
chezmoi/.chezmoitemplates/claude-settings.json 81ms (unchanged)
chezmoi/.chezmoitemplates/mcp_servers.json 8ms (unchanged)
chezmoi/.chezmoitemplates/opencode-tui.json 3ms (unchanged)
chezmoi/.chezmoitemplates/opencode.json 5ms (unchanged)
[error] chezmoi/private_dot_claude/modify_settings.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
[error] chezmoi/private_dot_config/mcp/modify_mcp_servers.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
[error] chezmoi/private_dot_config/opencode/modify_opencode.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
[error] chezmoi/private_dot_config/opencode/modify_tui.json: SyntaxError: Unexpected token (1:2)
[error] > 1 | {{- /* chezmoi:modify-template */ -}}
[error]     |  ^
[error]   2 | {{- $current := dict -}}
[error]   3 | {{- if .chezmoi.stdin | trim -}}
[error]   4 | {{-   $current = fromJson .chezmoi.stdin -}}
renovate.json 9ms (unchanged)

Notices

📣 MegaLinter 9.5.0 is out! Discover the new features and security recommendations in the release announcement. (Skip this info by defining SECURITY_SUGGESTIONS: false)

See detailed reports in MegaLinter artifacts

Your project could benefit from a custom flavor, which would allow you to run only the linters you need, and thus improve runtime performances. (Skip this info by defining FLAVOR_SUGGESTIONS: false)

  • Documentation: Custom Flavors
  • Command: npx mega-linter-runner@9.5.0 --custom-flavor-setup --custom-flavor-linters ACTION_ACTIONLINT,ACTION_ZIZMOR,BASH_EXEC,BASH_SHELLCHECK,BASH_SHFMT,COPYPASTE_JSCPD,EDITORCONFIG_EDITORCONFIG_CHECKER,JSON_V8R,JSON_PRETTIER,MARKDOWN_MARKDOWNLINT,MARKDOWN_MARKDOWN_TABLE_FORMATTER,REPOSITORY_CHECKOV,REPOSITORY_GIT_DIFF,REPOSITORY_GITLEAKS,REPOSITORY_GRYPE,REPOSITORY_OSV_SCANNER,REPOSITORY_SECRETLINT,REPOSITORY_SYFT,REPOSITORY_TRIVY,REPOSITORY_TRIVY_SBOM,REPOSITORY_TRUFFLEHOG,SPELL_LYCHEE,YAML_PRETTIER,YAML_YAMLLINT,YAML_V8R

MegaLinter is graciously provided by OX Security
Show us your support by starring ⭐ the repository

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🧹 Nitpick comments (1)
chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl (1)

32-34: 🚀 Performance & Scalability | 🔵 Trivial | ⚡ Quick win

Merge duplicate mattpocock/skills entries into one.

Both new lines target the same repo (mattpocock/skills), so the loop at Line 36 will invoke npx --yes skills add mattpocock/skills ... twice — each a separate network/npx call — instead of once with the combined skill list.

♻️ Proposed fix
 repo_skills=(
-  mattpocock/skills=setup-matt-pocock-skills,grill-with-docs,grilling,domain-modeling,to-prd,to-issues
-  mattpocock/skills=research,codebase-design,tdd,improve-codebase-architecture,diagnosing-bugs
+  mattpocock/skills=setup-matt-pocock-skills,grill-with-docs,grilling,domain-modeling,to-prd,to-issues,research,codebase-design,tdd,improve-codebase-architecture,diagnosing-bugs
   philschmid/mcp-cli=mcp-cli
 )
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl` around
lines 32 - 34, The template contains duplicate mattpocock/skills entries,
causing the loop in the script to run the same npx skills add command twice
instead of once with all skills combined. Merge the two mattpocock/skills lines
into a single entry in run_onchange_after_agent_plugins.sh.tmpl so the skills
list is consolidated before the loop processes it, and keep philschmid/mcp-cli
as a separate repo entry.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl`:
- Around line 32-34: The template contains duplicate mattpocock/skills entries,
causing the loop in the script to run the same npx skills add command twice
instead of once with all skills combined. Merge the two mattpocock/skills lines
into a single entry in run_onchange_after_agent_plugins.sh.tmpl so the skills
list is consolidated before the loop processes it, and keep philschmid/mcp-cli
as a separate repo entry.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 2c85b319-1519-42fc-b779-02f1a312ac6a

📥 Commits

Reviewing files that changed from the base of the PR and between 4e8d0c3 and 94982ee.

📒 Files selected for processing (3)
  • chezmoi/.chezmoiscripts/run_onchange_after_agent_plugins.sh.tmpl
  • chezmoi/.chezmoiscripts/run_onchange_setup_claude.sh.tmpl
  • chezmoi/.chezmoitemplates/opencode.json
💤 Files with no reviewable changes (2)
  • chezmoi/.chezmoiscripts/run_onchange_setup_claude.sh.tmpl
  • chezmoi/.chezmoitemplates/opencode.json

@yxtay
yxtay merged commit a17fbc6 into main Jul 7, 2026
34 checks passed
@yxtay
yxtay deleted the feat/mattpocock-skills-drop-superpowers branch July 7, 2026 08:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant