fix: consistent short_name resolution and test hygiene for strategy: wrap

- Pass raw_short_name (dot-separated) to _substitute_core_template in
  _register_skills to match register_commands, ensuring consistent core
  template lookup across both code paths
- Restore original two-step core_templates_dir existence check in
  _substitute_core_template to match codebase style
- Restore missing reinstall assertion in bundled preset CLI error test
- Restore AGENT_CONFIGS on the class (CommandRegistrar.AGENT_CONFIGS) not
  the instance to prevent state leaking across tests
- Add test covering extension command dot-separated name resolution

Author: kennedy-whytech

src/specify_cli/presets.py

@@ -51,8 +51,11 @@ def _substitute_core_template(
     if "{CORE_TEMPLATE}" not in body:
         return body, {}
 
-    core_file = project_root / ".specify" / "templates" / "commands" / f"{short_name}.md"
-    if not core_file.exists():
+    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
+    if core_file is None:
         return body, {}
 
     core_frontmatter, core_body = registrar.parse_frontmatter(core_file.read_text(encoding="utf-8"))
@@ -792,7 +795,7 @@ def _register_skills(
             frontmatter, body = registrar.parse_frontmatter(content)
 
             if frontmatter.get("strategy") == "wrap":
-                body, core_frontmatter = _substitute_core_template(body, short_name, self.project_root, registrar)
+                body, core_frontmatter = _substitute_core_template(body, raw_short_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

@@ -3043,6 +3043,7 @@ def test_bundled_preset_missing_locally_cli_error(self, project_dir):
         assert result.exit_code == 1
         output = strip_ansi(result.output).lower()
         assert "bundled" in output, result.output
+        assert "reinstall" in output, result.output
 
 
 class TestWrapStrategy:
@@ -3139,7 +3140,7 @@ def test_register_commands_substitutes_core_template_for_wrap_strategy(self, pro
                 project_dir / "preset", project_dir
             )
         finally:
-            registrar.AGENT_CONFIGS = original
+            CommandRegistrar.AGENT_CONFIGS = original
 
         written = (agent_dir / "speckit.specify.md").read_text()
         assert "{CORE_TEMPLATE}" not in written
@@ -3295,7 +3296,7 @@ def test_register_commands_inherits_scripts_from_core(self, project_dir):
                 project_dir,
             )
         finally:
-            registrar.AGENT_CONFIGS = original
+            CommandRegistrar.AGENT_CONFIGS = original
 
         written = (agent_dir / "speckit.specify.md").read_text()
         assert "{CORE_TEMPLATE}" not in written
@@ -3343,7 +3344,7 @@ def test_register_commands_toml_resolves_inherited_scripts(self, project_dir):
                 project_dir,
             )
         finally:
-            registrar.AGENT_CONFIGS = original
+            CommandRegistrar.AGENT_CONFIGS = original
 
         written = (toml_dir / "speckit.specify.toml").read_text()
         assert "{CORE_TEMPLATE}" not in written
@@ -3352,3 +3353,41 @@ def test_register_commands_toml_resolves_inherited_scripts(self, project_dir):
         # args token must use TOML format, not the intermediate $ARGUMENTS
         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.
+
+        Covers both _register_skills (via _substitute_core_template with raw_short_name)
+        and register_commands (via short_name stripped of speckit. prefix).
+        """
+        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"
+        )
+        # Ensure the hyphenated variant does NOT exist to prove we pick the right file
+        assert not (core_dir / "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"