fix(opencode): render generated config cleanly

Made-with: Cursor

Author: ChipWolf

home/.chezmoitemplates/opencode-mcp.jsonc.tmpl

@@ -27,7 +27,7 @@
   {{- if and $server.enabled $opencodeEnabled $conditionsMatch -}}
     {{- if $first }}{{- $first = false }}{{ else }},{{ end }}
     "{{ $serverId }}": {
-      {{- if hasKey $server "local" }}
+      {{- if hasKey $server "local" -}}
         {{- $openCodeCommandName := $server.local.command -}}
         {{- $openCodeCommandArgs := list -}}
         {{- range $arg := $server.local.args -}}
@@ -40,14 +40,14 @@
           {{- end -}}
           {{- $openCodeCommandArgs = append $openCodeCommandArgs $resolvedArg -}}
         {{- end -}}
-        {{- $openCodeCommand := prepend $openCodeCommandArgs $openCodeCommandName -}}
-      "type": "local",
-      "command": {{ $openCodeCommand | toPrettyJson "      " }},
+        {{- $openCodeCommand := prepend $openCodeCommandArgs $openCodeCommandName }}
+      "type": {{ "local" | toJson }},
+      "command": {{ $openCodeCommand | toPrettyJson | indent 6 | trim }},
       {{- else if hasKey $server "remote" }}
-      "type": "remote",
-      "url": "{{ $server.remote.url }}",
+      "type": {{ "remote" | toJson }},
+      "url": {{ $server.remote.url | toJson }},
       {{- end }}
-      "enabled": {{ $server.enabled | toPrettyJson }}
+      "enabled": {{ $server.enabled | toJson }}
     }
   {{- end -}}
 {{- end }}

home/.chezmoitemplates/opencode-permission.tmpl

@@ -44,6 +44,7 @@
       {{- end -}}
 
       {{- if and $conditionsMatch (eq $rule.kind $kindName) -}}
+        {{- $pattern := replace "{{ .chezmoi.homeDir }}" $.chezmoi.homeDir $rule.pattern -}}
         {{- $supportsMatchMode := false -}}
         {{- if hasKey $kindCfg "supportsMatchMode" -}}
           {{- $supportsMatchMode = $kindCfg.supportsMatchMode -}}
@@ -64,15 +65,15 @@
 
           {{- if or (eq $matchMode "exact") (eq $matchMode "exactAndWithArgs") -}}
             {{- if $firstEntry }}{{- $firstEntry = false }}{{ else }},{{ end }}
-      "{{ $rule.pattern }}": "{{ $rule.op }}"
+      {{ $pattern | toJson }}: {{ $rule.op | toJson }}
           {{- end -}}
           {{- if or (eq $matchMode "withArgs") (eq $matchMode "exactAndWithArgs") -}}
             {{- if $firstEntry }}{{- $firstEntry = false }}{{ else }},{{ end }}
-      "{{ $rule.pattern }}{{ $wildcardSuffix }}": "{{ $rule.op }}"
+      {{ printf "%s%s" $pattern $wildcardSuffix | toJson }}: {{ $rule.op | toJson }}
           {{- end -}}
         {{- else -}}
           {{- if $firstEntry }}{{- $firstEntry = false }}{{ else }},{{ end }}
-      "{{ $rule.pattern }}": "{{ $rule.op }}"
+      {{ $pattern | toJson }}: {{ $rule.op | toJson }}
         {{- end -}}
       {{- end -}}
     {{- end }}
@@ -96,7 +97,8 @@
     {{- $kindCfg = index $kinds $rule.kind -}}
   {{- end -}}
   {{- if and $conditionsMatch (eq (default "" (index $kindCfg "destinationType")) "top_level") -}}
+    {{- $pattern := replace "{{ .chezmoi.homeDir }}" $.chezmoi.homeDir $rule.pattern -}}
     {{- if $firstField }}{{- $firstField = false }}{{ else }},{{ end }}
-    "{{ $rule.pattern }}": "{{ $rule.op }}"
+    {{ $pattern | toJson }}: {{ $rule.op | toJson }}
   {{- end -}}
 {{- end }}

home/dot_config/opencode/opencode.jsonc.tmpl

@@ -7,7 +7,7 @@
   "model": "github-copilot/claude-sonnet-4.6",
 
   "permission": {
-{{- includeTemplate ".chezmoitemplates/opencode-permission.tmpl" . }}
+{{- includeTemplate ".chezmoitemplates/opencode-permission.tmpl" . | trimSuffix "\n" }}
   },
 
   "plugin": [
@@ -16,6 +16,6 @@
   ],
 
   "mcp": {
-{{- includeTemplate ".chezmoitemplates/opencode-mcp.jsonc.tmpl" . }}
+{{- includeTemplate ".chezmoitemplates/opencode-mcp.jsonc.tmpl" . | trimSuffix "\n" }}
   }
 }