lazyopencode 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → lazyopencode-0.2.3.dist-info}/METADATA

@@ -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.dist-info → lazyopencode-0.2.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lazyopencode/__init__.py,sha256=roprUA5NQ0OsqJrG-XYGgCJYST5_M3oQNKSVrpDZM1E,1558
 lazyopencode/__main__.py,sha256=8sGwTbHrRZyACIYWqpMRP76sq7fTBeJSj-VOAd6hUKE,120
-lazyopencode/_version.py,sha256=vYqoJTG51NOUmYyL0xt8asRK8vUT4lGAdal_EZ59mvw,704
+lazyopencode/_version.py,sha256=kBRz0P2plw1eVdIpt70W6m1LMbEIhLY3RyOfVGdubaI,704
 lazyopencode/app.py,sha256=L7fpKK8VO7NduLvdgGQlROAfxo7O7D_RpVtxCXgICq8,18137
 lazyopencode/bindings.py,sha256=nIcMU77LxjQQ2YsitSdmcODP9e3UGHqZyc8NCnTFQ4s,1394
 lazyopencode/themes.py,sha256=9KsyWlk9XeAupAdUTj785riWuDlQMnERjD8DUzogCPc,713
@@ -10,7 +10,7 @@ lazyopencode/mixins/navigation.py,sha256=RHA5J9Wn9nYjDmRglMagvn94OFTti8q3yuYI6bN
 lazyopencode/models/__init__.py,sha256=X2Wlkc6IS1nQF0JNTvqZNNLh6YI1SH-D5YP4xpWL-rc,298
 lazyopencode/models/customization.py,sha256=4Vu2lCaRT5icdzx01A83camsdOSVlu0t-q3CF9Tkt2A,4453
 lazyopencode/services/__init__.py,sha256=aCVZJecnMeupVU-T6EhR34dFu295XwJP9dqZ8MKWOJE,146
-lazyopencode/services/discovery.py,sha256=w7qv_Sk83zpmEZJnP1HCM8JxaJDHqyQE59zQP3prrJc,13510
+lazyopencode/services/discovery.py,sha256=UeeXkPlHzyVs9w8w42Nqp0_idxtKxykg8xZiJN2d2I0,15555
 lazyopencode/services/gitignore_filter.py,sha256=9QFKrUsSm0kSSYXzJ3_Zx440Pk1T6CSo6eaoPP5Pthk,3155
 lazyopencode/services/writer.py,sha256=B9XZor9VH28P3Fo6sQ2HhT1Tj1eDq7Pcc8i-YpkYoGg,5328
 lazyopencode/services/claude_code/__init__.py,sha256=lMcoJR-x2eHR6ddvL3YbYT4xonGjKKFUdHwjBwEcaNg,310
@@ -21,13 +21,13 @@ lazyopencode/services/claude_code/parsers/agent.py,sha256=YeqmBinlqViAWb2FGxnsAn
 lazyopencode/services/claude_code/parsers/command.py,sha256=E8H0X0lMaEzT2PIpNQKhtydf3chw7NKzNh-F9B121Cw,2429
 lazyopencode/services/claude_code/parsers/skill.py,sha256=nD7JxkJW_hHrvA0Nfb5t7OKx4p1TBIdlfn90-KfGVak,3805
 lazyopencode/services/parsers/__init__.py,sha256=zav6eIpqF5TGFp2jlGSOFZtCicHyltA--cVMycox9M0,4344
-lazyopencode/services/parsers/agent.py,sha256=zaw8y3RZsPFOu8DsoM3b2XPGzp0BnQJcbx86mEIYUxM,2885
-lazyopencode/services/parsers/command.py,sha256=-Mg3sq_4TLkIvXKzIX4lB7KvU0e4T0TA-5lpwhcUgBE,2977
+lazyopencode/services/parsers/agent.py,sha256=mRbNeUttKUEwos63L6kA4_75MnO4RYrD8-HYDSOIN5M,2945
+lazyopencode/services/parsers/command.py,sha256=fNAEhfQiXUw5_bT6xjm2qYyQwZhz_1Fgt1keP8RC3UI,3039
 lazyopencode/services/parsers/mcp.py,sha256=4C5LoXE82KOG7e-hoS12U-0MSDiyPjPAHKE4EmOlaIE,2127
-lazyopencode/services/parsers/plugin.py,sha256=7J-z7-5iOnk64iYxDPiVV9ak013KKJQhdjolBn43z7A,4014
+lazyopencode/services/parsers/plugin.py,sha256=qIl5n8EbZDJn6MQOPPndjlG3VfRbHMJM25xsTI1BqGs,4027
 lazyopencode/services/parsers/rules.py,sha256=D92lCK_UHnVAeXV4W-lVX5kztwQY9gPEaJQgWp2exBo,2053
-lazyopencode/services/parsers/skill.py,sha256=WMKIv1HJSdx0vt0KJ9YtQ0oB1G5GOOC_smnBPynx7s8,4062
-lazyopencode/services/parsers/tool.py,sha256=sL3N63cim68R_wo5s0WONnnnvYxrK-tyiGCIc7guMV0,1800
+lazyopencode/services/parsers/skill.py,sha256=ink4nab0CoanzPp8iktYZByg5cU88mbL6R4fCmqkJuE,4116
+lazyopencode/services/parsers/tool.py,sha256=m6PQZCTcqVQleMF2xYSdZkEzf3VR_Pr5OXHthIzfooY,1811
 lazyopencode/styles/app.tcss,sha256=fAAWxQ7ePJ7oYfMUoU3ffC3PfJ9hGocHhPF7nNMf-qU,2658
 lazyopencode/widgets/__init__.py,sha256=syhZGjXKhKjg75iSU1xgRqiRWV-S-Jh8ipd0g1-qkMs,497
 lazyopencode/widgets/app_footer.py,sha256=K5qf_KhY6njSh8UXTtn7LahnACzMuNnhRlfzGBu2E7U,2478
@@ -40,8 +40,8 @@ lazyopencode/widgets/status_panel.py,sha256=k4lx4GrHlVUvt6t32_bz2WOWvZdPNawdSMhm
 lazyopencode/widgets/type_panel.py,sha256=wg2D5diKvdrwco7pvcUnF9WPOgTveiH1qt0O82gkqa4,19313
 lazyopencode/widgets/helpers/__init__.py,sha256=-jGrYtTMl9rmX8Q5Vod_oAuYaMl6Yh5JRwv8AFKQcwk,135
 lazyopencode/widgets/helpers/rendering.py,sha256=lgxzVsnH6fgTZss2x4n8hKYYtDN35YmFMD83impkpH8,576
-lazyopencode-0.2.1.dist-info/METADATA,sha256=n_xtbwjR_Xdtg0HovrurySD2iP3x43uQlL8dpM3kPp4,4243
-lazyopencode-0.2.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-lazyopencode-0.2.1.dist-info/entry_points.txt,sha256=PPVT4NhHce2hFuMj-NQTSN9xQIM2jwb0_ojMEcOpPJ0,60
-lazyopencode-0.2.1.dist-info/licenses/LICENSE,sha256=KY9Pw3pDaLTe2eiMvUoj09VHhE3i8N1Le0d01JrG_3Q,1069
-lazyopencode-0.2.1.dist-info/RECORD,,
+lazyopencode-0.2.3.dist-info/METADATA,sha256=kAmDDpZ_0GxA2RXHLvp_H-pWDZ4EYtB2n1uGLiK9Qho,4243
+lazyopencode-0.2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+lazyopencode-0.2.3.dist-info/entry_points.txt,sha256=PPVT4NhHce2hFuMj-NQTSN9xQIM2jwb0_ojMEcOpPJ0,60
+lazyopencode-0.2.3.dist-info/licenses/LICENSE,sha256=KY9Pw3pDaLTe2eiMvUoj09VHhE3i8N1Le0d01JrG_3Q,1069
+lazyopencode-0.2.3.dist-info/RECORD,,