fix: address eighth round of Copilot PR review feedback

- Hoist Get-Python3Command call out of preset loop in PowerShell
  Resolve-TemplateContent to avoid repeated Get-Command/version checks
- Short-circuit composition when top layer is replace: in resolve_content,
  _reconcile_composed_commands, and bash resolve_template_content, return
  the top layer directly when its strategy is replace, ignoring irrelevant
  lower-priority composition layers
- Add test: replace-over-wrap verifies that a high-priority replace preset
  wins without evaluating a lower-priority wrap that lacks a placeholder

Author: mnriem

scripts/bash/common.sh

@@ -515,6 +515,13 @@ except Exception:
         [ "$s" != "replace" ] && has_composition=true && break
     done
 
+    # If the top (highest-priority) layer is replace, it wins entirely —
+    # lower layers are irrelevant regardless of their strategies.
+    if [ "${layer_strategies[0]}" = "replace" ]; then
+        cat "${layer_paths[0]}"
+        return 0
+    fi
+
     if [ "$has_composition" = false ]; then
         cat "${layer_paths[0]}"
         return 0

scripts/powershell/common.ps1

@@ -413,12 +413,12 @@ function Resolve-TemplateContent {
         }
 
         if ($sortedPresets.Count -gt 0) {
+            $pyCmd = Get-Python3Command
             foreach ($presetId in $sortedPresets) {
                 # Read strategy and file path from preset manifest
                 $strategy = 'replace'
                 $manifestFilePath = ''
                 $manifest = Join-Path $presetsDir "$presetId/preset.yml"
-                $pyCmd = Get-Python3Command
                 if ((Test-Path $manifest) -and $pyCmd) {
                     try {
                         # Use Python to parse YAML manifest for strategy and file path

src/specify_cli/presets.py

@@ -628,7 +628,12 @@ def _reconcile_composed_commands(self, command_names: List[str]) -> None:
             if not layers:
                 continue
 
-            has_composition = any(layer["strategy"] != "replace" for layer in layers)
+            # If the top layer is replace, it wins entirely — lower layers
+            # are irrelevant regardless of their strategies.
+            top_is_replace = layers[0]["strategy"] == "replace"
+            has_composition = not top_is_replace and any(
+                layer["strategy"] != "replace" for layer in layers
+            )
             if not has_composition:
                 # Pure replace — the top layer wins.
                 top_layer = layers[0]
@@ -2317,6 +2322,11 @@ def resolve_content(
         if not layers:
             return None
 
+        # If the top (highest-priority) layer is replace, it wins entirely —
+        # lower layers are irrelevant regardless of their strategies.
+        if layers[0]["strategy"] == "replace":
+            return layers[0]["path"].read_text(encoding="utf-8")
+
         # Check if any layer uses a non-replace strategy
         has_composition = any(layer["strategy"] != "replace" for layer in layers)
 

tests/test_presets.py

@@ -3487,6 +3487,53 @@ def test_resolve_content_blank_line_separator(self, project_dir, temp_dir, valid
         # Should have blank line separator
         assert "\n\n" in content
 
+    def test_resolve_content_replace_over_wrap(self, project_dir, temp_dir, valid_pack_data):
+        """Top-priority replace layer should win even if a lower layer uses wrap."""
+        # Install a low-priority wrap preset (with no placeholder — would fail if evaluated)
+        wrap_data = {**valid_pack_data}
+        wrap_data["preset"] = {**valid_pack_data["preset"], "id": "wrap-lo", "name": "WrapLo"}
+        wrap_data["provides"] = {
+            "templates": [{
+                "type": "template",
+                "name": "spec-template",
+                "file": "templates/spec-template.md",
+                "strategy": "wrap",
+            }]
+        }
+        wrap_dir = temp_dir / "wrap-lo"
+        wrap_dir.mkdir()
+        with open(wrap_dir / "preset.yml", "w") as f:
+            yaml.dump(wrap_data, f)
+        (wrap_dir / "templates").mkdir()
+        # Intentionally missing {CORE_TEMPLATE} — would error if composition ran
+        (wrap_dir / "templates" / "spec-template.md").write_text("wrapper without placeholder")
+
+        manager = PresetManager(project_dir)
+        manager.install_from_directory(wrap_dir, "0.1.5", priority=10)
+
+        # Install a high-priority replace preset
+        rep_data = {**valid_pack_data}
+        rep_data["preset"] = {**valid_pack_data["preset"], "id": "rep-hi", "name": "RepHi"}
+        rep_data["provides"] = {
+            "templates": [{
+                "type": "template",
+                "name": "spec-template",
+                "file": "templates/spec-template.md",
+            }]
+        }
+        rep_dir = temp_dir / "rep-hi"
+        rep_dir.mkdir()
+        with open(rep_dir / "preset.yml", "w") as f:
+            yaml.dump(rep_data, f)
+        (rep_dir / "templates").mkdir()
+        (rep_dir / "templates" / "spec-template.md").write_text("# Replaced content\n")
+
+        manager.install_from_directory(rep_dir, "0.1.5", priority=1)
+
+        resolver = PresetResolver(project_dir)
+        content = resolver.resolve_content("spec-template")
+        assert content == "# Replaced content\n"
+
 
 class TestCollectAllLayers:
     """Test PresetResolver._collect_all_layers() method."""