diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 485908b9..ddd90b86 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -49,6 +49,7 @@ repos:
     hooks:
       - id: markdownlint-cli2
         args: [--fix]
+        exclude: /modify_.*\.md$
 
   - repo: https://github.com/scop/pre-commit-shfmt
     rev: v3.13.1-1
diff --git a/chezmoi/.chezmoiscripts/run_onchange_setup_claude.sh.tmpl b/chezmoi/.chezmoiscripts/run_onchange_setup_claude.sh.tmpl
index ac842ed7..c7294a2f 100644
--- a/chezmoi/.chezmoiscripts/run_onchange_setup_claude.sh.tmpl
+++ b/chezmoi/.chezmoiscripts/run_onchange_setup_claude.sh.tmpl
@@ -18,21 +18,15 @@ for entry in "${marketplaces[@]}"; do
 done
 
 plugins=(
-  superpowers@claude-plugins-official
-  caveman@caveman
-  code-review@claude-plugins-official
-  code-simplifier@claude-plugins-official
-  feature-dev@claude-plugins-official
-  claude-md-management@claude-plugins-official
-  ralph-loop@claude-plugins-official
-  typescript-lsp@claude-plugins-official
-  security-guidance@claude-plugins-official
-  commit-commands@claude-plugins-official
   claude-code-setup@claude-plugins-official
-  pr-review-toolkit@claude-plugins-official
+  claude-md-management@claude-plugins-official
+  gopls-lsp@claude-plugins-official
   pyright-lsp@claude-plugins-official
+  typescript-lsp@claude-plugins-official
+  caveman@caveman
   context-mode@context-mode
-  memsearch@memsearch
+  memsearch@memsearch-plugins
+  superpowers@claude-plugins-official
 )
 for entry in "${plugins[@]}"; do
   claude plugin install "${entry}"
diff --git a/chezmoi/private_dot_agents/AGENTS.md b/chezmoi/.chezmoitemplates/AGENTS.md
similarity index 100%
rename from chezmoi/private_dot_agents/AGENTS.md
rename to chezmoi/.chezmoitemplates/AGENTS.md
diff --git a/chezmoi/private_dot_agents/AGENTS.md.tmpl b/chezmoi/private_dot_agents/AGENTS.md.tmpl
new file mode 100644
index 00000000..d250d7bf
--- /dev/null
+++ b/chezmoi/private_dot_agents/AGENTS.md.tmpl
@@ -0,0 +1 @@
+{{ template "AGENTS.md" }}
diff --git a/chezmoi/private_dot_claude/create_CLAUDE.md.tmpl b/chezmoi/private_dot_claude/create_CLAUDE.md.tmpl
deleted file mode 100644
index 43c994c2..00000000
--- a/chezmoi/private_dot_claude/create_CLAUDE.md.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-@AGENTS.md
diff --git a/chezmoi/private_dot_claude/modify_CLAUDE.md b/chezmoi/private_dot_claude/modify_CLAUDE.md
new file mode 100644
index 00000000..014510e0
--- /dev/null
+++ b/chezmoi/private_dot_claude/modify_CLAUDE.md
@@ -0,0 +1,13 @@
+{{- /*chezmoi:modify-template*/ -}}
+{{- $currentContent := .chezmoi.stdin -}}
+{{- $marker := "<!-- CHEZMOI_END -->" -}}
+
+{{- printf "%s\n" "@AGENTS.md" -}}
+{{- printf "%s\n" $marker -}}
+
+{{- /*Extract and append only the plugin modifications */ -}}
+{{- if contains $marker $currentContent -}}
+{{- /* Split the file by the marker and grab everything after it*/ -}}
+{{- $splitContent := splitList $marker $currentContent -}}
+{{- printf "%s" (index $splitContent 1 | trim) -}}
+{{- end -}}
diff --git a/chezmoi/private_dot_config/git/ignore.tmpl b/chezmoi/private_dot_config/git/ignore.tmpl
index 2d17dedc..6c81ae05 100644
--- a/chezmoi/private_dot_config/git/ignore.tmpl
+++ b/chezmoi/private_dot_config/git/ignore.tmpl
@@ -109,3 +109,4 @@ nohup.out
 {{- end }}
 
 **/.claude/settings.local.json
+.memsearch/
diff --git a/chezmoi/private_dot_config/opencode/modify_AGENTS.md b/chezmoi/private_dot_config/opencode/modify_AGENTS.md
new file mode 100644
index 00000000..9e9b0a9f
--- /dev/null
+++ b/chezmoi/private_dot_config/opencode/modify_AGENTS.md
@@ -0,0 +1,13 @@
+{{- /*chezmoi:modify-template*/ -}}
+{{- $currentContent := .chezmoi.stdin -}}
+{{- $marker := "<!-- CHEZMOI_END -->" -}}
+
+{{- printf "%s\n" (includeTemplate "AGENTS.md") -}}
+{{- printf "%s\n" $marker -}}
+
+{{- /*Extract and append only the plugin modifications*/ -}}
+{{- if contains $marker $currentContent -}}
+{{- /*Split the file by the marker and grab everything after it*/ -}}
+{{- $splitContent := splitList $marker $currentContent -}}
+{{- printf "%s" (index $splitContent 1 | trim) -}}
+{{- end -}}
diff --git a/chezmoi/private_dot_config/opencode/symlink_AGENTS.md.tmpl b/chezmoi/private_dot_config/opencode/symlink_AGENTS.md.tmpl
deleted file mode 100644
index 635418cf..00000000
--- a/chezmoi/private_dot_config/opencode/symlink_AGENTS.md.tmpl
+++ /dev/null
@@ -1 +0,0 @@
-../../.agents/AGENTS.md