refactor: move get_lockfile_installed_paths into LockFile classmethod

Author: danielmeppiel

src/apm_cli/cli.py

@@ -41,7 +41,7 @@
 try:
     from apm_cli.deps.apm_resolver import APMDependencyResolver
     from apm_cli.deps.github_downloader import GitHubPackageDownloader
-    from apm_cli.deps.lockfile import get_lockfile_installed_paths
+    from apm_cli.deps.lockfile import LockFile
     from apm_cli.models.apm_package import APMPackage, DependencyReference
     from apm_cli.integration import PromptIntegrator, AgentIntegrator
 
@@ -169,7 +169,7 @@ def _check_orphaned_packages():
                     expected_installed.add(str(install_path))
 
             # Also include transitive dependencies from apm.lock
-            lockfile_paths = get_lockfile_installed_paths(Path.cwd())
+            lockfile_paths = LockFile.installed_paths_for_project(Path.cwd())
             expected_installed.update(lockfile_paths)
         except Exception:
             return []  # If can't parse apm.yml, assume no orphans
@@ -798,7 +798,7 @@ def prune(ctx, dry_run):
                         expected_installed.add(f"{repo_parts[0]}/{repo_parts[1]}")
 
             # Also include transitive dependencies from apm.lock
-            lockfile_paths = get_lockfile_installed_paths(Path.cwd())
+            lockfile_paths = LockFile.installed_paths_for_project(Path.cwd())
             expected_installed.update(lockfile_paths)
         except Exception as e:
             _rich_error(f"Failed to parse apm.yml: {e}")

src/apm_cli/deps/__init__.py

@@ -9,7 +9,7 @@
 from .verifier import verify_dependencies, install_missing_dependencies, load_apm_config
 from .github_downloader import GitHubPackageDownloader
 from .package_validator import PackageValidator
-from .lockfile import LockFile, LockedDependency, get_lockfile_path, get_lockfile_installed_paths
+from .lockfile import LockFile, LockedDependency, get_lockfile_path
 
 __all__ = [
     'sync_workflow_dependencies',
@@ -29,5 +29,5 @@
     'LockFile',
     'LockedDependency',
     'get_lockfile_path',
-    'get_lockfile_installed_paths',
+
 ]

src/apm_cli/deps/lockfile.py

@@ -238,31 +238,34 @@ def save(self, path: Path) -> None:
         """Save lock file to disk (alias for write)."""
         self.write(path)
 
+    @classmethod
+    def installed_paths_for_project(cls, project_root: Path) -> List[str]:
+        """Load apm.lock from project_root and return installed paths.
+
+        Returns an empty list if the lockfile is missing, corrupt, or
+        unreadable.
+
+        Args:
+            project_root: Path to project root containing apm.lock.
+
+        Returns:
+            List[str]: Relative installed paths (e.g., ['owner/repo']),
+                       ordered by depth then repo_url (no duplicates).
+        """
+        try:
+            lockfile = cls.read(project_root / "apm.lock")
+            if not lockfile:
+                return []
+            return lockfile.get_installed_paths(project_root / "apm_modules")
+        except (FileNotFoundError, yaml.YAMLError, ValueError, KeyError):
+            return []
+
 
 def get_lockfile_path(project_root: Path) -> Path:
     """Get the path to the lock file for a project."""
     return project_root / "apm.lock"
 
 
 def get_lockfile_installed_paths(project_root: Path) -> List[str]:
-    """Get installed paths for all dependencies recorded in apm.lock.
-
-    Convenience wrapper that loads the lockfile and delegates to
-    LockFile.get_installed_paths(). Returns an empty list if the
-    lockfile is missing, corrupt, or unreadable.
-
-    Args:
-        project_root: Path to project root containing apm.lock.
-
-    Returns:
-        List[str]: Relative installed paths (e.g., ['owner/repo']),
-                   ordered by depth then repo_url (no duplicates).
-    """
-    try:
-        lockfile_path = get_lockfile_path(project_root)
-        lockfile = LockFile.read(lockfile_path)
-        if not lockfile:
-            return []
-        return lockfile.get_installed_paths(project_root / "apm_modules")
-    except (FileNotFoundError, yaml.YAMLError, ValueError, KeyError):
-        return []
+    """Deprecated: use LockFile.installed_paths_for_project() instead."""
+    return LockFile.installed_paths_for_project(project_root)

src/apm_cli/primitives/discovery.py

@@ -8,7 +8,7 @@
 from .models import PrimitiveCollection
 from .parser import parse_primitive_file, parse_skill_file
 from ..models.apm_package import APMPackage
-from ..deps.lockfile import get_lockfile_installed_paths
+from ..deps.lockfile import LockFile
 
 
 # Common primitive patterns for local discovery (with recursive search)
@@ -252,7 +252,7 @@ def get_dependency_declaration_order(base_dir: str) -> List[str]:
 
         # Include transitive dependencies from apm.lock
         # Direct deps from apm.yml have priority; transitive deps are appended
-        lockfile_paths = get_lockfile_installed_paths(Path(base_dir))
+        lockfile_paths = LockFile.installed_paths_for_project(Path(base_dir))
         direct_set = set(dependency_names)
         for path in lockfile_paths:
             if path not in direct_set:

tests/unit/test_transitive_deps.py

@@ -1,7 +1,7 @@
 """Unit tests for transitive dependency handling.
 
 Tests that:
-- get_lockfile_installed_paths() correctly returns paths for all locked deps
+- LockFile.installed_paths_for_project() correctly returns paths for all locked deps
 - _check_orphaned_packages() does not flag transitive deps as orphaned
 - get_dependency_declaration_order() includes transitive deps from lockfile
 """
@@ -13,7 +13,6 @@
 from apm_cli.deps.lockfile import (
     LockFile,
     LockedDependency,
-    get_lockfile_installed_paths,
 )
 from apm_cli.primitives.discovery import get_dependency_declaration_order
 
@@ -23,15 +22,15 @@ class TestGetLockfileInstalledPaths:
 
     def test_returns_empty_when_no_lockfile(self, tmp_path):
         """Returns empty list when no apm.lock exists."""
-        assert get_lockfile_installed_paths(tmp_path) == []
+        assert LockFile.installed_paths_for_project(tmp_path) == []
 
     def test_returns_paths_for_regular_packages(self, tmp_path):
         lockfile = LockFile()
         lockfile.add_dependency(LockedDependency(repo_url="owner/repo-a", depth=1))
         lockfile.add_dependency(LockedDependency(repo_url="owner/repo-b", depth=2))
         lockfile.write(tmp_path / "apm.lock")
 
-        paths = get_lockfile_installed_paths(tmp_path)
+        paths = LockFile.installed_paths_for_project(tmp_path)
         assert "owner/repo-a" in paths
         assert "owner/repo-b" in paths
 
@@ -40,7 +39,7 @@ def test_no_duplicates(self, tmp_path):
         lockfile.add_dependency(LockedDependency(repo_url="owner/repo", depth=1))
         lockfile.write(tmp_path / "apm.lock")
 
-        paths = get_lockfile_installed_paths(tmp_path)
+        paths = LockFile.installed_paths_for_project(tmp_path)
         assert paths.count("owner/repo") == 1
 
     def test_ordered_by_depth_then_repo(self, tmp_path):
@@ -50,7 +49,7 @@ def test_ordered_by_depth_then_repo(self, tmp_path):
         lockfile.add_dependency(LockedDependency(repo_url="m/mid", depth=2))
         lockfile.write(tmp_path / "apm.lock")
 
-        paths = get_lockfile_installed_paths(tmp_path)
+        paths = LockFile.installed_paths_for_project(tmp_path)
         assert paths == ["a/direct", "m/mid", "z/deep"]
 
     def test_virtual_file_package_path(self, tmp_path):
@@ -64,14 +63,14 @@ def test_virtual_file_package_path(self, tmp_path):
         ))
         lockfile.write(tmp_path / "apm.lock")
 
-        paths = get_lockfile_installed_paths(tmp_path)
+        paths = LockFile.installed_paths_for_project(tmp_path)
         # Virtual file: owner/<repo>-<stem> → owner/repo-code-review
         assert "owner/repo-code-review" in paths
 
     def test_corrupt_lockfile(self, tmp_path):
         """Corrupt lockfile should return empty list."""
         (tmp_path / "apm.lock").write_text("not: valid: yaml: [")
-        assert get_lockfile_installed_paths(tmp_path) == []
+        assert LockFile.installed_paths_for_project(tmp_path) == []
 
 
 class TestTransitiveDependencyDiscovery: