Normalize preset skill titles

Author: RbBtSn0w

src/specify_cli/presets.py

@@ -600,6 +600,14 @@ def _skill_names_for_command(cmd_name: str) -> tuple[str, str]:
         legacy_skill_name = f"speckit.{raw_short_name}"
         return modern_skill_name, legacy_skill_name
 
+    @staticmethod
+    def _skill_title_from_command(cmd_name: str) -> str:
+        """Return a human-friendly title for a skill command name."""
+        title_name = cmd_name
+        if title_name.startswith("speckit."):
+            title_name = title_name[len("speckit."):]
+        return title_name.replace(".", " ").replace("-", " ").title()
+
     def _build_extension_skill_restore_index(self) -> Dict[str, Dict[str, Any]]:
         """Index extension-backed skill restore data by skill directory name."""
         from .extensions import ExtensionManifest, ValidationError
@@ -723,6 +731,7 @@ def _register_skills(
                 raw_short_name = raw_short_name[len("speckit."):]
             short_name = raw_short_name.replace(".", "-")
             skill_name, legacy_skill_name = self._skill_names_for_command(cmd_name)
+            skill_title = self._skill_title_from_command(cmd_name)
 
             # Only overwrite skills that already exist under skills_dir,
             # including Kimi native skills when ai_skills is false.
@@ -765,7 +774,7 @@ def _register_skills(
                     f"---\n"
                     f"{frontmatter_text}\n"
                     f"---\n\n"
-                    f"# Speckit {short_name.title()} Skill\n\n"
+                    f"# Speckit {skill_title} Skill\n\n"
                     f"{body}\n"
                 )
 
@@ -851,11 +860,12 @@ def _unregister_skills(self, skill_names: List[str], preset_dir: Path) -> None:
                     },
                 }
                 frontmatter_text = yaml.safe_dump(frontmatter_data, sort_keys=False).strip()
+                skill_title = self._skill_title_from_command(short_name)
                 skill_content = (
                     f"---\n"
                     f"{frontmatter_text}\n"
                     f"---\n\n"
-                    f"# Speckit {short_name.title()} Skill\n\n"
+                    f"# Speckit {skill_title} Skill\n\n"
                     f"{body}\n"
                 )
                 skill_file.write_text(skill_content, encoding="utf-8")
@@ -871,10 +881,7 @@ def _unregister_skills(self, skill_names: List[str], preset_dir: Path) -> None:
                     )
 
                 command_name = extension_restore["command_name"]
-                title_name = command_name
-                if title_name.startswith("speckit."):
-                    title_name = title_name[len("speckit."):]
-                title_name = title_name.replace(".", " ").replace("-", " ").title()
+                title_name = self._skill_title_from_command(command_name)
 
                 frontmatter_data = {
                     "name": skill_name,

tests/test_presets.py

@@ -2163,6 +2163,7 @@ def test_extension_skill_override_matches_hyphenated_multisegment_name(self, pro
         content = skill_file.read_text()
         assert "preset:ext-skill-override" in content
         assert "name: speckit-fakeext-cmd" in content
+        assert "# Speckit Fakeext Cmd Skill" in content
 
         metadata = manager.registry.get("ext-skill-override")
         assert "speckit-fakeext-cmd" in metadata.get("registered_skills", [])
@@ -2248,6 +2249,7 @@ def test_extension_skill_restored_on_preset_remove(self, project_dir, temp_dir):
         assert "source: extension:fakeext" in content
         assert "extension:fakeext" in content
         assert '.specify/scripts/bash/setup-plan.sh --json "$ARGUMENTS"' in content
+        assert "# Fakeext Cmd Skill" in content
 
     def test_preset_remove_skips_skill_dir_without_skill_file(self, project_dir, temp_dir):
         """Preset removal should not delete arbitrary directories missing SKILL.md."""