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

{aider_vision_core-0.90.5.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.5.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.5.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.5.dev0'
-__version_tuple__ = version_tuple = (0, 90, 5, 'dev0')
+__version__ = version = '0.90.6.dev0'
+__version_tuple__ = version_tuple = (0, 90, 6, 'dev0')
 
-__commit_id__ = commit_id = 'g8ffcb8225'
+__commit_id__ = commit_id = 'gfd3e017af'

{aider_vision_core-0.90.5.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/coders/base_coder.py

@@ -29,7 +29,6 @@ from typing import List
 from rich.console import Console
 
 from aider_vision_core import __version__, models, prompts, urls, utils
-from aider_vision_core.brand import version_banner
 from aider_vision_core.analytics import Analytics
 from aider_vision_core.commands import Commands
 from aider_vision_core.exceptions import LiteLLMExceptions
@@ -210,7 +209,7 @@ class Coder:
 
     def get_announcements(self):
         lines = []
-        lines.append(version_banner())
+        lines.append(f"Aider v{__version__}")
 
         # Model
         main_model = self.main_model

{aider_vision_core-0.90.5.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.5.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/io.py

@@ -40,7 +40,7 @@ from .editor import pipe_editor
 from .utils import is_image_file
 
 # Constants
-NOTIFICATION_MESSAGE = "Aider Vision Core is waiting for your input"
+NOTIFICATION_MESSAGE = "Aider is waiting for your input"
 
 
 def ensure_hash_prefix(color):
@@ -987,14 +987,10 @@ class InputOutput:
 
     def tool_error(self, message="", strip=True):
         self.num_error_outputs += 1
-        from aider_vision_core.brand import format_user_error
-
-        self._tool_message(format_user_error(message), strip, self.tool_error_color)
+        self._tool_message(message, strip, self.tool_error_color)
 
     def tool_warning(self, message="", strip=True):
-        from aider_vision_core.brand import format_user_error
-
-        self._tool_message(format_user_error(message), strip, self.tool_warning_color)
+        self._tool_message(message, strip, self.tool_warning_color)
 
     def tool_output(self, *messages, log_only=False, bold=False):
         if messages:

{aider_vision_core-0.90.5.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.5.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/repomap.py

@@ -1,7 +1,6 @@
 import colorsys
 import math
 import os
-import pickle
 import random
 import shutil
 import sqlite3
@@ -33,16 +32,15 @@ Tag = namedtuple("Tag", "rel_fname fname line name kind".split())
 SQLITE_ERRORS = (sqlite3.OperationalError, sqlite3.DatabaseError, OSError)
 
 
-CACHE_VERSION = 5
+CACHE_VERSION = 3
 if USING_TSL_PACK:
-    CACHE_VERSION = 5
+    CACHE_VERSION = 4
 
 UPDATING_REPO_MAP_MESSAGE = "Updating repo map"
 
 
 class RepoMap:
-    # Distinct from upstream `.aider.tags.cache.*` (pickles reference old `aider` module).
-    TAGS_CACHE_DIR = f".aider-vision-core.tags.cache.v{CACHE_VERSION}"
+    TAGS_CACHE_DIR = f".aider.tags.cache.v{CACHE_VERSION}"
 
     warned_files = set()
 
@@ -232,22 +230,6 @@ class RepoMap:
         except FileNotFoundError:
             self.io.tool_warning(f"File not found error: {fname}")
 
-    def _tags_cache_get(self, cache_key):
-        try:
-            return self.TAGS_CACHE.get(cache_key)  # Issue #1308
-        except SQLITE_ERRORS as e:
-            self.tags_cache_error(e)
-            return self.TAGS_CACHE.get(cache_key)
-        except (ModuleNotFoundError, pickle.UnpicklingError, AttributeError):
-            self._drop_tags_cache_key(cache_key)
-            return None
-
-    def _drop_tags_cache_key(self, cache_key):
-        try:
-            del self.TAGS_CACHE[cache_key]
-        except Exception:
-            pass
-
     def get_tags(self, fname, rel_fname):
         # Check if the file is in the cache and if the modification time has not changed
         file_mtime = self.get_mtime(fname)
@@ -255,7 +237,11 @@ class RepoMap:
             return []
 
         cache_key = fname
-        val = self._tags_cache_get(cache_key)
+        try:
+            val = self.TAGS_CACHE.get(cache_key)  # Issue #1308
+        except SQLITE_ERRORS as e:
+            self.tags_cache_error(e)
+            val = self.TAGS_CACHE.get(cache_key)
 
         if val is not None and val.get("mtime") == file_mtime:
             try:
@@ -263,8 +249,6 @@ class RepoMap:
             except SQLITE_ERRORS as e:
                 self.tags_cache_error(e)
                 return self.TAGS_CACHE[cache_key]["data"]
-            except (ModuleNotFoundError, pickle.UnpicklingError, AttributeError):
-                self._drop_tags_cache_key(cache_key)
 
         # miss!
         data = list(self.get_tags_raw(fname, rel_fname))

{aider_vision_core-0.90.5.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/report.py

@@ -7,7 +7,6 @@ import urllib.parse
 import webbrowser
 
 from aider_vision_core import __version__
-from aider_vision_core.brand import DISPLAY_CORE, PRODUCT_CORE, launcher_context_lines
 from aider_vision_core.urls import github_issues
 from aider_vision_core.versioncheck import VERSION_CHECK_FNAME
 
@@ -45,23 +44,15 @@ def report_github_issue(issue_text, title=None, confirm=True):
     :param confirm: Whether to ask for confirmation before opening the browser (default: True)
     :return: None
     """
-    version_info = f"{DISPLAY_CORE} ({PRODUCT_CORE}) version: {__version__}\n"
+    version_info = f"Aider version: {__version__}\n"
     python_version = f"Python version: {sys.version.split()[0]}\n"
     platform_info = f"Platform: {platform.platform()}\n"
     python_info = get_python_info() + "\n"
     os_info = get_os_info() + "\n"
     git_info = get_git_info() + "\n"
-    launcher_info = "\n".join(launcher_context_lines())
 
     system_info = (
-        version_info
-        + python_version
-        + platform_info
-        + python_info
-        + os_info
-        + git_info
-        + (launcher_info + "\n" if launcher_info else "")
-        + "\n"
+        version_info + python_version + platform_info + python_info + os_info + git_info + "\n"
     )
 
     issue_text = system_info + issue_text
@@ -72,15 +63,10 @@ def report_github_issue(issue_text, title=None, confirm=True):
     issue_url = f"{github_issues}?{urllib.parse.urlencode(params)}"
 
     if confirm:
-        from aider_vision_core.brand import is_launched_by_vision, user_facing_name
-
-        product = user_facing_name() if is_launched_by_vision() else DISPLAY_CORE
         print(f"\n# {title}\n")
         print(issue_text.strip())
         print()
-        print(f"Please consider reporting this bug to help improve {product}!")
-        if is_launched_by_vision():
-            print(f"(Technical details above refer to {DISPLAY_CORE}.)")
+        print("Please consider reporting this bug to help improve aider!")
         prompt = "Open a GitHub Issue pre-filled with the above error in your browser? (Y/n) "
         confirmation = input(prompt).strip().lower()
 

{aider_vision_core-0.90.5.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core/scrape.py

@@ -8,9 +8,7 @@ import pypandoc
 from aider_vision_core import __version__, urls, utils
 from aider_vision_core.dump import dump  # noqa: F401
 
-from aider_vision_core.brand import PRODUCT_CORE
-
-aider_user_agent = f"{PRODUCT_CORE}/{__version__} +{urls.website}"
+aider_user_agent = f"Aider/{__version__} +{urls.website}"
 
 # Playwright is nice because it has a simple way to install dependencies on most
 # platforms.

{aider_vision_core-0.90.5.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.5.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.5.dev0 → aider_vision_core-0.90.6.dev0}/aider_vision_core.egg-info/SOURCES.txt

@@ -28,7 +28,6 @@ aider_vision_core/_version.py
 aider_vision_core/analytics.py
 aider_vision_core/args.py
 aider_vision_core/args_formatter.py
-aider_vision_core/brand.py
 aider_vision_core/cli_serve.py
 aider_vision_core/commands.py
 aider_vision_core/copypaste.py
@@ -291,7 +290,6 @@ benchmark/swe-bench.txt
 benchmark/swe_bench.py
 benchmark/test_benchmark.py
 docker/Dockerfile
-docs/products.md
 requirements/common-constraints.txt
 requirements/pydub.in
 requirements/python-compat.in

{aider_vision_core-0.90.5.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)

aider_vision_core-0.90.5.dev0/aider_vision_core/brand.py

@@ -1,89 +0,0 @@
-"""
-Product identity for the aider-vision stack.
-
-Two audiences
--------------
-* **End user** (bubbled through the Aider Vision app): prefer **Aider Vision**.
-* **Developer / support** (logs, crash reports, GitHub): **Aider Vision Core**.
-
-When the desktop app spawns Core it sets ``AIDER_VISION_LAUNCHER=1``. In that mode,
-user-visible messages use the Vision product name; technical attribution stays on Core.
-"""
-
-from __future__ import annotations
-
-import os
-
-# Technical ids (pip, import path, CLI)
-PRODUCT_CORE = "aider-vision-core"
-PRODUCT_VISION = "aider-vision"
-
-# Human-readable product names
-DISPLAY_VISION = "Aider Vision"
-DISPLAY_CORE = "Aider Vision Core"
-
-# Set by the Aider Vision desktop app when it spawns the Core process
-LAUNCHER_ENV = "AIDER_VISION_LAUNCHER"
-LAUNCHER_VERSION_ENV = "AIDER_VISION_APP_VERSION"
-
-
-def is_launched_by_vision() -> bool:
-    return os.environ.get(LAUNCHER_ENV, "").strip() in ("1", "true", "yes")
-
-
-def user_facing_name() -> str:
-    """Name shown to people using the Aider Vision app."""
-    if is_launched_by_vision():
-        return DISPLAY_VISION
-    return DISPLAY_CORE
-
-
-def support_name() -> str:
-    """Name for engineers, pip, and issue trackers."""
-    return DISPLAY_CORE
-
-
-def version_banner() -> str:
-    """Startup banner in the terminal."""
-    from aider_vision_core import __version__
-
-    if is_launched_by_vision():
-        return f"{DISPLAY_VISION} · agent {DISPLAY_CORE} v{__version__}"
-    return f"{DISPLAY_CORE} ({PRODUCT_CORE}) v{__version__}"
-
-
-def launcher_context_lines() -> list[str]:
-    """Extra lines for crash reports when Core was started by the desktop app."""
-    if not is_launched_by_vision():
-        return []
-    app_ver = os.environ.get(LAUNCHER_VERSION_ENV, "unknown")
-    return [
-        f"User-facing product: {DISPLAY_VISION}",
-        f"Launched by: {DISPLAY_VISION} ({PRODUCT_VISION}) {app_ver}",
-        f"Technical component: {DISPLAY_CORE} ({PRODUCT_CORE})",
-        "",
-    ]
-
-
-def user_facing_prefix() -> str:
-    return f"[{user_facing_name()}]"
-
-
-def support_prefix() -> str:
-    return f"[{support_name()}]"
-
-
-def format_user_error(message: str) -> str:
-    """
-    Format an error that will be shown to the user (e.g. via the Vision app).
-
-    When running inside Vision, do not tell users "Aider Vision Core failed" for
-  generic failures — they are using Aider Vision.
-    """
-    message = message.strip()
-    if not message or not is_launched_by_vision():
-        return message
-    prefix = user_facing_prefix()
-    if message.startswith("["):
-        return message
-    return f"{prefix} {message}"

aider_vision_core-0.90.5.dev0/docs/products.md

@@ -1,31 +0,0 @@
-# Aider Vision product split
-
-## Two products
-
-| | **Aider Vision** | **Aider Vision Core** |
-|---|------------------|------------------------|
-| **What users see** | Desktop app window | Agent running in terminal / behind the app |
-| **Repo** | `aider-vision` | `aider-vision-core` |
-| **Install** | App bundle / Tauri build | `pip install aider-vision-core` |
-| **Typical errors** | Won’t start, can’t connect to Core, UI bugs | LLM, git, repo-map, edits, API |
-
-**Aider Vision** is the shell. **Aider Vision Core** is the coding agent (fork of Aider).
-
-## Who to blame (for users)
-
-**In the Aider Vision app**, most errors shown in chat use **`[Aider Vision]`** even when the agent (Core) failed — because that is the product people opened.
-
-| Where | Label |
-|-------|--------|
-| Chat / main errors | **Aider Vision** |
-| Terminal tab (technical log) | **Aider Vision Core** (full detail) |
-| Crash report file / GitHub (developers) | **Aider Vision Core** + “launched by Vision” |
-
-- **Can’t start**, window, settings → **Aider Vision**
-- **Model / git / repo map** → still Core under the hood; users see **Aider Vision** in chat, engineers see Core in the technical log
-
-## For developers
-
-- Core reads `AIDER_VISION_LAUNCHER=1` when the desktop app spawns it (crash reports include both versions).
-- Prefer separate GitHub issues: `Digital-Defiance/aider-vision` vs `Digital-Defiance/aider-vision-core`.
-- Shared branding constants: `aider_vision_core/brand.py` and `aider-vision/src/brand.ts`.