✨ feat(discovery): support custom component paths from marketplace.json

Add discovery of commands, agents, skills, MCPs, and hooks from custom
paths specified in marketplace.json extra_metadata. This enables plugins
to define non-standard locations for their components.

- Add marketplace_plugin parameter to discover_from_directory
- Support both wrapped and unwrapped MCP formats for .mcp.json files
- Refactor duplicate discovery logic into _discover_md_files_from_paths

Author: NikiforovAll

src/lazyclaude/app.py

@@ -841,7 +841,7 @@ def _enter_plugin_preview(self, plugin: MarketplacePlugin) -> None:
             is_enabled=plugin.is_enabled,
         )
         self._plugin_customizations = self._discovery_service.discover_from_directory(
-            plugin_dir, plugin_info
+            plugin_dir, plugin_info, marketplace_plugin=plugin
         )
         self._previewing_plugin = plugin
         self._plugin_preview_mode = True

src/lazyclaude/services/discovery.py

@@ -10,6 +10,7 @@
     CustomizationType,
     PluginInfo,
 )
+from lazyclaude.models.marketplace import MarketplacePlugin
 from lazyclaude.services.filesystem_scanner import (
     FilesystemScanner,
     GlobStrategy,
@@ -97,14 +98,19 @@ def refresh(self) -> list[Customization]:
 
     @abstractmethod
     def discover_from_directory(
-        self, plugin_dir: Path, plugin_info: PluginInfo | None = None
+        self,
+        plugin_dir: Path,
+        plugin_info: PluginInfo | None = None,
+        marketplace_plugin: MarketplacePlugin | None = None,
     ) -> list[Customization]:
         """
         Discover customizations from a specific directory (for plugin preview).
 
         Args:
             plugin_dir: The directory to scan for customizations.
             plugin_info: Optional plugin info to attach to customizations.
+            marketplace_plugin: Optional marketplace plugin with extra metadata
+                containing skill paths etc.
 
         Returns:
             List of customizations found in the directory.
@@ -194,7 +200,10 @@ def get_active_config_path(self) -> Path:
         return self.user_config_path
 
     def discover_from_directory(
-        self, plugin_dir: Path, plugin_info: PluginInfo | None = None
+        self,
+        plugin_dir: Path,
+        plugin_info: PluginInfo | None = None,
+        marketplace_plugin: MarketplacePlugin | None = None,
     ) -> list[Customization]:
         """Discover customizations from a specific directory (for plugin preview)."""
         customizations: list[Customization] = []
@@ -208,6 +217,14 @@ def discover_from_directory(
                 plugin_scanner.scan_directory(plugin_dir, config, level, plugin_info)
             )
 
+        if marketplace_plugin:
+            seen_paths = {c.path.resolve() for c in customizations if c.path}
+            customizations.extend(
+                self._discover_marketplace_components(
+                    plugin_dir, marketplace_plugin, plugin_info, seen_paths
+                )
+            )
+
         if plugin_info:
             customizations.extend(self._discover_plugin_mcps(plugin_dir, plugin_info))
             customizations.extend(self._discover_plugin_hooks(plugin_dir, plugin_info))
@@ -224,6 +241,168 @@ def _sort_customizations(
             key=lambda c: (type_order[c.type], c.name.lower()),
         )
 
+    def _discover_marketplace_components(
+        self,
+        plugin_dir: Path,
+        marketplace_plugin: MarketplacePlugin,
+        plugin_info: PluginInfo | None,
+        seen_paths: set[Path],
+    ) -> list[Customization]:
+        """Discover components using custom paths from marketplace.json."""
+        customizations: list[Customization] = []
+        extra = marketplace_plugin.extra_metadata
+
+        commands_paths = self._normalize_paths(extra.get("commands"))
+        if commands_paths:
+            cmd_parser = SlashCommandParser(plugin_dir)
+            customizations.extend(
+                self._discover_md_files_from_paths(
+                    cmd_parser, plugin_dir, commands_paths, plugin_info, seen_paths
+                )
+            )
+
+        agents_paths = self._normalize_paths(extra.get("agents"))
+        if agents_paths:
+            agent_parser = SubagentParser(plugin_dir)
+            customizations.extend(
+                self._discover_md_files_from_paths(
+                    agent_parser, plugin_dir, agents_paths, plugin_info, seen_paths
+                )
+            )
+
+        skills_paths = self._normalize_paths(extra.get("skills"))
+        if skills_paths:
+            customizations.extend(
+                self._discover_custom_skills(
+                    plugin_dir, skills_paths, plugin_info, seen_paths
+                )
+            )
+
+        mcp_servers = extra.get("mcpServers")
+        if mcp_servers and isinstance(mcp_servers, str):
+            customizations.extend(
+                self._discover_custom_mcps(plugin_dir, mcp_servers, plugin_info)
+            )
+
+        hooks = extra.get("hooks")
+        if hooks and isinstance(hooks, str):
+            customizations.extend(
+                self._discover_custom_hooks(plugin_dir, hooks, plugin_info)
+            )
+
+        return customizations
+
+    @staticmethod
+    def _normalize_paths(value: str | list[str] | None) -> list[str]:
+        """Normalize path value to list of strings."""
+        if value is None:
+            return []
+        if isinstance(value, str):
+            return [value]
+        return value
+
+    def _discover_md_files_from_paths(
+        self,
+        parser: SlashCommandParser | SubagentParser,
+        plugin_dir: Path,
+        paths: list[str],
+        plugin_info: PluginInfo | None,
+        seen_paths: set[Path],
+    ) -> list[Customization]:
+        """Discover markdown-based customizations from custom paths."""
+        customizations: list[Customization] = []
+
+        for path_str in paths:
+            target = (plugin_dir / path_str).resolve()
+
+            if target.is_file() and target.suffix == ".md":
+                if target not in seen_paths:
+                    c = parser.parse(target, ConfigLevel.PLUGIN)
+                    if plugin_info:
+                        c.plugin_info = plugin_info
+                    customizations.append(c)
+                    seen_paths.add(target)
+            elif target.is_dir():
+                for md_file in target.rglob("*.md"):
+                    resolved = md_file.resolve()
+                    if resolved not in seen_paths:
+                        c = parser.parse(md_file, ConfigLevel.PLUGIN)
+                        if plugin_info:
+                            c.plugin_info = plugin_info
+                        customizations.append(c)
+                        seen_paths.add(resolved)
+
+        return customizations
+
+    def _discover_custom_skills(
+        self,
+        plugin_dir: Path,
+        paths: list[str],
+        plugin_info: PluginInfo | None,
+        seen_paths: set[Path],
+    ) -> list[Customization]:
+        """Discover skills from custom paths."""
+        customizations: list[Customization] = []
+        parser = SkillParser(plugin_dir)
+
+        for path_str in paths:
+            target = (plugin_dir / path_str).resolve()
+
+            if target.is_dir():
+                skill_file = target / "SKILL.md"
+                if skill_file.is_file():
+                    resolved = skill_file.resolve()
+                    if resolved not in seen_paths:
+                        c = parser.parse(skill_file, ConfigLevel.PLUGIN)
+                        if plugin_info:
+                            c.plugin_info = plugin_info
+                        customizations.append(c)
+                        seen_paths.add(resolved)
+
+        return customizations
+
+    def _discover_custom_mcps(
+        self,
+        plugin_dir: Path,
+        mcp_path: str,
+        plugin_info: PluginInfo | None,
+    ) -> list[Customization]:
+        """Discover MCPs from custom path in marketplace.json."""
+        customizations: list[Customization] = []
+        mcp_file = (plugin_dir / mcp_path).resolve()
+
+        if not mcp_file.is_file():
+            return customizations
+
+        parser = MCPParser()
+        for customization in parser.parse(mcp_file, ConfigLevel.PLUGIN):
+            if plugin_info:
+                customization.plugin_info = plugin_info
+            customizations.append(customization)
+
+        return customizations
+
+    def _discover_custom_hooks(
+        self,
+        plugin_dir: Path,
+        hooks_path: str,
+        plugin_info: PluginInfo | None,
+    ) -> list[Customization]:
+        """Discover hooks from custom path in marketplace.json."""
+        customizations: list[Customization] = []
+        hooks_file = (plugin_dir / hooks_path).resolve()
+
+        if not hooks_file.is_file():
+            return customizations
+
+        parser = HookParser()
+        for customization in parser.parse(hooks_file, ConfigLevel.PLUGIN):
+            if plugin_info:
+                customization.plugin_info = plugin_info
+            customizations.append(customization)
+
+        return customizations
+
     def _discover_memory_files(self) -> list[Customization]:
         """Discover memory files from user and project levels."""
         customizations: list[Customization] = []

src/lazyclaude/services/parsers/mcp.py

@@ -48,12 +48,20 @@ def parse(self, path: Path, level: ConfigLevel) -> list[Customization]:  # type:
                 )
             ]
 
-        mcp_servers = data.get("mcpServers", {})
+        # .claude.json requires wrapped {"mcpServers": {...}} format
+        # .mcp.json and plugin configs support both wrapped {"mcpServers": {...}} and unwrapped {...} formats
+        if path.name == ".claude.json":
+            mcp_servers = data.get("mcpServers", {})
+        else:
+            mcp_servers = data.get("mcpServers", data)
+
         if not mcp_servers:
             return []
 
         customizations = []
         for server_name, server_config in mcp_servers.items():
+            if not isinstance(server_config, dict):
+                continue
             customizations.append(
                 self.parse_server_config(server_name, server_config, path, level)
             )