Fix packages.envrc location and sub-package src_type in lock file

- Move packages.envrc inside deps_dir (was placed parallel to it);
  update source_env paths to be relative within deps_dir
- Set src_type='dir' in PackageDir.process_options and
  src_type='git' in PackageGit.process_options so that
  package-lock.json always records the full source URL/path
  for every package, including those resolved by sub-packages
- Update test_direnv.py to expect packages.envrc at the new location
- Add test_package_lock tests verifying src_type is set at create time
- Add test_smoke assertion that sub-package lock entries have src+path

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: mballance

src/ivpm/handlers/package_handler_direnv.py

@@ -74,17 +74,15 @@ def update(self, update_info: ProjectUpdateInfo):
                 ordered.append(pkg_name)
 
         deps_dir = update_info.deps_dir
-        root_dir = os.path.dirname(deps_dir)
-        deps_dir_name = os.path.basename(deps_dir)
-        output_path = os.path.join(root_dir, "packages.envrc")
+        output_path = os.path.join(deps_dir, "packages.envrc")
 
         _logger.debug("Writing packages.envrc to %s", output_path)
 
         with open(output_path, "w") as fp:
             fp.write("# Generated by IVPM — do not edit manually\n")
             for pkg_name in ordered:
                 _, envrc_file = self.envrc_pkgs[pkg_name]
-                fp.write("source_env ./%s/%s/%s\n" % (deps_dir_name, pkg_name, envrc_file))
+                fp.write("source_env ./%s/%s\n" % (pkg_name, envrc_file))
 
         from ..utils import note
         note("Generated packages.envrc with %d entries" % len(ordered))

src/ivpm/pkg_types/package_dir.py

@@ -62,6 +62,7 @@ def update(self, update_info : ProjectUpdateInfo):
 
     def process_options(self, opts, si):
         super().process_options(opts, si)
+        self.src_type = "dir"
 
         if "link" in opts.keys():
             self.link = bool(opts["link"]) 

src/ivpm/pkg_types/package_git.py

@@ -370,6 +370,7 @@ def sync(self, sync_info : ProjectSyncInfo):
 
     def process_options(self, opts, si):
         super().process_options(opts, si)
+        self.src_type = "git"
 
         if "anonymous" in opts.keys():
             self.anonymous = opts["anonymous"]

test/unit/test_direnv.py

@@ -19,13 +19,13 @@ def test_leaf_export_envrc(self):
 
         self.ivpm_update(skip_venv=True)
 
-        envrc_path = os.path.join(self.testdir, "packages.envrc")
+        envrc_path = os.path.join(self.testdir, "packages", "packages.envrc")
         self.assertTrue(os.path.isfile(envrc_path),
                         "packages.envrc should be generated")
 
         with open(envrc_path) as f:
             content = f.read()
-        self.assertIn("source_env ./packages/envrc_leaf1/export.envrc", content)
+        self.assertIn("source_env ./envrc_leaf1/export.envrc", content)
 
     def test_no_envrc_no_file(self):
         """Packages without envrc files produce no packages.envrc."""
@@ -42,7 +42,7 @@ def test_no_envrc_no_file(self):
 
         self.ivpm_update(skip_venv=True)
 
-        envrc_path = os.path.join(self.testdir, "packages.envrc")
+        envrc_path = os.path.join(self.testdir, "packages", "packages.envrc")
         self.assertFalse(os.path.isfile(envrc_path),
                          "packages.envrc should NOT be generated when no envrc files exist")
 
@@ -61,11 +61,11 @@ def test_dotenvrc_used_when_no_export(self):
 
         self.ivpm_update(skip_venv=True)
 
-        envrc_path = os.path.join(self.testdir, "packages.envrc")
+        envrc_path = os.path.join(self.testdir, "packages", "packages.envrc")
         self.assertTrue(os.path.isfile(envrc_path))
         with open(envrc_path) as f:
             content = f.read()
-        self.assertIn("source_env ./packages/envrc_leaf2/.envrc", content)
+        self.assertIn("source_env ./envrc_leaf2/.envrc", content)
 
     def test_dependency_order(self):
         """Leaf packages appear before dependents in packages.envrc."""
@@ -82,15 +82,15 @@ def test_dependency_order(self):
 
         self.ivpm_update(skip_venv=True)
 
-        envrc_path = os.path.join(self.testdir, "packages.envrc")
+        envrc_path = os.path.join(self.testdir, "packages", "packages.envrc")
         self.assertTrue(os.path.isfile(envrc_path))
         with open(envrc_path) as f:
             content = f.read()
 
         # All three packages should appear
-        self.assertIn("packages/envrc_leaf1/export.envrc", content)
-        self.assertIn("packages/envrc_leaf2/.envrc", content)
-        self.assertIn("packages/envrc_nonleaf/export.envrc", content)
+        self.assertIn("envrc_leaf1/export.envrc", content)
+        self.assertIn("envrc_leaf2/.envrc", content)
+        self.assertIn("envrc_nonleaf/export.envrc", content)
 
         # Leaves must appear before the non-leaf that depends on them
         idx_leaf1 = content.index("envrc_leaf1")
@@ -117,7 +117,7 @@ def test_export_envrc_preferred_over_dotenvrc(self):
         # envrc_leaf1 already has export.envrc; verify it's used not .envrc
         self.ivpm_update(skip_venv=True)
 
-        with open(os.path.join(self.testdir, "packages.envrc")) as f:
+        with open(os.path.join(self.testdir, "packages", "packages.envrc")) as f:
             content = f.read()
         self.assertIn("export.envrc", content)
         self.assertNotIn("envrc_leaf1/.envrc", content)

test/unit/test_package_lock.py

@@ -243,6 +243,44 @@ def test_reject_unknown_lock_version(self):
         with self.assertRaises(ValueError):
             read_lock(lock_path)
 
+    # ------------------------------------------------------------------
+    # src_type set at create time (regression test for sub-package URLs)
+    # ------------------------------------------------------------------
+
+    def test_dir_pkg_src_type_set_by_create(self):
+        """PackageDir.create must set src_type='dir' so the lock file records the path."""
+        from ivpm.pkg_types.pkg_type_rgy import PkgTypeRgy
+        class _Si:
+            pass
+        pkg = PkgTypeRgy.inst().mkPackage("dir", "mypkg", {"url": "file:///some/path"}, _Si())
+        self.assertEqual(pkg.src_type, "dir")
+        pkgs = self._make_pkgs(pkg)
+        write_lock(self.tmpdir, pkgs)
+        data = read_lock(os.path.join(self.tmpdir, "package-lock.json"))
+        entry = data["packages"]["mypkg"]
+        self.assertEqual(entry["src"], "dir")
+        self.assertIn("path", entry)
+        self.assertEqual(entry["path"], "/some/path")
+
+    def test_git_pkg_src_type_set_by_create(self):
+        """PackageGit.create must set src_type='git' so the lock file records the URL."""
+        from ivpm.pkg_types.pkg_type_rgy import PkgTypeRgy
+        class _Si:
+            pass
+        pkg = PkgTypeRgy.inst().mkPackage(
+            "git", "myrepo",
+            {"url": "https://github.com/org/myrepo.git", "branch": "main"},
+            _Si()
+        )
+        self.assertEqual(pkg.src_type, "git")
+        pkgs = self._make_pkgs(pkg)
+        write_lock(self.tmpdir, pkgs)
+        data = read_lock(os.path.join(self.tmpdir, "package-lock.json"))
+        entry = data["packages"]["myrepo"]
+        self.assertEqual(entry["src"], "git")
+        self.assertEqual(entry["url"], "https://github.com/org/myrepo.git")
+        self.assertEqual(entry["branch"], "main")
+
 
 if __name__ == "__main__":
     unittest.main()

test/unit/test_smoke.py

@@ -38,7 +38,20 @@ def test_nested_2(self):
         self.assertTrue(os.path.isdir(os.path.join(self.testdir, "packages/nonleaf_refleaf_proj1")))
         self.assertTrue(os.path.isdir(os.path.join(self.testdir, "packages/leaf_proj1")))
         self.assertTrue(os.path.isdir(os.path.join(self.testdir, "packages/leaf_proj2")))
-#        self.assertTrue(os.path.isfile(os.path.join(self.testdir, "packages/leaf_proj1/leaf_proj1.txt")))
+
+        # Sub-packages resolved by nonleaf_refleaf_proj1 must have their
+        # source URL recorded in the lock file so the workspace can be reproduced.
+        import json
+        with open(os.path.join(self.testdir, "packages/package-lock.json")) as f:
+            lock = json.load(f)
+        for pkg_name in ("leaf_proj1", "leaf_proj2"):
+            entry = lock["packages"][pkg_name]
+            self.assertEqual(entry["src"], "dir",
+                             "%s must have src='dir' in lock file" % pkg_name)
+            self.assertIn("path", entry,
+                          "%s must have a path recorded in lock file" % pkg_name)
+            self.assertTrue(entry["path"],
+                            "%s path must not be empty" % pkg_name)
 
     def test_git_fetch_leaf1(self):
         self.mkFile("ivpm.yaml", """