aider-vision-core 0.90.3.dev0__tar.gz → 0.90.6.dev0__tar.gz

{aider_vision_core-0.90.3.dev0 → aider_vision_core-0.90.6.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-vision-core
-Version: 0.90.3.dev0
+Version: 0.90.6.dev0
 Summary: aider-vision-core: Aider fork with headless API, submodule git, and web integration
 Project-URL: Homepage, https://github.com/Digital-Defiance/aider-vision-core
 Classifier: Development Status :: 4 - Beta

{aider_vision_core-0.90.3.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.90.3.dev0'
-__version_tuple__ = version_tuple = (0, 90, 3, 'dev0')
+__version__ = version = '0.90.6.dev0'
+__version_tuple__ = version_tuple = (0, 90, 6, 'dev0')
 
-__commit_id__ = commit_id = 'g279784448'
+__commit_id__ = commit_id = 'gfd3e017af'

{aider_vision_core-0.90.3.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/git_workspace.py

@@ -124,18 +124,42 @@ def _submodule_status_paths(super_root: str) -> list[str]:
         line = line.strip()
         if not line:
             continue
+        # Format: [+-]<sha> <path> [(describe)]
         parts = line.split()
         if len(parts) >= 2:
-            paths.append(parts[-1])
+            paths.append(parts[1])
     return paths
 
 
+def _normalize_submodule_rel_path(path: str) -> str:
+    return path.replace("\\", "/").strip("/")
+
+
 def discover_submodule_paths_with_git(super_root: str) -> list[str]:
-    """Prefer git submodule status; fall back to parsing .gitmodules."""
-    paths = _submodule_status_paths(super_root)
-    if paths:
-        return paths
-    return discover_submodule_paths(super_root)
+    """
+    Submodule roots relative to the superproject, including nested (recursive) paths.
+
+    Merges ``git submodule status --recursive`` with a ``.gitmodules`` walk so
+    uninitialized or partially-checked-out nested submodules are still discovered.
+    """
+    root = Path(super_root)
+    candidates: list[str] = []
+    candidates.extend(_submodule_status_paths(super_root))
+    candidates.extend(discover_submodule_paths(super_root))
+
+    seen: set[str] = set()
+    valid: list[str] = []
+    for raw in candidates:
+        rel = _normalize_submodule_rel_path(raw)
+        if not rel or rel in seen:
+            continue
+        if not (root / rel).is_dir():
+            continue
+        seen.add(rel)
+        valid.append(rel)
+
+    # Deepest paths first (helps commit/undo ordering for nested gitlinks).
+    return sorted(valid, key=lambda p: (-p.count("/"), p))
 
 
 def create_git_workspace(io, fnames, git_dname, **git_repo_kwargs):
@@ -180,6 +204,7 @@ class RepoSet:
         self.repos: list[GitRepo] = [primary]
         seen_roots = {primary.root}
 
+        # submodule_paths are deepest-first; init every nested checkout we can open.
         for rel_path in submodule_paths:
             abs_path = Path(primary.root) / rel_path
             if not abs_path.is_dir():
@@ -195,6 +220,9 @@ class RepoSet:
 
         self.repos.sort(key=lambda r: len(Path(r.root).parts), reverse=True)
         self.last_commit_batch: list[dict] = []
+        self.submodule_rel_paths = frozenset(
+            _normalize_submodule_rel_path(p) for p in submodule_paths
+        )
 
     def repo_by_root(self, root: str) -> GitRepo | None:
         for repo in self.repos:
@@ -247,9 +275,6 @@ class RepoSet:
         abs_path = self._abs_path(path)
         return abs_path.relative_to(Path(self.root)).as_posix()
 
-    def abs_root_path(self, path):
-        return self.primary.abs_root_path(path)
-
     def normalize_path(self, path):
         return self.primary.normalize_path(self.path_in_workspace(path))
 
@@ -266,12 +291,26 @@ class RepoSet:
             if str(prefix) == ".":
                 prefix = Path("")
             for fname in repo.get_tracked_files():
+                posix_fname = fname.replace("\\", "/")
+                if not prefix:
+                    workspace_rel = posix_fname
+                    if workspace_rel in self.submodule_rel_paths:
+                        continue
+                    if self.primary.is_submodule_gitlink(posix_fname):
+                        continue
+                elif prefix:
+                    workspace_rel = f"{prefix.as_posix()}/{posix_fname}"
+                    if workspace_rel in self.submodule_rel_paths:
+                        continue
                 if prefix:
                     files.add((prefix / fname).as_posix())
                 else:
                     files.add(fname)
         return sorted(files)
 
+    def abs_root_path(self, path):
+        return str(self._abs_path(path))
+
     def ignored_file(self, fname):
         return self.primary.ignored_file(self.path_in_workspace(str(fname)))
 

{aider_vision_core-0.90.3.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/repo.py

@@ -430,6 +430,21 @@ class GitRepo:
 
         return diffs
 
+    def is_submodule_gitlink(self, path: str) -> bool:
+        """True when ``path`` is a submodule gitlink in this repo (mode 160000)."""
+        if not self.repo:
+            return False
+        path = self.normalize_path(path)
+        try:
+            out = self.repo.git.ls_files("-s", "--", path)
+        except ANY_GIT_ERROR:
+            return False
+        if not out or not str(out).strip():
+            return False
+        first_line = str(out).strip().splitlines()[0]
+        parts = first_line.split()
+        return len(parts) >= 1 and parts[0] == "160000"
+
     def get_tracked_files(self):
         if not self.repo:
             return []
@@ -484,6 +499,7 @@ class GitRepo:
             self.io.tool_error(f"Unable to read staged files: {err}")
 
         res = [fname for fname in files if not self.ignored_file(fname)]
+        res = [fname for fname in res if not self.is_submodule_gitlink(fname)]
 
         return res
 

{aider_vision_core-0.90.3.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-vision-core
-Version: 0.90.3.dev0
+Version: 0.90.6.dev0
 Summary: aider-vision-core: Aider fork with headless API, submodule git, and web integration
 Project-URL: Homepage, https://github.com/Digital-Defiance/aider-vision-core
 Classifier: Development Status :: 4 - Beta

{aider_vision_core-0.90.3.dev0 → aider_vision_core-0.90.6.dev0}/tests/basic/test_git_workspace.py

@@ -4,7 +4,12 @@ import unittest
 from pathlib import Path
 from unittest.mock import patch
 
-from aider_vision_core.git_workspace import RepoSet, create_git_workspace, discover_submodule_paths
+from aider_vision_core.git_workspace import (
+    RepoSet,
+    _submodule_status_paths,
+    create_git_workspace,
+    discover_submodule_paths,
+)
 from aider_vision_core.git_undo import undo_last_aider_commit_for_coder
 from aider_vision_core.io import InputOutput
 from aider_vision_core.repo import GitRepo
@@ -76,6 +81,38 @@ class TestGitWorkspace(unittest.TestCase):
             tracked = ws.get_tracked_files()
             self.assertIn("vendor/lib/pkg.py", tracked)
 
+    def test_get_tracked_files_excludes_submodule_gitlink(self):
+        """Superproject gitlink paths are directories, not repo-map files."""
+        with GitTemporaryDirectory() as root:
+            root = Path(root)
+            _init_submodule(root, "vendor/lib", {"pkg.py": "x = 1\n"})
+            io = InputOutput(pretty=False, yes=True)
+            ws = create_git_workspace(io, [str(root)], None)
+            tracked = ws.get_tracked_files()
+            self.assertNotIn("vendor/lib", tracked)
+            self.assertIn("vendor/lib/pkg.py", tracked)
+
+    def test_submodule_status_path_not_describe_tag(self):
+        with GitTemporaryDirectory() as root:
+            root = Path(root)
+            _init_submodule(root, "vendor/lib", {"pkg.py": "x = 1\n"})
+            paths = _submodule_status_paths(str(root))
+            self.assertIn("vendor/lib", paths)
+            self.assertTrue(all(not p.startswith("(") for p in paths))
+
+    def test_submodule_status_parses_nested_paths(self):
+        lines = (
+            " abc1234 vendor/lib (v1.0.0)\n"
+            " def5678 vendor/lib/pkg (heads/main)\n"
+        )
+        with patch(
+            "aider_vision_core.git_workspace.git.Repo"
+        ) as mock_repo_cls:
+            mock_repo = mock_repo_cls.return_value
+            mock_repo.git.submodule.return_value = lines
+            paths = _submodule_status_paths("/tmp/ws")
+        self.assertEqual(paths, ["vendor/lib", "vendor/lib/pkg"])
+
     def test_commit_inside_submodule_updates_pointer(self):
         with GitTemporaryDirectory() as root:
             root = Path(root)