lazyopencode 0.2.1__tar.gz → 0.2.3__tar.gz

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/AGENTS.md

@@ -85,6 +85,8 @@ The application discovers customizations from these locations:
 | Commands | `~/.config/opencode/command/*.md` | `.opencode/command/*.md` |
 | Agents | `~/.config/opencode/agent/*.md` | `.opencode/agent/*.md` |
 | Skills | `~/.config/opencode/skill/*/SKILL.md` | `.opencode/skill/*/SKILL.md` |
+| Skills | `~/.agents/skill[s]/*/SKILL.md` | `.agents/skill[s]/*/SKILL.md` |
+| Skills | (via Claude Code) `~/.claude/skills/*/SKILL.md` | `.claude/skill[s]/*/SKILL.md` |
 | Rules | `~/.config/opencode/AGENTS.md` | `AGENTS.md` |
 | MCPs | `~/.config/opencode/opencode.json` | `opencode.json` |
 | Tools | `~/.config/opencode/tool/*.ts` | `.opencode/tool/*.ts` |

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lazyopencode
-Version: 0.2.1
+Version: 0.2.3
 Summary: A lazygit-style TUI for visualizing OpenCode customizations
 Project-URL: Homepage, https://github.com/nikiforovall/lazyopencode
 Project-URL: Repository, https://github.com/nikiforovall/lazyopencode

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/src/lazyopencode/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.1'
-__version_tuple__ = version_tuple = (0, 2, 1)
+__version__ = version = '0.2.3'
+__version_tuple__ = version_tuple = (0, 2, 3)
 
 __commit_id__ = commit_id = None

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/src/lazyopencode/services/discovery.py

@@ -73,6 +73,19 @@ class ConfigDiscoveryService:
         """Path to project's .opencode directory."""
         return self.project_root / ".opencode"
 
+    def _get_path_variants(self, base_path: Path, singular: str) -> list[Path]:
+        """Return both singular and plural path variants that exist.
+
+        Args:
+            base_path: Base directory to check
+            singular: Singular form of folder name (e.g., 'command')
+
+        Returns:
+            List of existing paths (both singular and plural if they exist)
+        """
+        variants = [base_path / singular, base_path / f"{singular}s"]
+        return [p for p in variants if p.exists()]
+
     def discover_all(self) -> list[Customization]:
         """
         Discover all customizations from global and project levels.
@@ -152,16 +165,13 @@ class ConfigDiscoveryService:
         self, base_path: Path, level: ConfigLevel
     ) -> list[Customization]:
         """Discover command customizations."""
-        commands_path = base_path / "command"
-        if not commands_path.exists():
-            return []
-
         customizations = []
         parser = self._parsers[CustomizationType.COMMAND]
 
-        for md_file in commands_path.glob("*.md"):
-            if parser.can_parse(md_file):
-                customizations.append(parser.parse(md_file, level))
+        for commands_path in self._get_path_variants(base_path, "command"):
+            for md_file in commands_path.glob("*.md"):
+                if parser.can_parse(md_file):
+                    customizations.append(parser.parse(md_file, level))
 
         return customizations
 
@@ -182,16 +192,13 @@ class ConfigDiscoveryService:
         self, base_path: Path, level: ConfigLevel
     ) -> list[Customization]:
         """Discover agent customizations."""
-        agents_path = base_path / "agent"
-        if not agents_path.exists():
-            return []
-
         customizations = []
         parser = self._parsers[CustomizationType.AGENT]
 
-        for md_file in agents_path.glob("*.md"):
-            if parser.can_parse(md_file):
-                customizations.append(parser.parse(md_file, level))
+        for agents_path in self._get_path_variants(base_path, "agent"):
+            for md_file in agents_path.glob("*.md"):
+                if parser.can_parse(md_file):
+                    customizations.append(parser.parse(md_file, level))
 
         return customizations
 
@@ -211,39 +218,72 @@ class ConfigDiscoveryService:
     def _discover_skills(
         self, base_path: Path, level: ConfigLevel
     ) -> list[Customization]:
-        """Discover skill customizations from .opencode/skill/."""
+        """Discover skill customizations from .opencode/skill/ or skills/.
+
+        Also discovers from agent-compatible paths (.agents/skill[s]/)
+        and Claude-compatible paths (.claude/skill[s]/) per OpenCode docs:
+        https://opencode.ai/docs/skills/#place-files
+        """
         customizations = []
+        parser = self._parsers[CustomizationType.SKILL]
 
-        # Discover from standard OpenCode path
-        skills_path = base_path / "skill"
-        customizations.extend(self._discover_skills_from_path(skills_path, level))
+        # Check both singular and plural variants
+        for skills_path in self._get_path_variants(base_path, "skill"):
+            for skill_dir in skills_path.iterdir():
+                if skill_dir.is_dir():
+                    skill_file = skill_dir / "SKILL.md"
+                    if parser.can_parse(skill_file):
+                        customizations.append(parser.parse(skill_file, level))
 
         # Also discover from Claude-compatible path at project level
         if level == ConfigLevel.PROJECT:
-            claude_skills_path = self.project_root / ".claude" / "skills"
-            customizations.extend(
-                self._discover_skills_from_path(claude_skills_path, level)
-            )
+            for claude_skills_path in self._get_path_variants(
+                self.project_root / ".claude", "skill"
+            ):
+                for skill_dir in claude_skills_path.iterdir():
+                    if skill_dir.is_dir():
+                        skill_file = skill_dir / "SKILL.md"
+                        if parser.can_parse(skill_file):
+                            customizations.append(parser.parse(skill_file, level))
+
+        # Discover from agent-compatible paths (.agents/skill[s]/)
+        self._discover_skills_from_compat_roots(
+            customizations, parser, level, ".agents"
+        )
 
         return customizations
 
-    def _discover_skills_from_path(
-        self, skills_path: Path, level: ConfigLevel
-    ) -> list[Customization]:
-        """Discover skills from a specific directory path."""
-        if not skills_path.exists():
-            return []
+    def _discover_skills_from_compat_roots(
+        self,
+        customizations: list[Customization],
+        parser: object,
+        level: ConfigLevel,
+        compat_dir: str,
+    ) -> None:
+        """Discover skills from a compatibility root directory.
 
-        customizations = []
-        parser = self._parsers[CustomizationType.SKILL]
+        At PROJECT level: scans <project_root>/<compat_dir>/skill[s]/*/SKILL.md
+        At GLOBAL level: scans ~/<compat_dir>/skill[s]/*/SKILL.md
 
-        for skill_dir in skills_path.iterdir():
-            if skill_dir.is_dir():
-                skill_file = skill_dir / "SKILL.md"
-                if parser.can_parse(skill_file):
-                    customizations.append(parser.parse(skill_file, level))
+        Args:
+            customizations: List to append discovered skills to
+            parser: Skill parser instance
+            level: Configuration level (GLOBAL or PROJECT)
+            compat_dir: Compatibility directory name (e.g., ".agents")
+        """
+        if level == ConfigLevel.PROJECT:
+            compat_base = self.project_root / compat_dir
+        else:
+            compat_base = Path.home() / compat_dir
 
-        return customizations
+        for skills_path in self._get_path_variants(compat_base, "skill"):
+            for skill_dir in skills_path.iterdir():
+                if skill_dir.is_dir():
+                    skill_file = skill_dir / "SKILL.md"
+                    if parser.can_parse(skill_file):  # type: ignore[attr-defined]
+                        customizations.append(
+                            parser.parse(skill_file, level)  # type: ignore[attr-defined]
+                        )
 
     def _discover_rules(self, level: ConfigLevel) -> list[Customization]:
         """Discover AGENTS.md rules files."""
@@ -278,16 +318,13 @@ class ConfigDiscoveryService:
         self, base_path: Path, level: ConfigLevel
     ) -> list[Customization]:
         """Discover tool customizations from .opencode/tool/."""
-        tools_path = base_path / "tool"
-        if not tools_path.exists():
-            return []
-
         customizations = []
         parser = self._parsers[CustomizationType.TOOL]
 
-        for tool_file in tools_path.iterdir():
-            if tool_file.is_file() and parser.can_parse(tool_file):
-                customizations.append(parser.parse(tool_file, level))
+        for tools_path in self._get_path_variants(base_path, "tool"):
+            for tool_file in tools_path.iterdir():
+                if tool_file.is_file() and parser.can_parse(tool_file):
+                    customizations.append(parser.parse(tool_file, level))
 
         return customizations
 
@@ -295,16 +332,13 @@ class ConfigDiscoveryService:
         self, base_path: Path, level: ConfigLevel
     ) -> list[Customization]:
         """Discover plugin customizations from .opencode/plugin/."""
-        plugins_path = base_path / "plugin"
-        if not plugins_path.exists():
-            return []
-
         customizations = []
         parser = self._parsers[CustomizationType.PLUGIN]
 
-        for plugin_file in plugins_path.iterdir():
-            if plugin_file.is_file() and parser.can_parse(plugin_file):
-                customizations.append(parser.parse(plugin_file, level))
+        for plugins_path in self._get_path_variants(base_path, "plugin"):
+            for plugin_file in plugins_path.iterdir():
+                if plugin_file.is_file() and parser.can_parse(plugin_file):
+                    customizations.append(parser.parse(plugin_file, level))
 
         return customizations
 

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/src/lazyopencode/services/parsers/agent.py

@@ -23,7 +23,11 @@ class AgentParser(ICustomizationParser):
 
     def can_parse(self, path: Path) -> bool:
         """Check if path is an agent markdown file."""
-        return path.is_file() and path.suffix == ".md" and path.parent.name == "agent"
+        return (
+            path.is_file()
+            and path.suffix == ".md"
+            and path.parent.name in ("agent", "agents")
+        )
 
     def parse(self, path: Path, level: ConfigLevel) -> Customization:
         """Parse agent file."""

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/src/lazyopencode/services/parsers/command.py

@@ -23,7 +23,11 @@ class CommandParser(ICustomizationParser):
 
     def can_parse(self, path: Path) -> bool:
         """Check if path is a command markdown file."""
-        return path.is_file() and path.suffix == ".md" and path.parent.name == "command"
+        return (
+            path.is_file()
+            and path.suffix == ".md"
+            and path.parent.name in ("command", "commands")
+        )
 
     def parse(self, path: Path, level: ConfigLevel) -> Customization:
         """Parse command file."""

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/src/lazyopencode/services/parsers/plugin.py

@@ -32,7 +32,7 @@ class PluginParser(ICustomizationParser):
         return (
             path.is_file()
             and path.suffix in self.VALID_EXTENSIONS
-            and path.parent.name == "plugin"
+            and path.parent.name in ("plugin", "plugins")
         )
 
     def parse(self, path: Path, level: ConfigLevel) -> Customization:

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/src/lazyopencode/services/parsers/skill.py

@@ -92,10 +92,11 @@ class SkillParser(ICustomizationParser):
 
     def can_parse(self, path: Path) -> bool:
         """Check if path is a SKILL.md file in a skill directory."""
+        parent_dir_name = path.parent.parent.name
         return (
             path.is_file()
             and path.name == "SKILL.md"
-            and path.parent.parent.name == "skill"
+            and parent_dir_name in ("skill", "skills")
         )
 
     def parse(self, path: Path, level: ConfigLevel) -> Customization:

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/src/lazyopencode/services/parsers/tool.py

@@ -24,7 +24,7 @@ class ToolParser(ICustomizationParser):
         return (
             path.is_file()
             and path.suffix in self.VALID_EXTENSIONS
-            and path.parent.name == "tool"
+            and path.parent.name in ("tool", "tools")
         )
 
     def parse(self, path: Path, level: ConfigLevel) -> Customization:

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/tests/conftest.py

@@ -146,6 +146,36 @@ def project_config_path(fake_project_root: Path, fs: FakeFilesystem) -> Path:
     return project_opencode
 
 
+@pytest.fixture
+def agents_project_skills(fake_project_root: Path, fs: FakeFilesystem) -> Path:
+    """Create .agents/skills/ directory with fixture skill at project level."""
+    agents_skills = fake_project_root / ".agents" / "skills"
+    fs.create_dir(agents_skills)
+
+    fs.add_real_directory(
+        FIXTURES_DIR / "agents-skill" / "agents-compat-skill",
+        target_path=agents_skills / "agents-compat-skill",
+        read_only=False,
+    )
+
+    return agents_skills
+
+
+@pytest.fixture
+def agents_global_skills(fake_home: Path, fs: FakeFilesystem) -> Path:
+    """Create ~/.agents/skills/ directory with fixture skill at global level."""
+    agents_skills = fake_home / ".agents" / "skills"
+    fs.create_dir(agents_skills)
+
+    fs.add_real_directory(
+        FIXTURES_DIR / "agents-skill" / "agents-compat-skill",
+        target_path=agents_skills / "agents-compat-skill",
+        read_only=False,
+    )
+
+    return agents_skills
+
+
 @pytest.fixture
 def full_user_config(
     user_config_path: Path,

{lazyopencode-0.2.1 → lazyopencode-0.2.3}/tests/integration/discovery/test_skills.py

@@ -146,6 +146,66 @@ class TestSkillDiscovery:
         assert "reference.md" in file_names
         assert "scripts" in file_names
 
+    def test_discovers_project_agents_compat_skills(
+        self,
+        agents_project_skills: Path,  # noqa: ARG002
+        fake_project_root: Path,
+        fake_home: Path,
+    ) -> None:
+        """Test discovering skills from .agents/skills/ at project level."""
+        service = ConfigDiscoveryService(
+            project_root=fake_project_root,
+            global_config_path=fake_home / ".config" / "opencode",
+        )
+
+        skills = service.by_type(CustomizationType.SKILL)
+        project_skills = [s for s in skills if s.level == ConfigLevel.PROJECT]
+
+        assert len(project_skills) == 1
+        assert project_skills[0].name == "agents-compat-skill"
+        assert project_skills[0].description == "Skill discovered from .agents/ path"
+
+    def test_discovers_global_agents_compat_skills(
+        self,
+        agents_global_skills: Path,  # noqa: ARG002
+        fake_project_root: Path,
+        fake_home: Path,
+    ) -> None:
+        """Test discovering skills from ~/.agents/skills/ at global level."""
+        service = ConfigDiscoveryService(
+            project_root=fake_project_root,
+            global_config_path=fake_home / ".config" / "opencode",
+        )
+
+        skills = service.by_type(CustomizationType.SKILL)
+        global_skills = [s for s in skills if s.level == ConfigLevel.GLOBAL]
+
+        assert len(global_skills) == 1
+        assert global_skills[0].name == "agents-compat-skill"
+
+    def test_agents_compat_skills_deduplicated(
+        self,
+        project_config_path: Path,  # noqa: ARG002
+        agents_project_skills: Path,  # noqa: ARG002
+        fake_project_root: Path,
+        fake_home: Path,
+    ) -> None:
+        """Test that same skill in .opencode/ and .agents/ is not duplicated."""
+        # The agents-compat-skill is only in .agents/, project-skill is only in .opencode/
+        # So total project skills should be 2, not 3
+        service = ConfigDiscoveryService(
+            project_root=fake_project_root,
+            global_config_path=fake_home / ".config" / "opencode",
+        )
+
+        skills = service.by_type(CustomizationType.SKILL)
+        project_skills = [s for s in skills if s.level == ConfigLevel.PROJECT]
+
+        names = [s.name for s in project_skills]
+        assert "project-skill" in names
+        assert "agents-compat-skill" in names
+        assert len(project_skills) == 2
+
     def test_skill_nested_directory_structure(
         self,
         project_config_path: Path,  # noqa: ARG002

lazyopencode-0.2.3/tests/integration/fixtures/agents-skill/agents-compat-skill/SKILL.md

@@ -0,0 +1,7 @@
+---
+name: agents-compat-skill
+description: Skill discovered from .agents/ path
+---
+# Agents-Compatible Skill
+
+This skill is discovered from the .agents/skills/ directory.