Merge branch 'main' of github.com:Aider-AI/aider

Author: paul-gauthier

aider/coders/base_coder.py

@@ -2216,7 +2216,7 @@ def allowed_to_edit(self, path):
                 # Seems unlikely that we needed to create the file, but it was
                 # actually already part of the repo.
                 # But let's only add if we need to, just to be safe.
-                if need_to_add:
+                if need_to_add and self.auto_commits:
                     self.repo.repo.git.add(full_path)
 
             self.abs_fnames.add(full_path)
@@ -2230,7 +2230,7 @@ def allowed_to_edit(self, path):
             self.io.tool_output(f"Skipping edits to {path}")
             return
 
-        if need_to_add:
+        if need_to_add and self.auto_commits:
             self.repo.repo.git.add(full_path)
 
         self.abs_fnames.add(full_path)

aider/commands.py

@@ -868,7 +868,13 @@ def cmd_add(self, args):
                 self.io.tool_error(f"{matched_file} is already in the chat as an editable file")
                 continue
             elif abs_file_path in self.coder.abs_read_only_fnames:
-                if self.coder.repo and self.coder.repo.path_in_repo(matched_file):
+                # Determine if file can be promoted to editable
+                if self.coder.repo:
+                    can_edit = self.coder.repo.path_in_repo(matched_file)
+                else:
+                    can_edit = abs_file_path.startswith(self.coder.root)
+
+                if can_edit:
                     self.coder.abs_read_only_fnames.remove(abs_file_path)
                     self.coder.abs_fnames.add(abs_file_path)
                     self.io.tool_output(

aider/repo.py

@@ -571,7 +571,8 @@ def path_in_repo(self, path):
             return
 
         tracked_files = set(self.get_tracked_files())
-        return self.normalize_path(path) in tracked_files
+        normalized = self.normalize_path(path)
+        return normalized in tracked_files
 
     def abs_root_path(self, path):
         res = Path(self.root) / path

aider/utils.py

@@ -95,7 +95,10 @@ def is_image_file(file_name):
 
 def safe_abs_path(res):
     "Gives an abs path, which safely returns a full (not 8.3) windows path"
-    res = Path(res).resolve()
+    try:
+        res = Path(res).resolve()
+    except (RuntimeError, OSError):
+        res = Path(res).absolute()
     return str(res)
 
 

tests/basic/test_utils.py

@@ -0,0 +1,15 @@
+import os
+
+from aider.utils import safe_abs_path
+
+
+def test_safe_abs_path_symlink_loop(tmp_path):
+    # Create circular symlink: a -> b -> a
+    link_a = tmp_path / "link_a"
+    link_b = tmp_path / "link_b"
+    link_a.symlink_to(link_b)
+    link_b.symlink_to(link_a)
+
+    # safe_abs_path must not raise, and must return an absolute path
+    result = safe_abs_path(str(link_a))
+    assert os.path.isabs(result)