feat: deep-merge opencode config via modify_ scripts - #860
Conversation
Convert opencode.json and tui.json from create_ (write-once) to modify_ scripts that deep-merge the managed config into any existing local file. Base JSON lives in .chezmoitemplates for easy diffing; modify_ scripts parse stdin + template and mergeOverwrite. Preserves local-only keys (e.g. extra mcp servers) while letting managed keys win on conflict. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
|
Warning Review limit reached
Next review available in: 48 minutes Enable usage-based reviews in Billing to review now. Otherwise, wait until the next included review is available. How can I continue?After more reviews become available, a review can be triggered using the To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based reviews. How do review limits work?CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability. For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window. Please refer docs for additional details. Review details⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (4)
📝 WalkthroughWalkthroughThis PR adds two new chezmoi modify-template files for opencode configuration: ChangesModify-template additions
Estimated code review effort: 1 (Trivial) | ~5 minutes Poem
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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. Comment |
✅
|
| Descriptor | Linter | Files | Fixed | Errors | Warnings | Elapsed time |
|---|---|---|---|---|---|---|
| ✅ BASH | shfmt | 3 | 0 | 0 | 0 | 0.02s |
| prettier | 6 | 0 | 1 | 0 | 0.36s | |
| markdownlint | 7 | 0 | 2 | 0 | 0.65s | |
| ✅ MARKDOWN | markdown-table-formatter | 7 | 0 | 0 | 0 | 0.17s |
| ✅ YAML | prettier | 10 | 0 | 0 | 0 | 0.5s |
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/opencode.json 52ms (unchanged)
chezmoi/.chezmoitemplates/tui.json 2ms (unchanged)
chezmoi/private_dot_config/mcp/mcp_servers.json 4ms (unchanged)
[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
Show us your support by starring ⭐ the repository
✅
|
| 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.43s | |
| ✅ REPOSITORY | devskim | yes | no | no | 2.0s | |
| ✅ REPOSITORY | dustilock | yes | no | no | 0.03s | |
| ✅ REPOSITORY | gitleaks | yes | no | no | 1.73s | |
| ✅ REPOSITORY | grype | yes | no | no | 48.88s | |
| ✅ REPOSITORY | kingfisher | yes | no | no | 9.38s | |
| osv-scanner | yes | 1 | no | 0.13s | ||
| ✅ REPOSITORY | secretlint | yes | no | no | 2.15s | |
| ✅ REPOSITORY | syft | yes | no | no | 2.09s | |
| ✅ REPOSITORY | trivy | yes | no | no | 10.18s | |
| ✅ REPOSITORY | trivy-sbom | yes | no | no | 0.13s | |
| ✅ REPOSITORY | trufflehog | yes | no | no | 3.86s |
Detailed Issues
⚠️ REPOSITORY / osv-scanner - 1 error
Scanning dir .
Starting filesystem walk for root: /
End status: 43 dirs visited, 141 inodes visited, 0 Extract calls, 2.822545ms elapsed, 2.822714ms 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
Show us your support by starring ⭐ the repository
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request introduces two new chezmoi modify-template scripts (modify_opencode.json and modify_tui.json) to merge local configurations with template defaults. The review feedback highlights a potential parsing error when .chezmoi.stdin contains only whitespace or newlines, and suggests trimming the input before checking and parsing it as JSON.
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.
✅
|
| Descriptor | Linter | Files | Fixed | Errors | Warnings | Elapsed time |
|---|---|---|---|---|---|---|
| ✅ ACTION | actionlint | 5 | 0 | 0 | 0.27s | |
| ✅ ACTION | zizmor | 5 | 0 | 0 | 0 | 0.59s |
| ✅ BASH | bash-exec | 3 | 0 | 0 | 0.01s | |
| ✅ BASH | shellcheck | 3 | 0 | 0 | 0.16s | |
| ✅ BASH | shfmt | 3 | 0 | 0 | 0 | 0.02s |
| ✅ COPYPASTE | jscpd | yes | no | no | 0.85s | |
| ✅ EDITORCONFIG | editorconfig-checker | 67 | 0 | 0 | 0.14s | |
| prettier | 6 | 0 | 1 | 0 | 0.87s | |
| ✅ JSON | v8r | 6 | 0 | 0 | 3.62s | |
| markdownlint | 7 | 0 | 2 | 0 | 0.67s | |
| ✅ MARKDOWN | markdown-table-formatter | 7 | 0 | 0 | 0 | 0.24s |
| ✅ REPOSITORY | checkov | yes | no | no | 22.4s | |
| ✅ REPOSITORY | gitleaks | yes | no | no | 1.65s | |
| ✅ REPOSITORY | git_diff | yes | no | no | 0.08s | |
| ✅ REPOSITORY | grype | yes | no | no | 47.77s | |
| osv-scanner | yes | 1 | no | 0.2s | ||
| ✅ REPOSITORY | secretlint | yes | no | no | 1.5s | |
| ✅ REPOSITORY | syft | yes | no | no | 3.87s | |
| ✅ REPOSITORY | trivy | yes | no | no | 9.9s | |
| ✅ REPOSITORY | trivy-sbom | yes | no | no | 0.15s | |
| ✅ REPOSITORY | trufflehog | yes | no | no | 3.65s | |
| lychee | 23 | 2 | 0 | 0.96s | ||
| ✅ YAML | prettier | 10 | 0 | 0 | 0 | 0.66s |
| ✅ YAML | v8r | 10 | 0 | 0 | 8.2s | |
| ✅ YAML | yamllint | 10 | 0 | 0 | 0.5s |
Detailed Issues
⚠️ SPELL / lychee - 2 errors
📝 Summary
---------------------
🔍 Total...........20
🔗 Unique..........15
✅ Successful......18
⏳ Timeouts.........0
🔀 Redirected.......3
👻 Excluded.........0
❓ Unknown..........0
🚫 Errors...........2
⛔ Unsupported......2
Errors in chezmoi/.chezmoitemplates/opencode.json
[406] https://mcp.deepwiki.com/mcp (at 23:15) | Rejected status code: 406 Not Acceptable
Errors in chezmoi/private_dot_config/mcp/mcp_servers.json
[406] https://mcp.deepwiki.com/mcp (at 11:15) | Rejected status code: 406 Not Acceptable
Hint: Followed 3 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: 43 dirs visited, 141 inodes visited, 0 Extract calls, 6.384509ms elapsed, 6.384719ms wall time
No package sources found, --help for usage information.
⚠️ JSON / prettier - 1 error
chezmoi/.chezmoitemplates/opencode.json 109ms (unchanged)
chezmoi/.chezmoitemplates/tui.json 3ms (unchanged)
chezmoi/private_dot_config/mcp/mcp_servers.json 3ms (unchanged)
[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
Show us your support by starring ⭐ the repository
Whitespace-only local config (e.g. "\n") is non-empty so passed the guard but broke fromJson. Trim before the check and parse the trimmed value. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
fromJson tolerates surrounding whitespace, so trimming the guard alone is enough to reject whitespace-only input; parse raw stdin. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 participant
Summary
opencode.jsonandtui.jsonfromcreate_(write-once) tomodify_scripts that deep-merge managed config into any existing local file.chezmoitemplates/for easy diffing;modify_scripts parse stdin + template andmergeOverwriteNotes
modify_scripts must not carry a.tmplextension — thechezmoi:modify-templatemarker is only honored on modify scripts;.tmplmakes chezmoi treat it as a regular template and exec the output (exec format error)plugin,mcp.*.command) are replaced wholesale bymergeOverwrite, not element-merged{{- if .chezmoi.stdin -}}guard required: target-absent → empty stdin →fromJson ""errorsTest
chezmoi cat ~/.config/opencode/{opencode,tui}.jsonrenders merged output; localcodebase-memory-mcpentry survives.🤖 Generated with Claude Code
Summary by CodeRabbit