fix: use PresetResolver for core template lookup in strategy: wrap

_substitute_core_template now accepts the full cmd_name and resolves the
core template file via PresetResolver, which walks the full priority stack
(overrides -> presets -> extensions -> core templates). It tries the full
command name first so extension commands (e.g. speckit.git.feature ->
extensions/git/commands/speckit.git.feature.md) are found correctly, then
falls back to the short name for core commands (e.g. specify ->
templates/commands/specify.md).

Both call sites (register_commands and _register_skills) now pass cmd_name
directly, removing the short-name derivation from the callers.

Author: kennedy-whytech

src/specify_cli/agents.py

@@ -416,10 +416,7 @@ def register_commands(
 
             if frontmatter.get("strategy") == "wrap":
                 from .presets import _substitute_core_template
-                short_name = cmd_name
-                if short_name.startswith("speckit."):
-                    short_name = short_name[len("speckit."):]
-                body, core_frontmatter = _substitute_core_template(body, short_name, project_root, self)
+                body, core_frontmatter = _substitute_core_template(body, cmd_name, project_root, self)
                 frontmatter = dict(frontmatter)
                 for key in ("scripts", "agent_scripts"):
                     if key not in frontmatter and key in core_frontmatter:

src/specify_cli/presets.py

@@ -29,15 +29,15 @@
 
 def _substitute_core_template(
     body: str,
-    short_name: str,
+    cmd_name: str,
     project_root: "Path",
     registrar: "CommandRegistrar",
 ) -> "tuple[str, dict]":
     """Substitute {CORE_TEMPLATE} with the body of the installed core command template.
 
     Args:
         body: Preset command body (may contain {CORE_TEMPLATE} placeholder).
-        short_name: Short command name (e.g. "specify" from "speckit.specify").
+        cmd_name: Full command name (e.g. "speckit.git.feature" or "speckit.specify").
         project_root: Project root path.
         registrar: CommandRegistrar instance for parse_frontmatter.
 
@@ -51,10 +51,17 @@ def _substitute_core_template(
     if "{CORE_TEMPLATE}" not in body:
         return body, {}
 
-    core_templates_dir = project_root / ".specify" / "templates" / "commands"
-    core_file = core_templates_dir / f"{short_name}.md" if core_templates_dir.exists() else None
-    if core_file and not core_file.exists():
-        core_file = None
+    # Derive the short name (strip "speckit." prefix) used by core command templates.
+    short_name = cmd_name
+    if short_name.startswith("speckit."):
+        short_name = short_name[len("speckit."):]
+
+    resolver = PresetResolver(project_root)
+    # Try the full command name first so extension commands
+    # (e.g. speckit.git.feature -> extensions/git/commands/speckit.git.feature.md)
+    # are found before falling back to the short name used by core commands
+    # (e.g. specify -> templates/commands/specify.md).
+    core_file = resolver.resolve(cmd_name, "command") or resolver.resolve(short_name, "command")
     if core_file is None:
         return body, {}
 
@@ -795,7 +802,7 @@ def _register_skills(
             frontmatter, body = registrar.parse_frontmatter(content)
 
             if frontmatter.get("strategy") == "wrap":
-                body, core_frontmatter = _substitute_core_template(body, raw_short_name, self.project_root, registrar)
+                body, core_frontmatter = _substitute_core_template(body, cmd_name, self.project_root, registrar)
                 frontmatter = dict(frontmatter)
                 for key in ("scripts", "agent_scripts"):
                     if key not in frontmatter and key in core_frontmatter:

tests/test_presets.py

@@ -3354,40 +3354,31 @@ def test_register_commands_toml_resolves_inherited_scripts(self, project_dir):
         assert "$ARGUMENTS" not in written
         assert "{{args}}" in written
 
-    def test_extension_command_resolves_dot_separated_template(self, project_dir):
-        """Extension command names like speckit.git.feature look up git.feature.md, not git-feature.md.
+    def test_extension_command_resolves_via_extension_directory(self, project_dir):
+        """Extension commands (e.g. speckit.git.feature) resolve from the extension directory.
 
-        Covers both _register_skills (via _substitute_core_template with raw_short_name)
-        and register_commands (via short_name stripped of speckit. prefix).
+        Both _register_skills and register_commands pass the full cmd_name to
+        _substitute_core_template, which tries the full name first via PresetResolver
+        and finds speckit.git.feature.md in the extension commands directory.
         """
         from specify_cli.presets import _substitute_core_template
         from specify_cli.agents import CommandRegistrar
 
-        core_dir = project_dir / ".specify" / "templates" / "commands"
-        core_dir.mkdir(parents=True, exist_ok=True)
-        # Template uses dot-separated name — must NOT be named git-feature.md
-        (core_dir / "git.feature.md").write_text(
-            "---\ndescription: core git feature\n---\n\n# Git Feature Core\n"
+        # Place the template where a real extension would install it
+        ext_cmd_dir = project_dir / ".specify" / "extensions" / "git" / "commands"
+        ext_cmd_dir.mkdir(parents=True, exist_ok=True)
+        (ext_cmd_dir / "speckit.git.feature.md").write_text(
+            "---\ndescription: git feature core\n---\n\n# Git Feature Core\n"
         )
-        # Ensure the hyphenated variant does NOT exist to prove we pick the right file
-        assert not (core_dir / "git-feature.md").exists()
+        # Ensure a hyphenated or dot-separated fallback does NOT exist
+        assert not (project_dir / ".specify" / "templates" / "commands" / "git.feature.md").exists()
+        assert not (project_dir / ".specify" / "templates" / "commands" / "git-feature.md").exists()
 
         registrar = CommandRegistrar()
         body = "## Wrapper\n\n{CORE_TEMPLATE}\n"
 
-        # Simulate register_commands: strips "speckit." only
-        short_name_commands = "speckit.git.feature"
-        if short_name_commands.startswith("speckit."):
-            short_name_commands = short_name_commands[len("speckit."):]
-        result_commands, _ = _substitute_core_template(body, short_name_commands, project_dir, registrar)
-
-        # Simulate _register_skills: strips "speckit." then hyphenates for skill dirs,
-        # but passes raw_short_name (pre-hyphenation) to _substitute_core_template
-        raw_short_name = "speckit.git.feature"
-        if raw_short_name.startswith("speckit."):
-            raw_short_name = raw_short_name[len("speckit."):]
-        result_skills, _ = _substitute_core_template(body, raw_short_name, project_dir, registrar)
-
-        assert "# Git Feature Core" in result_commands, "register_commands path did not resolve extension template"
-        assert "# Git Feature Core" in result_skills, "_register_skills path did not resolve extension template"
-        assert result_commands == result_skills, "register_commands and _register_skills resolved differently"
+        # Both call sites now pass the full cmd_name
+        result, _ = _substitute_core_template(body, "speckit.git.feature", project_dir, registrar)
+
+        assert "# Git Feature Core" in result
+        assert "{CORE_TEMPLATE}" not in result