apm-cli 0.8.8__tar.gz → 0.8.9__tar.gz

{apm_cli-0.8.8/src/apm_cli.egg-info → apm_cli-0.8.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apm-cli
-Version: 0.8.8
+Version: 0.8.9
 Summary: MCP configuration tool
 Author-email: Daniel Meppiel <user@example.com>
 License: MIT License

{apm_cli-0.8.8 → apm_cli-0.8.9}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apm-cli"
-version = "0.8.8"
+version = "0.8.9"
 description = "MCP configuration tool"
 readme = "README.md"
 requires-python = ">=3.10"

{apm_cli-0.8.8 → apm_cli-0.8.9}/src/apm_cli/marketplace/models.py

@@ -82,6 +82,7 @@ class MarketplaceManifest:
     plugins: Tuple[MarketplacePlugin, ...] = ()
     owner_name: str = ""
     description: str = ""
+    plugin_root: str = ""  # metadata.pluginRoot - base path for bare-name sources
 
     def find_plugin(self, plugin_name: str) -> Optional[MarketplacePlugin]:
         """Find a plugin by exact name (case-insensitive)."""
@@ -195,6 +196,14 @@ def parse_marketplace_json(
         data.get("owner"), dict
     ) else data.get("owner", "")
 
+    # Extract pluginRoot from metadata (base path for bare-name sources)
+    metadata = data.get("metadata", {})
+    plugin_root = ""
+    if isinstance(metadata, dict):
+        raw_root = metadata.get("pluginRoot", "")
+        if isinstance(raw_root, str):
+            plugin_root = raw_root.strip()
+
     raw_plugins = data.get("plugins", [])
     if not isinstance(raw_plugins, list):
         logger.warning(
@@ -216,4 +225,5 @@ def parse_marketplace_json(
         plugins=tuple(plugins),
         owner_name=owner_name,
         description=description,
+        plugin_root=plugin_root,
     )

{apm_cli-0.8.8 → apm_cli-0.8.9}/src/apm_cli/marketplace/resolver.py

@@ -111,16 +111,33 @@ def _resolve_git_subdir_source(source: dict) -> str:
     return base
 
 
-def _resolve_relative_source(source: str, marketplace_owner: str, marketplace_repo: str) -> str:
+def _resolve_relative_source(
+    source: str,
+    marketplace_owner: str,
+    marketplace_repo: str,
+    plugin_root: str = "",
+) -> str:
     """Resolve a relative path source to ``owner/repo[/subdir]``.
 
     Relative sources point to subdirectories within the marketplace repo itself.
+    When *plugin_root* is set (from ``metadata.pluginRoot`` in the manifest),
+    bare names (no ``/``) are resolved under that directory.
     """
     # Normalize the relative path (strip leading ./ and trailing /)
     rel = source.strip("/")
     if rel.startswith("./"):
         rel = rel[2:]
     rel = rel.strip("/")
+
+    # If plugin_root is set and source is a bare name, prepend it
+    if plugin_root and rel and rel != "." and "/" not in rel:
+        root = plugin_root.strip("/")
+        if root.startswith("./"):
+            root = root[2:]
+        root = root.strip("/")
+        if root:
+            rel = f"{root}/{rel}"
+
     if rel and rel != ".":
         try:
             validate_path_segments(rel, context="relative source path")
@@ -134,6 +151,7 @@ def resolve_plugin_source(
     plugin: MarketplacePlugin,
     marketplace_owner: str = "",
     marketplace_repo: str = "",
+    plugin_root: str = "",
 ) -> str:
     """Resolve a plugin's source to a canonical ``owner/repo[#ref]`` string.
 
@@ -144,6 +162,7 @@ def resolve_plugin_source(
         plugin: The marketplace plugin to resolve.
         marketplace_owner: Owner of the marketplace repo (for relative sources).
         marketplace_repo: Repo name of the marketplace (for relative sources).
+        plugin_root: Base path for bare-name sources (from metadata.pluginRoot).
 
     Returns:
         Canonical ``owner/repo[#ref]`` string.
@@ -157,7 +176,9 @@ def resolve_plugin_source(
 
     # String source = relative path
     if isinstance(source, str):
-        return _resolve_relative_source(source, marketplace_owner, marketplace_repo)
+        return _resolve_relative_source(
+            source, marketplace_owner, marketplace_repo, plugin_root=plugin_root
+        )
 
     if not isinstance(source, dict):
         raise ValueError(
@@ -217,6 +238,7 @@ def resolve_marketplace_plugin(
         plugin,
         marketplace_owner=source.owner,
         marketplace_repo=source.repo,
+        plugin_root=manifest.plugin_root,
     )
 
     logger.debug(

{apm_cli-0.8.8 → apm_cli-0.8.9/src/apm_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apm-cli
-Version: 0.8.8
+Version: 0.8.9
 Summary: MCP configuration tool
 Author-email: Daniel Meppiel <user@example.com>
 License: MIT License