apm-cli 0.8.3__tar.gz → 0.8.4__tar.gz

{apm_cli-0.8.3/src/apm_cli.egg-info → apm_cli-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apm-cli
-Version: 0.8.3
+Version: 0.8.4
 Summary: MCP configuration tool
 Author-email: Daniel Meppiel <user@example.com>
 License: MIT License
@@ -52,6 +52,7 @@ Requires-Dist: GitPython>=3.1.0
 Provides-Extra: dev
 Requires-Dist: pytest>=7.0.0; extra == "dev"
 Requires-Dist: pytest-cov>=4.0.0; extra == "dev"
+Requires-Dist: pytest-xdist>=3.0.0; extra == "dev"
 Requires-Dist: black>=26.3.1; python_version >= "3.10" and extra == "dev"
 Requires-Dist: isort>=5.0.0; extra == "dev"
 Requires-Dist: mypy>=1.0.0; extra == "dev"

{apm_cli-0.8.3 → apm_cli-0.8.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "apm-cli"
-version = "0.8.3"
+version = "0.8.4"
 description = "MCP configuration tool"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -41,6 +41,7 @@ dependencies = [
 dev = [
     "pytest>=7.0.0",
     "pytest-cov>=4.0.0",
+    "pytest-xdist>=3.0.0",
     "black>=26.3.1; python_version>='3.10'",
     "isort>=5.0.0",
     "mypy>=1.0.0",
@@ -70,7 +71,7 @@ warn_return_any = true
 warn_unused_configs = true
 
 [tool.pytest.ini_options]
-addopts = "-m 'not benchmark'"
+addopts = "-m 'not benchmark' -n auto"
 markers = [
     "integration: marks tests as integration tests that may require network access",
     "slow: marks tests as slow running tests",

{apm_cli-0.8.3 → apm_cli-0.8.4}/src/apm_cli/adapters/client/copilot.py

@@ -12,6 +12,7 @@ from .base import MCPClientAdapter
 from ...registry.client import SimpleRegistryClient
 from ...registry.integration import RegistryIntegration
 from ...core.docker_args import DockerArgsProcessor
+from ...core.token_manager import GitHubTokenManager
 from ...utils.github_host import is_github_hostname
 
 
@@ -199,8 +200,10 @@ class CopilotClientAdapter(MCPClientAdapter):
             is_github_server = self._is_github_server(server_name, remote.get("url", ""))
             
             if is_github_server:
-                # Check for GitHub Personal Access Token
-                github_token = os.getenv("GITHUB_PERSONAL_ACCESS_TOKEN")
+                # Use centralized token manager (copilot chain: GITHUB_COPILOT_PAT → GITHUB_TOKEN → GITHUB_APM_PAT),
+                # falling back to GITHUB_PERSONAL_ACCESS_TOKEN for Copilot CLI compat.
+                _tm = GitHubTokenManager()
+                github_token = _tm.get_token_for_purpose('copilot') or os.getenv("GITHUB_PERSONAL_ACCESS_TOKEN")
                 if github_token:
                     config["headers"] = {
                         "Authorization": f"Bearer {github_token}"

{apm_cli-0.8.3 → apm_cli-0.8.4}/src/apm_cli/adapters/client/vscode.py

@@ -32,7 +32,7 @@ class VSCodeClientAdapter(MCPClientAdapter):
         self.registry_client = SimpleRegistryClient(registry_url)
         self.registry_integration = RegistryIntegration(registry_url)
     
-    def get_config_path(self):
+    def get_config_path(self, logger=None):
         """Get the path to the VSCode MCP configuration file in the repository.
         
         Returns:
@@ -50,11 +50,14 @@ class VSCodeClientAdapter(MCPClientAdapter):
             if not vscode_dir.exists():
                 vscode_dir.mkdir(parents=True, exist_ok=True)
         except Exception as e:
-            print(f"Warning: Could not create .vscode directory: {e}")
+            if logger:
+                logger.warning(f"Could not create .vscode directory: {e}")
+            else:
+                print(f"Warning: Could not create .vscode directory: {e}")
             
         return str(mcp_config_path)
     
-    def update_config(self, new_config):
+    def update_config(self, new_config, logger=None):
         """Update the VSCode MCP configuration with new values.
         
         Args:
@@ -63,7 +66,7 @@ class VSCodeClientAdapter(MCPClientAdapter):
         Returns:
             bool: True if successful, False otherwise.
         """
-        config_path = self.get_config_path()
+        config_path = self.get_config_path(logger=logger)
         
         try:
             # Write the updated config
@@ -72,16 +75,19 @@ class VSCodeClientAdapter(MCPClientAdapter):
                 
             return True
         except Exception as e:
-            print(f"Error updating VSCode MCP configuration: {e}")
+            if logger:
+                logger.error(f"Error updating VSCode MCP configuration: {e}")
+            else:
+                print(f"Error updating VSCode MCP configuration: {e}")
             return False
     
-    def get_current_config(self):
+    def get_current_config(self, logger=None):
         """Get the current VSCode MCP configuration.
         
         Returns:
             dict: Current VSCode MCP configuration from the local .vscode/mcp.json file.
         """
-        config_path = self.get_config_path()
+        config_path = self.get_config_path(logger=logger)
         
         try:
             try:
@@ -90,10 +96,13 @@ class VSCodeClientAdapter(MCPClientAdapter):
             except (FileNotFoundError, json.JSONDecodeError):
                 return {}
         except Exception as e:
-            print(f"Error reading VSCode MCP configuration: {e}")
+            if logger:
+                logger.error(f"Error reading VSCode MCP configuration: {e}")
+            else:
+                print(f"Error reading VSCode MCP configuration: {e}")
             return {}
     
-    def configure_mcp_server(self, server_url, server_name=None, enabled=True, env_overrides=None, server_info_cache=None, runtime_vars=None):
+    def configure_mcp_server(self, server_url, server_name=None, enabled=True, env_overrides=None, server_info_cache=None, runtime_vars=None, logger=None):
         """Configure an MCP server in VS Code mcp.json file.
         
         This method updates the .vscode/mcp.json file to add or update
@@ -105,6 +114,7 @@ class VSCodeClientAdapter(MCPClientAdapter):
             enabled (bool, optional): Whether to enable the server. Defaults to True.
             env_overrides (dict, optional): Environment variable overrides. Defaults to None.
             server_info_cache (dict, optional): Pre-fetched server info to avoid duplicate registry calls.
+            logger: Optional CommandLogger for structured output.
             
         Returns:
             bool: True if successful, False otherwise.
@@ -113,7 +123,10 @@ class VSCodeClientAdapter(MCPClientAdapter):
             ValueError: If server is not found in registry.
         """
         if not server_url:
-            print("Error: server_url cannot be empty")
+            if logger:
+                logger.error("server_url cannot be empty")
+            else:
+                print("Error: server_url cannot be empty")
             return False
             
         try:
@@ -133,14 +146,17 @@ class VSCodeClientAdapter(MCPClientAdapter):
             server_config, input_vars = self._format_server_config(server_info)
             
             if not server_config:
-                print(f"Unable to configure server: {server_url}")
+                if logger:
+                    logger.error(f"Unable to configure server: {server_url}")
+                else:
+                    print(f"Unable to configure server: {server_url}")
                 return False
             
             # Use provided server name or fallback to server_url
             config_key = server_name or server_url
             
             # Get current config
-            current_config = self.get_current_config()
+            current_config = self.get_current_config(logger=logger)
             
             # Ensure servers and inputs sections exist
             if "servers" not in current_config:
@@ -159,17 +175,23 @@ class VSCodeClientAdapter(MCPClientAdapter):
                     existing_input_ids.add(var.get("id"))
             
             # Update the configuration
-            result = self.update_config(current_config)
+            result = self.update_config(current_config, logger=logger)
             
             if result:
-                print(f"Successfully configured MCP server '{config_key}' for VS Code")
+                if logger:
+                    logger.verbose_detail(f"Configured MCP server '{config_key}' for VS Code")
+                else:
+                    print(f"Successfully configured MCP server '{config_key}' for VS Code")
             return result
             
         except ValueError:
             # Re-raise ValueError for registry errors
             raise
         except Exception as e:
-            print(f"Error configuring MCP server: {e}")
+            if logger:
+                logger.error(f"Error configuring MCP server: {e}")
+            else:
+                print(f"Error configuring MCP server: {e}")
             return False
 
     def _format_server_config(self, server_info):

apm_cli-0.8.4/src/apm_cli/bundle/lockfile_enrichment.py

@@ -0,0 +1,76 @@
+"""Lockfile enrichment for pack-time metadata."""
+
+from datetime import datetime, timezone
+from typing import List
+
+from ..deps.lockfile import LockFile
+
+
+# Must stay in sync with packer._TARGET_PREFIXES
+_TARGET_PREFIXES = {
+    "copilot": [".github/"],
+    "vscode": [".github/"],
+    "claude": [".claude/"],
+    "cursor": [".cursor/"],
+    "opencode": [".opencode/"],
+    "all": [".github/", ".claude/", ".cursor/", ".opencode/"],
+}
+
+
+def _filter_files_by_target(deployed_files: List[str], target: str) -> List[str]:
+    """Filter deployed file paths by target prefix."""
+    prefixes = _TARGET_PREFIXES.get(target, _TARGET_PREFIXES["all"])
+    return [f for f in deployed_files if any(f.startswith(p) for p in prefixes)]
+
+
+def enrich_lockfile_for_pack(
+    lockfile: LockFile,
+    fmt: str,
+    target: str,
+) -> str:
+    """Create an enriched copy of the lockfile YAML with a ``pack:`` section.
+
+    Filters each dependency's ``deployed_files`` to only include paths
+    matching the pack *target*, so the bundle lockfile is consistent with
+    the files actually shipped in the bundle.
+
+    Does NOT mutate the original *lockfile* object  -- serialises a copy and
+    prepends the pack metadata.
+
+    Args:
+        lockfile: The resolved lockfile to enrich.
+        fmt: Bundle format (``"apm"`` or ``"plugin"``).
+        target: Effective target used for packing (``"vscode"``, ``"claude"``, ``"all"``).
+
+    Returns:
+        A YAML string with the ``pack:`` block followed by the original
+        lockfile content.
+    """
+    import yaml
+
+    pack_section = yaml.dump(
+        {
+            "pack": {
+                "format": fmt,
+                "target": target,
+                "packed_at": datetime.now(timezone.utc).isoformat(),
+            }
+        },
+        default_flow_style=False,
+        sort_keys=False,
+    )
+
+    # Build a filtered lockfile YAML: each dep's deployed_files is narrowed
+    # to only the paths matching the pack target.
+    data = yaml.safe_load(lockfile.to_yaml())
+    if data and "dependencies" in data:
+        for dep in data["dependencies"]:
+            if "deployed_files" in dep:
+                dep["deployed_files"] = _filter_files_by_target(
+                    dep["deployed_files"], target
+                )
+
+    lockfile_yaml = yaml.dump(
+        data, default_flow_style=False, sort_keys=False, allow_unicode=True
+    )
+    return pack_section + lockfile_yaml

{apm_cli-0.8.3 → apm_cli-0.8.4}/src/apm_cli/bundle/packer.py

@@ -10,18 +10,7 @@ from typing import List, Optional
 from ..deps.lockfile import LockFile, get_lockfile_path, migrate_lockfile_if_needed
 from ..models.apm_package import APMPackage
 from ..core.target_detection import detect_target
-from .lockfile_enrichment import enrich_lockfile_for_pack
-
-
-# Target prefix mapping ("copilot" and "vscode" both map to .github/)
-_TARGET_PREFIXES = {
-    "copilot": [".github/"],
-    "vscode": [".github/"],
-    "claude": [".claude/"],
-    "cursor": [".cursor/"],
-    "opencode": [".opencode/"],
-    "all": [".github/", ".claude/", ".cursor/", ".opencode/"],
-}
+from .lockfile_enrichment import enrich_lockfile_for_pack, _TARGET_PREFIXES, _filter_files_by_target
 
 
 @dataclass
@@ -33,12 +22,6 @@ class PackResult:
     lockfile_enriched: bool = False
 
 
-def _filter_files_by_target(deployed_files: List[str], target: str) -> List[str]:
-    """Filter deployed file paths by target prefix."""
-    prefixes = _TARGET_PREFIXES.get(target, _TARGET_PREFIXES["all"])
-    return [f for f in deployed_files if any(f.startswith(p) for p in prefixes)]
-
-
 def pack_bundle(
     project_root: Path,
     output_dir: Path,
@@ -47,6 +30,7 @@ def pack_bundle(
     archive: bool = False,
     dry_run: bool = False,
     force: bool = False,
+    logger=None,
 ) -> PackResult:
     """Create a self-contained bundle from installed APM dependencies.
 
@@ -81,6 +65,7 @@ def pack_bundle(
             archive=archive,
             dry_run=dry_run,
             force=force,
+            logger=logger,
         )
 
     lockfile_path = get_lockfile_path(project_root)
@@ -196,10 +181,14 @@ def pack_bundle(
             )
             _scan_findings_total += len(verdict.all_findings)
     if _scan_findings_total:
-        _rich_warning(
+        _warn_msg = (
             f"Bundle contains {_scan_findings_total} hidden character(s) across source files "
             f"— run 'apm audit' to inspect before publishing"
         )
+        if logger:
+            logger.warning(_warn_msg)
+        else:
+            _rich_warning(_warn_msg)
 
     # 6. Build output directory
     bundle_dir = output_dir / f"{pkg_name}-{pkg_version}"

{apm_cli-0.8.3 → apm_cli-0.8.4}/src/apm_cli/bundle/plugin_exporter.py

@@ -319,7 +319,7 @@ def _get_dev_dependency_urls(apm_yml_path: Path) -> Set[Tuple[str, str]]:
 
 
 def _find_or_synthesize_plugin_json(
-    project_root: Path, apm_yml_path: Path
+    project_root: Path, apm_yml_path: Path, logger=None,
 ) -> dict:
     """Locate an existing ``plugin.json`` or synthesise one from ``apm.yml``."""
     from ..deps.plugin_parser import synthesize_plugin_json_from_apm_yml
@@ -330,16 +330,24 @@ def _find_or_synthesize_plugin_json(
         try:
             return json.loads(plugin_json_path.read_text(encoding="utf-8"))
         except (json.JSONDecodeError, OSError) as exc:
-            _rich_warning(
+            _warn_msg = (
                 f"Found plugin.json at {plugin_json_path} but could not parse it: {exc}. "
                 "Falling back to synthesis from apm.yml."
             )
+            if logger:
+                logger.warning(_warn_msg)
+            else:
+                _rich_warning(_warn_msg)
 
     else:
-        _rich_warning(
+        _warn_msg = (
             "No plugin.json found. Synthesizing from apm.yml. "
             "Consider running 'apm init --plugin'."
         )
+        if logger:
+            logger.warning(_warn_msg)
+        else:
+            _rich_warning(_warn_msg)
     return synthesize_plugin_json_from_apm_yml(apm_yml_path)
 
 
@@ -400,6 +408,7 @@ def export_plugin_bundle(
     archive: bool = False,
     dry_run: bool = False,
     force: bool = False,
+    logger=None,
 ) -> PackResult:
     """Export the project as a plugin-native directory.
 
@@ -439,7 +448,7 @@ def export_plugin_bundle(
             )
 
     # 3. Find or synthesize plugin.json
-    plugin_json = _find_or_synthesize_plugin_json(project_root, apm_yml_path)
+    plugin_json = _find_or_synthesize_plugin_json(project_root, apm_yml_path, logger=logger)
 
     # 4. devDependencies filtering
     dev_dep_urls = _get_dev_dependency_urls(apm_yml_path)
@@ -510,7 +519,10 @@ def export_plugin_bundle(
 
     # 7. Emit collision warnings
     for msg in collisions:
-        _rich_warning(msg)
+        if logger:
+            logger.warning(msg)
+        else:
+            _rich_warning(msg)
 
     # 8. Build output file list (sorted for determinism)
     output_files = sorted(file_map.keys())
@@ -548,10 +560,14 @@ def export_plugin_bundle(
             verdict = SecurityGate.scan_text(text, str(src), policy=WARN_POLICY)
             scan_findings_total += len(verdict.all_findings)
     if scan_findings_total:
-        _rich_warning(
+        _warn_msg = (
             f"Bundle contains {scan_findings_total} hidden character(s) across "
             f"source files — run 'apm audit' to inspect before publishing"
         )
+        if logger:
+            logger.warning(_warn_msg)
+        else:
+            _rich_warning(_warn_msg)
 
     # 11. Write files to output directory (clean slate to prevent symlink attacks)
     if bundle_dir.exists():

{apm_cli-0.8.3 → apm_cli-0.8.4}/src/apm_cli/commands/_helpers.py

@@ -283,7 +283,7 @@ def _atomic_write(path: Path, data: str) -> None:
         raise
 
 
-def _update_gitignore_for_apm_modules():
+def _update_gitignore_for_apm_modules(logger=None):
     """Add apm_modules/ to .gitignore if not already present."""
     gitignore_path = Path(GITIGNORE_FILENAME)
     apm_modules_pattern = APM_MODULES_GITIGNORE_PATTERN
@@ -295,7 +295,10 @@ def _update_gitignore_for_apm_modules():
             with open(gitignore_path, "r", encoding="utf-8") as f:
                 current_content = [line.rstrip("\n\r") for line in f.readlines()]
         except Exception as e:
-            _rich_warning(f"Could not read .gitignore: {e}")
+            if logger:
+                logger.warning(f"Could not read .gitignore: {e}")
+            else:
+                _rich_warning(f"Could not read .gitignore: {e}")
             return
 
     # Check if apm_modules/ is already in .gitignore
@@ -310,9 +313,15 @@ def _update_gitignore_for_apm_modules():
                 f.write("\n")
             f.write(f"\n# APM dependencies\n{apm_modules_pattern}\n")
 
-        _rich_info(f"Added {apm_modules_pattern} to .gitignore")
+        if logger:
+            logger.progress(f"Added {apm_modules_pattern} to .gitignore")
+        else:
+            _rich_info(f"Added {apm_modules_pattern} to .gitignore")
     except Exception as e:
-        _rich_warning(f"Could not update .gitignore: {e}")
+        if logger:
+            logger.warning(f"Could not update .gitignore: {e}")
+        else:
+            _rich_warning(f"Could not update .gitignore: {e}")
 
 
 # ------------------------------------------------------------------