fix: harden kimi migration and cache hook init options

Author: RbBtSn0w

src/specify_cli/__init__.py

@@ -1490,10 +1490,6 @@ def load_init_options(project_path: Path) -> dict[str, Any]:
         return {}
 
 
-# Agent-specific skill directory overrides for agents whose skills directory
-# doesn't follow the standard <agent_folder>/skills/ pattern
-AGENT_SKILLS_DIR_OVERRIDES = {}
-
 # Default skills directory for agents not in AGENT_CONFIG
 DEFAULT_SKILLS_DIR = ".agents/skills"
 
@@ -1526,13 +1522,9 @@ def load_init_options(project_path: Path) -> dict[str, Any]:
 def _get_skills_dir(project_path: Path, selected_ai: str) -> Path:
     """Resolve the agent-specific skills directory for the given AI assistant.
 
-    Uses ``AGENT_SKILLS_DIR_OVERRIDES`` first, then falls back to
-    ``AGENT_CONFIG[agent]["folder"] + "skills"``, and finally to
-    ``DEFAULT_SKILLS_DIR``.
+    Uses ``AGENT_CONFIG[agent]["folder"] + "skills"`` and falls back to
+    ``DEFAULT_SKILLS_DIR`` for unknown agents.
     """
-    if selected_ai in AGENT_SKILLS_DIR_OVERRIDES:
-        return project_path / AGENT_SKILLS_DIR_OVERRIDES[selected_ai]
-
     agent_config = AGENT_CONFIG.get(selected_ai, {})
     agent_folder = agent_config.get("folder", "")
     if agent_folder:
@@ -1646,7 +1638,7 @@ def install_ai_skills(
                 command_name = command_name[len("speckit."):]
             if command_name.endswith(".agent"):
                 command_name = command_name[:-len(".agent")]
-            skill_name = f"speckit-{command_name}"
+            skill_name = f"speckit-{command_name.replace('.', '-')}"
 
             # Create skill directory (additive — never removes existing content)
             skill_dir = skills_dir / skill_name
@@ -1739,7 +1731,7 @@ def _migrate_legacy_kimi_dotted_skills(skills_dir: Path) -> tuple[int, int]:
     Returns:
         Tuple[migrated_count, removed_count]
         - migrated_count: old dotted dir renamed to hyphenated dir
-        - removed_count: old dotted dir deleted because hyphenated dir already existed
+        - removed_count: old dotted dir deleted when equivalent hyphenated dir existed
     """
     if not skills_dir.is_dir():
         return (0, 0)
@@ -1759,12 +1751,23 @@ def _migrate_legacy_kimi_dotted_skills(skills_dir: Path) -> tuple[int, int]:
 
         target_dir = skills_dir / f"speckit-{suffix.replace('.', '-')}"
 
-        if target_dir.exists():
-            shutil.rmtree(legacy_dir)
-            removed_count += 1
-        else:
+        if not target_dir.exists():
             shutil.move(str(legacy_dir), str(target_dir))
             migrated_count += 1
+            continue
+
+        # If the new target already exists, avoid destructive cleanup unless
+        # both SKILL.md files are byte-identical.
+        target_skill = target_dir / "SKILL.md"
+        legacy_skill = legacy_dir / "SKILL.md"
+        if target_skill.is_file():
+            try:
+                if target_skill.read_bytes() == legacy_skill.read_bytes():
+                    shutil.rmtree(legacy_dir)
+                    removed_count += 1
+            except OSError:
+                # Best-effort migration: preserve legacy dir on read failures.
+                pass
 
     return (migrated_count, removed_count)
 

src/specify_cli/extensions.py

@@ -1646,17 +1646,20 @@ def __init__(self, project_root: Path):
         self.project_root = project_root
         self.extensions_dir = project_root / ".specify" / "extensions"
         self.config_file = project_root / ".specify" / "extensions.yml"
+        self._init_options_cache: Optional[Dict[str, Any]] = None
 
     def _load_init_options(self) -> Dict[str, Any]:
-        """Load persisted init options used to determine invocation style."""
-        options_file = self.project_root / self.INIT_OPTIONS_FILE
-        if not options_file.exists():
-            return {}
-        try:
-            payload = json.loads(options_file.read_text(encoding="utf-8"))
-            return payload if isinstance(payload, dict) else {}
-        except (json.JSONDecodeError, OSError, UnicodeError):
-            return {}
+        """Load persisted init options used to determine invocation style.
+
+        Uses the shared helper from specify_cli and caches values per executor
+        instance to avoid repeated filesystem reads during hook rendering.
+        """
+        if self._init_options_cache is None:
+            from . import load_init_options
+
+            payload = load_init_options(self.project_root)
+            self._init_options_cache = payload if isinstance(payload, dict) else {}
+        return self._init_options_cache
 
     @staticmethod
     def _skill_name_from_command(command: str) -> str:

tests/test_ai_skills.py

@@ -26,7 +26,6 @@
     _get_skills_dir,
     _migrate_legacy_kimi_dotted_skills,
     install_ai_skills,
-    AGENT_SKILLS_DIR_OVERRIDES,
     DEFAULT_SKILLS_DIR,
     SKILL_DESCRIPTIONS,
     AGENT_CONFIG,
@@ -204,14 +203,6 @@ def test_all_configured_agents_resolve(self, project_dir):
             # Should always end with "skills"
             assert result.name == "skills"
 
-    def test_override_takes_precedence_over_config(self, project_dir):
-        """AGENT_SKILLS_DIR_OVERRIDES should take precedence over AGENT_CONFIG."""
-        for agent_key in AGENT_SKILLS_DIR_OVERRIDES:
-            result = _get_skills_dir(project_dir, agent_key)
-            expected = project_dir / AGENT_SKILLS_DIR_OVERRIDES[agent_key]
-            assert result == expected
-
-
 class TestKimiLegacySkillMigration:
     """Test temporary migration from Kimi dotted skill names to hyphenated names."""
 
@@ -228,20 +219,37 @@ def test_migrates_legacy_dotted_skill_directory(self, project_dir):
         assert not legacy_dir.exists()
         assert (skills_dir / "speckit-plan" / "SKILL.md").exists()
 
-    def test_removes_legacy_dir_when_hyphenated_target_exists(self, project_dir):
+    def test_removes_legacy_dir_when_hyphenated_target_exists_with_same_content(self, project_dir):
         skills_dir = project_dir / ".kimi" / "skills"
         legacy_dir = skills_dir / "speckit.plan"
         legacy_dir.mkdir(parents=True)
         (legacy_dir / "SKILL.md").write_text("legacy")
         target_dir = skills_dir / "speckit-plan"
         target_dir.mkdir(parents=True)
-        (target_dir / "SKILL.md").write_text("new")
+        (target_dir / "SKILL.md").write_text("legacy")
 
         migrated, removed = _migrate_legacy_kimi_dotted_skills(skills_dir)
 
         assert migrated == 0
         assert removed == 1
         assert not legacy_dir.exists()
+        assert (target_dir / "SKILL.md").read_text() == "legacy"
+
+    def test_keeps_legacy_dir_when_hyphenated_target_differs(self, project_dir):
+        skills_dir = project_dir / ".kimi" / "skills"
+        legacy_dir = skills_dir / "speckit.plan"
+        legacy_dir.mkdir(parents=True)
+        (legacy_dir / "SKILL.md").write_text("legacy")
+        target_dir = skills_dir / "speckit-plan"
+        target_dir.mkdir(parents=True)
+        (target_dir / "SKILL.md").write_text("new")
+
+        migrated, removed = _migrate_legacy_kimi_dotted_skills(skills_dir)
+
+        assert migrated == 0
+        assert removed == 0
+        assert legacy_dir.exists()
+        assert (legacy_dir / "SKILL.md").read_text() == "legacy"
         assert (target_dir / "SKILL.md").read_text() == "new"
 
 

tests/test_extensions.py

@@ -3320,3 +3320,18 @@ def test_extension_command_uses_hyphenated_skill_invocation(self, project_dir):
         assert "Executing: `/skill:speckit-test-hello`" in message
         assert "EXECUTE_COMMAND: speckit.test.hello" in message
         assert "EXECUTE_COMMAND_INVOCATION: /skill:speckit-test-hello" in message
+
+    def test_hook_executor_caches_init_options_lookup(self, project_dir, monkeypatch):
+        """Init options should be loaded once per executor instance."""
+        calls = {"count": 0}
+
+        def fake_load_init_options(_project_root):
+            calls["count"] += 1
+            return {"ai": "kimi", "ai_skills": False}
+
+        monkeypatch.setattr("specify_cli.load_init_options", fake_load_init_options)
+
+        hook_executor = HookExecutor(project_dir)
+        assert hook_executor._render_hook_invocation("speckit.plan") == "/skill:speckit-plan"
+        assert hook_executor._render_hook_invocation("speckit.tasks") == "/skill:speckit-tasks"
+        assert calls["count"] == 1