Feat: Recursive skill fetching and new default repos

Updates skill fetching logic to recursively scan for SKILL.md files within configured repositories, enabling support for nested skill directories. Also updates skill_repos.json with a new set of default repositories including ComposioHQ, superpowers, and others.

Author: zhujian0805

code_assistant_manager/skills.py

@@ -633,34 +633,40 @@ def _fetch_skills_from_repo(self, repo: SkillRepo) -> List[Skill]:
                 logger.warning(f"Skills path not found: {scan_dir}")
                 return skills
 
-            # Scan for skill directories (those containing SKILL.md)
-            for item in scan_dir.iterdir():
-                if not item.is_dir():
-                    continue
-
-                skill_md = item / "SKILL.md"
-                if not skill_md.exists():
+            # Scan for SKILL.md files recursively
+            for skill_md in scan_dir.rglob("SKILL.md"):
+                skill_dir = skill_md.parent
+                if not skill_dir.is_dir():
                     continue
 
                 # Parse skill metadata from SKILL.md
                 meta = self._parse_skill_metadata(skill_md)
-                directory = item.name
+
+                try:
+                    # Calculate relative path from scan_dir
+                    rel_path = skill_dir.relative_to(scan_dir)
+                    directory = str(rel_path).replace("\\", "/")
+
+                    # Skip if SKILL.md is at the root of scan_dir (directory == ".")
+                    # to avoid conflicts when installing to the root of skills directory
+                    if directory == ".":
+                        continue
+                except ValueError:
+                    continue
 
                 # Build README URL using actual branch
-                if repo.skills_path:
-                    readme_path = f"{repo.skills_path.strip('/')}/{directory}"
-                else:
-                    readme_path = directory
+                path_from_repo_root = skill_dir.relative_to(temp_dir)
+                readme_path = str(path_from_repo_root).replace("\\", "/")
 
                 skill = Skill(
                     key=f"{repo.owner}/{repo.name}:{directory}",
-                    name=meta.get("name", directory),
+                    name=meta.get("name", directory.split("/")[-1]),
                     description=meta.get("description", ""),
                     directory=directory,
                     installed=False,
                     repo_owner=repo.owner,
                     repo_name=repo.name,
-                    repo_branch=actual_branch,  # Use actual branch, not configured branch
+                    repo_branch=actual_branch,
                     skills_path=repo.skills_path,
                     readme_url=f"https://github.com/{repo.owner}/{repo.name}/tree/{actual_branch}/{readme_path}",
                 )
@@ -723,12 +729,17 @@ def get_installed_skills(self, app_type: str = "claude") -> List[Skill]:
         installed_skills = []
         existing_skills = self._load_skills()
 
-        for item in install_dir.iterdir():
-            if not item.is_dir():
+        # Scan recursively for SKILL.md
+        for skill_md in install_dir.rglob("SKILL.md"):
+            skill_dir = skill_md.parent
+            if not skill_dir.is_dir():
                 continue
 
-            directory = item.name
-            skill_md = item / "SKILL.md"
+            try:
+                rel_path = skill_dir.relative_to(install_dir)
+                directory = str(rel_path).replace("\\", "/")
+            except ValueError:
+                continue
 
             # Check if we have this skill in our database
             matching_skill = None
@@ -740,12 +751,12 @@ def get_installed_skills(self, app_type: str = "claude") -> List[Skill]:
             if matching_skill:
                 matching_skill.installed = True
                 installed_skills.append(matching_skill)
-            elif skill_md.exists():
+            else:
                 # Local skill not in our database
                 meta = self._parse_skill_metadata(skill_md)
                 skill = Skill(
                     key=f"local:{directory}",
-                    name=meta.get("name", directory),
+                    name=meta.get("name", directory.split("/")[-1]),
                     description=meta.get("description", ""),
                     directory=directory,
                     installed=True,
@@ -767,9 +778,14 @@ def sync_installed_status(self, app_type: str = "claude") -> None:
 
         installed_dirs = set()
         if install_dir.exists():
-            installed_dirs = {
-                item.name.lower() for item in install_dir.iterdir() if item.is_dir()
-            }
+            # Scan recursively for SKILL.md
+            for skill_md in install_dir.rglob("SKILL.md"):
+                try:
+                    skill_dir = skill_md.parent
+                    rel_path = skill_dir.relative_to(install_dir)
+                    installed_dirs.add(str(rel_path).replace("\\", "/").lower())
+                except ValueError:
+                    continue
 
         skills = self._load_skills()
         for skill in skills.values():

tests/test_skills_recursive.py

@@ -0,0 +1,99 @@
+import shutil
+import tempfile
+from pathlib import Path
+from unittest.mock import MagicMock, patch
+
+import pytest
+
+from code_assistant_manager.skills import Skill, SkillManager, SkillRepo
+
+
+class TestRecursiveSkillDiscovery:
+    @pytest.fixture
+    def skill_manager(self):
+        with tempfile.TemporaryDirectory() as tmp_config:
+            return SkillManager(config_dir=Path(tmp_config))
+
+    @patch("code_assistant_manager.skills.SkillManager._download_repo")
+    def test_fetch_skills_recursive(self, mock_download, skill_manager):
+        # Setup mock repo structure
+        # temp_dir/
+        #   skills/ (skills_path)
+        #     skill1/
+        #       SKILL.md
+        #     category/
+        #       skill2/
+        #         SKILL.md
+
+        with tempfile.TemporaryDirectory() as temp_dir_str:
+            temp_dir = Path(temp_dir_str)
+            mock_download.return_value = (temp_dir, "main")
+
+            skills_root = temp_dir / "skills"
+            skills_root.mkdir()
+
+            # Skill 1 (flat)
+            skill1_dir = skills_root / "skill1"
+            skill1_dir.mkdir()
+            (skill1_dir / "SKILL.md").write_text(
+                "---\nname: Skill One\n---\n", encoding="utf-8"
+            )
+
+            # Skill 2 (nested)
+            skill2_dir = skills_root / "category" / "skill2"
+            skill2_dir.mkdir(parents=True)
+            (skill2_dir / "SKILL.md").write_text(
+                "---\nname: Skill Two\n---\n", encoding="utf-8"
+            )
+
+            repo = SkillRepo(owner="owner", name="repo", skills_path="skills")
+
+            skills = skill_manager._fetch_skills_from_repo(repo)
+
+            # Verify results
+            assert len(skills) == 2
+
+            skill_map = {s.directory: s for s in skills}
+
+            # Check Skill 1
+            assert "skill1" in skill_map
+            s1 = skill_map["skill1"]
+            assert s1.name == "Skill One"
+            assert s1.key == "owner/repo:skill1"
+            assert s1.readme_url.endswith("/skills/skill1")
+
+            # Check Skill 2
+            # directory should use forward slashes
+            assert "category/skill2" in skill_map
+            s2 = skill_map["category/skill2"]
+            assert s2.name == "Skill Two"
+            assert s2.key == "owner/repo:category/skill2"
+            assert s2.readme_url.endswith("/skills/category/skill2")
+
+    @patch("code_assistant_manager.skills.SkillManager._download_repo")
+    def test_fetch_skills_root_structure(self, mock_download, skill_manager):
+        # Test when skills_path is root ("/") or None
+
+        with tempfile.TemporaryDirectory() as temp_dir_str:
+            temp_dir = Path(temp_dir_str)
+            mock_download.return_value = (temp_dir, "main")
+
+            # Skill at root (should be skipped based on my implementation "directory == '.'")
+            (temp_dir / "SKILL.md").write_text(
+                "---\nname: Root Skill\n---\n", encoding="utf-8"
+            )
+
+            # Nested skill
+            (temp_dir / "nested" / "skill").mkdir(parents=True)
+            (temp_dir / "nested" / "skill" / "SKILL.md").write_text(
+                "---\nname: Nested\n---\n", encoding="utf-8"
+            )
+
+            repo = SkillRepo(owner="owner", name="repo", skills_path=None)
+
+            skills = skill_manager._fetch_skills_from_repo(repo)
+
+            # Should find nested skill but skip root skill
+            assert len(skills) == 1
+            assert skills[0].directory == "nested/skill"
+            assert skills[0].name == "Nested"