aider-ce 0.87.5.dev15__py3-none-any.whl → 0.87.7.dev11__py3-none-any.whl

aider/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.87.6.dev"
+__version__ = "0.87.7.dev"
 safe_version = __version__
 
 try:

aider/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.87.5.dev15'
-__version_tuple__ = version_tuple = (0, 87, 5, 'dev15')
+__version__ = version = '0.87.7.dev11'
+__version_tuple__ = version_tuple = (0, 87, 7, 'dev11')
 
 __commit_id__ = commit_id = None

aider/coders/base_coder.py

@@ -91,6 +91,7 @@ all_fences = [
 class Coder:
     abs_fnames = None
     abs_read_only_fnames = None
+    abs_read_only_stubs_fnames = None
     repo = None
     last_aider_commit_hash = None
     aider_edited_files = None
@@ -184,8 +185,10 @@ class Coder:
             # Bring along context from the old Coder
             update = dict(
                 fnames=list(from_coder.abs_fnames),
-                # Copy read-only files
-                read_only_fnames=list(from_coder.abs_read_only_fnames),
+                read_only_fnames=list(from_coder.abs_read_only_fnames),  # Copy read-only files
+                read_only_stubs_fnames=list(
+                    from_coder.abs_read_only_stubs_fnames
+                ),  # Copy read-only stubs
                 done_messages=done_messages,
                 cur_messages=from_coder.cur_messages,
                 aider_commit_hashes=from_coder.aider_commit_hashes,
@@ -301,6 +304,10 @@ class Coder:
             rel_fname = self.get_rel_fname(fname)
             lines.append(f"Added {rel_fname} to the chat (read-only).")
 
+        for fname in self.abs_read_only_stubs_fnames:
+            rel_fname = self.get_rel_fname(fname)
+            lines.append(f"Added {rel_fname} to the chat (read-only stub).")
+
         if self.done_messages:
             lines.append("Restored previous conversation history.")
 
@@ -319,6 +326,7 @@ class Coder:
         fnames=None,
         add_gitignore_files=False,
         read_only_fnames=None,
+        read_only_stubs_fnames=None,
         show_diffs=False,
         auto_commits=True,
         dirty_commits=True,
@@ -420,6 +428,7 @@ class Coder:
         self.abs_fnames = set()
         self.abs_read_only_fnames = set()
         self.add_gitignore_files = add_gitignore_files
+        self.abs_read_only_stubs_fnames = set()
 
         if cur_messages:
             self.cur_messages = cur_messages
@@ -513,6 +522,17 @@ class Coder:
                 else:
                     self.io.tool_warning(f"Error: Read-only file {fname} does not exist. Skipping.")
 
+        if read_only_stubs_fnames:
+            self.abs_read_only_stubs_fnames = set()
+            for fname in read_only_stubs_fnames:
+                abs_fname = self.abs_root_path(fname)
+                if os.path.exists(abs_fname):
+                    self.abs_read_only_stubs_fnames.add(abs_fname)
+                else:
+                    self.io.tool_warning(
+                        f"Error: Read-only (stub) file {fname} does not exist. Skipping."
+                    )
+
         if map_tokens is None:
             use_repo_map = main_model.use_repo_map
             map_tokens = 1024
@@ -647,6 +667,10 @@ class Coder:
             content = self.io.read_text(_fname)
             if content is not None:
                 all_content += content + "\n"
+        for _fname in self.abs_read_only_stubs_fnames:
+            content = self.io.read_text(_fname)
+            if content is not None:
+                all_content += content + "\n"
 
         lines = all_content.splitlines()
         good = False
@@ -720,6 +744,7 @@ class Coder:
 
     def get_read_only_files_content(self):
         prompt = ""
+        # Handle regular read-only files
         for fname in self.abs_read_only_fnames:
             content = self.io.read_text(fname)
             if content is not None and not is_image_file(fname):
@@ -764,6 +789,17 @@ class Coder:
                     prompt += content
 
                 prompt += f"{self.fence[1]}\n"
+
+        # Handle stub files
+        for fname in self.abs_read_only_stubs_fnames:
+            if not is_image_file(fname):
+                relative_fname = self.get_rel_fname(fname)
+                prompt += "\n"
+                prompt += f"{relative_fname} (stub)"
+                prompt += f"\n{self.fence[0]}\n"
+                stub = self.get_file_stub(fname)
+                prompt += stub
+                prompt += f"{self.fence[1]}\n"
         return prompt
 
     def get_cur_message_text(self):
@@ -818,7 +854,10 @@ class Coder:
 
         all_abs_files = set(self.get_all_abs_files())
         repo_abs_read_only_fnames = set(self.abs_read_only_fnames) & all_abs_files
-        chat_files = set(self.abs_fnames) | repo_abs_read_only_fnames
+        repo_abs_read_only_stubs_fnames = set(self.abs_read_only_stubs_fnames) & all_abs_files
+        chat_files = (
+            set(self.abs_fnames) | repo_abs_read_only_fnames | repo_abs_read_only_stubs_fnames
+        )
         other_files = all_abs_files - chat_files
 
         repo_content = self.repo_map.get_repo_map(
@@ -877,7 +916,9 @@ class Coder:
             ]
 
         # Handle image files
-        images_message = self.get_images_message(self.abs_read_only_fnames)
+        images_message = self.get_images_message(
+            list(self.abs_read_only_fnames) + list(self.abs_read_only_stubs_fnames)
+        )
         if images_message is not None:
             readonly_messages += [
                 images_message,
@@ -998,15 +1039,17 @@ class Coder:
 
     def get_input(self):
         inchat_files = self.get_inchat_relative_files()
-        read_only_files = [self.get_rel_fname(fname) for fname in self.abs_read_only_fnames]
-        all_files = sorted(set(inchat_files + read_only_files))
+        all_read_only_fnames = self.abs_read_only_fnames | self.abs_read_only_stubs_fnames
+        all_read_only_files = [self.get_rel_fname(fname) for fname in all_read_only_fnames]
+        all_files = sorted(set(inchat_files + all_read_only_files))
         edit_format = "" if self.edit_format == self.main_model.edit_format else self.edit_format
         return self.io.get_input(
             self.root,
             all_files,
             self.get_addable_relative_files(),
             self.commands,
-            self.abs_read_only_fnames,
+            abs_read_only_fnames=self.abs_read_only_fnames,
+            abs_read_only_stubs_fnames=self.abs_read_only_stubs_fnames,
             edit_format=edit_format,
         )
 
@@ -2220,7 +2263,8 @@ class Coder:
 
             # Get basenames of files already in chat or read-only
             existing_basenames = {os.path.basename(f) for f in self.get_inchat_relative_files()} | {
-                os.path.basename(self.get_rel_fname(f)) for f in self.abs_read_only_fnames
+                os.path.basename(self.get_rel_fname(f))
+                for f in self.abs_read_only_fnames | self.abs_read_only_stubs_fnames
             }
 
         mentioned_rel_fnames = set()
@@ -2639,6 +2683,9 @@ class Coder:
 
         return cur + new
 
+    def get_file_stub(self, fname):
+        return RepoMap.get_file_stub(fname, self.io)
+
     def get_rel_fname(self, fname):
         try:
             return os.path.relpath(fname, self.root)
@@ -2675,7 +2722,8 @@ class Coder:
         all_files = set(self.get_all_relative_files())
         inchat_files = set(self.get_inchat_relative_files())
         read_only_files = set(self.get_rel_fname(fname) for fname in self.abs_read_only_fnames)
-        return all_files - inchat_files - read_only_files
+        stub_files = set(self.get_rel_fname(fname) for fname in self.abs_read_only_stubs_fnames)
+        return all_files - inchat_files - read_only_files - stub_files
 
     def check_for_dirty_commit(self, path):
         if not self.repo:

aider/commands.py

@@ -416,6 +416,7 @@ class Commands:
 
     def _drop_all_files(self):
         self.coder.abs_fnames = set()
+        self.coder.abs_read_only_stubs_fnames = set()
 
         # When dropping all files, keep those that were originally provided via args.read
         if self.original_read_only_fnames:
@@ -553,6 +554,15 @@ class Commands:
         file_res.sort()
         res.extend(file_res)
 
+        # stub files
+        for fname in self.coder.abs_read_only_stubs_fnames:
+            relative_fname = self.coder.get_rel_fname(fname)
+            if not is_image_file(relative_fname):
+                stub = self.coder.get_file_stub(fname)
+                content = f"{relative_fname} (stub)\n{fence}\n" + stub + "{fence}\n"
+                tokens = self.coder.main_model.token_count(content)
+                res.append((tokens, f"{relative_fname} (read-only stub)", "/drop to remove"))
+
         self.io.tool_output(
             f"Approximate context window usage for {self.coder.main_model.name}, in tokens:"
         )
@@ -747,6 +757,9 @@ class Commands:
             fname = f'"{fname}"'
         return fname
 
+    def completions_raw_read_only_stub(self, document, complete_event):
+        return self.completions_raw_read_only(document, complete_event)
+
     def completions_raw_read_only(self, document, complete_event):
         # Get the text before the cursor
         text = document.text_before_cursor
@@ -923,6 +936,17 @@ class Commands:
             if abs_file_path in self.coder.abs_fnames:
                 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_stubs_fnames:
+                if self.coder.repo and self.coder.repo.path_in_repo(matched_file):
+                    self.coder.abs_read_only_stubs_fnames.remove(abs_file_path)
+                    self.coder.abs_fnames.add(abs_file_path)
+                    self.io.tool_output(
+                        f"Moved {matched_file} from read-only (stub) to editable files in the chat"
+                    )
+                else:
+                    self.io.tool_error(
+                        f"Cannot add {matched_file} as it's not part of the repository"
+                    )
             elif abs_file_path in self.coder.abs_read_only_fnames:
                 if self.coder.repo and self.coder.repo.path_in_repo(matched_file):
                     self.coder.abs_read_only_fnames.remove(abs_file_path)
@@ -962,7 +986,10 @@ class Commands:
 
     def completions_drop(self):
         files = self.coder.get_inchat_relative_files()
-        read_only_files = [self.coder.get_rel_fname(fn) for fn in self.coder.abs_read_only_fnames]
+        read_only_files = [
+            self.coder.get_rel_fname(fn)
+            for fn in self.coder.abs_read_only_fnames | self.coder.abs_read_only_stubs_fnames
+        ]
         all_files = files + read_only_files
         all_files = [self.quote_fname(fn) for fn in all_files]
         return all_files
@@ -989,6 +1016,26 @@ class Commands:
             "Symbol Outline",
         ]
 
+    def _handle_read_only_files(self, expanded_word, file_set, description=""):
+        """Handle read-only files with substring matching and samefile check"""
+        matched = []
+        for f in file_set:
+            if expanded_word in f:
+                matched.append(f)
+                continue
+
+            # Try samefile comparison for relative paths
+            try:
+                abs_word = os.path.abspath(expanded_word)
+                if os.path.samefile(abs_word, f):
+                    matched.append(f)
+            except (FileNotFoundError, OSError):
+                continue
+
+        for matched_file in matched:
+            file_set.remove(matched_file)
+            self.io.tool_output(f"Removed {description} file {matched_file} from the chat")
+
     def cmd_drop(self, args=""):
         "Remove files from the chat session to free up context space"
 
@@ -1014,25 +1061,13 @@ class Commands:
             # Expand tilde in the path
             expanded_word = os.path.expanduser(word)
 
-            # Handle read-only files with substring matching and samefile check
-            read_only_matched = []
-            for f in self.coder.abs_read_only_fnames:
-                if expanded_word in f:
-                    read_only_matched.append(f)
-                    continue
-
-                # Try samefile comparison for relative paths
-                try:
-                    abs_word = os.path.abspath(expanded_word)
-                    if os.path.samefile(abs_word, f):
-                        read_only_matched.append(f)
-                except (FileNotFoundError, OSError):
-                    continue
-
-            for matched_file in read_only_matched:
-                self.coder.abs_read_only_fnames.remove(matched_file)
-                self.io.tool_output(f"Removed read-only file {matched_file} from the chat")
-                files_changed = True
+            # Handle read-only files
+            self._handle_read_only_files(
+                expanded_word, self.coder.abs_read_only_fnames, "read-only"
+            )
+            self._handle_read_only_files(
+                expanded_word, self.coder.abs_read_only_stubs_fnames, "read-only (stub)"
+            )
 
             # For editable files, use glob if word contains glob chars, otherwise use substring
             if any(c in expanded_word for c in "*?[]"):
@@ -1269,6 +1304,7 @@ class Commands:
         other_files = []
         chat_files = []
         read_only_files = []
+        read_only_stub_files = []
         for file in files:
             abs_file_path = self.coder.abs_root_path(file)
             if abs_file_path in self.coder.abs_fnames:
@@ -1281,7 +1317,12 @@ class Commands:
             rel_file_path = self.coder.get_rel_fname(abs_file_path)
             read_only_files.append(rel_file_path)
 
-        if not chat_files and not other_files and not read_only_files:
+        # Add read-only stub files
+        for abs_file_path in self.coder.abs_read_only_stubs_fnames:
+            rel_file_path = self.coder.get_rel_fname(abs_file_path)
+            read_only_stub_files.append(rel_file_path)
+
+        if not chat_files and not other_files and not read_only_files and not read_only_stub_files:
             self.io.tool_output("\nNo files in chat, git repo, or read-only list.")
             return
 
@@ -1290,10 +1331,13 @@ class Commands:
         for file in other_files:
             self.io.tool_output(f"  {file}")
 
-        if read_only_files:
+        # Read-only files:
+        if read_only_files or read_only_stub_files:
             self.io.tool_output("\nRead-only files:\n")
         for file in read_only_files:
             self.io.tool_output(f"  {file}")
+        for file in read_only_stub_files:
+            self.io.tool_output(f"  {file} (stub)")
 
         if chat_files:
             self.io.tool_output("\nFiles in chat:\n")
@@ -1530,38 +1574,26 @@ class Commands:
         except Exception as e:
             self.io.tool_error(f"Error processing clipboard content: {e}")
 
-    def cmd_read_only(self, args):
-        """Add files to the chat that are for reference only, or turn added files to read-only.
-        With no args, opens a fuzzy finder to select files from the repo.
-        If no files are selected, converts all editable files in chat to read-only.
-        """
+    def _cmd_read_only_base(self, args, source_set, target_set, source_mode, target_mode):
+        """Base implementation for read-only and read-only-stub commands"""
         if not args.strip():
-            if self.coder.repo:
-                all_files = self.coder.repo.get_tracked_files()
-            else:
-                all_files = self.coder.get_all_relative_files()
-
-            if not all_files and not self.coder.abs_fnames:
-                self.io.tool_output("No files in the repo or chat to make read-only.")
-                return
-
-            selected_files = []
-            if all_files:
-                selected_files = run_fzf(all_files, multi=True)
-
-            if not selected_files:
-                # Fallback behavior: convert all editable files to read-only
-                if self.coder.abs_fnames:
-                    for fname in list(self.coder.abs_fnames):
-                        self.coder.abs_fnames.remove(fname)
-                        self.coder.abs_read_only_fnames.add(fname)
-                        rel_fname = self.coder.get_rel_fname(fname)
-                        self.io.tool_output(f"Converted {rel_fname} to read-only")
-                else:
-                    self.io.tool_output("No files selected.")
-                return
-
-            args = " ".join([self.quote_fname(f) for f in selected_files])
+            # Handle editable files
+            for fname in list(self.coder.abs_fnames):
+                self.coder.abs_fnames.remove(fname)
+                target_set.add(fname)
+                rel_fname = self.coder.get_rel_fname(fname)
+                self.io.tool_output(f"Converted {rel_fname} from editable to {target_mode}")
+
+            # Handle source set files if provided
+            if source_set:
+                for fname in list(source_set):
+                    source_set.remove(fname)
+                    target_set.add(fname)
+                    rel_fname = self.coder.get_rel_fname(fname)
+                    self.io.tool_output(
+                        f"Converted {rel_fname} from {source_mode} to {target_mode}"
+                    )
+            return
 
         filenames = parse_quoted_filenames(args)
         all_paths = []
@@ -1596,13 +1628,28 @@ class Commands:
         for path in sorted(all_paths):
             abs_path = self.coder.abs_root_path(path)
             if os.path.isfile(abs_path):
-                self._add_read_only_file(abs_path, path)
+                self._add_read_only_file(
+                    abs_path,
+                    path,
+                    target_set,
+                    source_set,
+                    source_mode=source_mode,
+                    target_mode=target_mode,
+                )
             elif os.path.isdir(abs_path):
-                self._add_read_only_directory(abs_path, path)
+                self._add_read_only_directory(abs_path, path, source_set, target_set, target_mode)
             else:
                 self.io.tool_error(f"Not a file or directory: {abs_path}")
 
-    def _add_read_only_file(self, abs_path, original_name):
+    def _add_read_only_file(
+        self,
+        abs_path,
+        original_name,
+        target_set,
+        source_set,
+        source_mode="read-only",
+        target_mode="read-only",
+    ):
         if is_image_file(original_name) and not self.coder.main_model.info.get("supports_vision"):
             self.io.tool_error(
                 f"Cannot add image file {original_name} as the"
@@ -1610,38 +1657,123 @@ class Commands:
             )
             return
 
-        if abs_path in self.coder.abs_read_only_fnames:
-            self.io.tool_error(f"{original_name} is already in the chat as a read-only file")
+        if abs_path in target_set:
+            self.io.tool_error(f"{original_name} is already in the chat as a {target_mode} file")
             return
         elif abs_path in self.coder.abs_fnames:
             self.coder.abs_fnames.remove(abs_path)
-            self.coder.abs_read_only_fnames.add(abs_path)
+            target_set.add(abs_path)
+            self.io.tool_output(
+                f"Moved {original_name} from editable to {target_mode} files in the chat"
+            )
+        elif source_set and abs_path in source_set:
+            source_set.remove(abs_path)
+            target_set.add(abs_path)
             self.io.tool_output(
-                f"Moved {original_name} from editable to read-only files in the chat"
+                f"Moved {original_name} from {source_mode} to {target_mode} files in the chat"
             )
         else:
-            self.coder.abs_read_only_fnames.add(abs_path)
-            self.io.tool_output(f"Added {original_name} to read-only files.")
+            target_set.add(abs_path)
+            self.io.tool_output(f"Added {original_name} to {target_mode} files.")
 
-    def _add_read_only_directory(self, abs_path, original_name):
+    def _add_read_only_directory(
+        self, abs_path, original_name, source_set, target_set, target_mode
+    ):
         added_files = 0
         for root, _, files in os.walk(abs_path):
             for file in files:
                 file_path = os.path.join(root, file)
                 if (
                     file_path not in self.coder.abs_fnames
-                    and file_path not in self.coder.abs_read_only_fnames
+                    and file_path not in target_set
+                    and (source_set is None or file_path not in source_set)
                 ):
-                    self.coder.abs_read_only_fnames.add(file_path)
+                    target_set.add(file_path)
                     added_files += 1
 
         if added_files > 0:
             self.io.tool_output(
-                f"Added {added_files} files from directory {original_name} to read-only files."
+                f"Added {added_files} files from directory {original_name} to {target_mode} files."
             )
         else:
             self.io.tool_output(f"No new files added from directory {original_name}.")
 
+    def cmd_read_only(self, args):
+        "Add files to the chat that are for reference only, or turn added files to read-only"
+        if not args.strip():
+            # If no args provided, use fuzzy finder to select files to add as read-only
+            all_files = self.coder.get_all_relative_files()
+            files_in_chat = self.coder.get_inchat_relative_files()
+            addable_files = sorted(set(all_files) - set(files_in_chat))
+            if not addable_files:
+                # If no files available to add, convert all editable files to read-only
+                self._cmd_read_only_base(
+                    "",
+                    source_set=self.coder.abs_read_only_stubs_fnames,
+                    target_set=self.coder.abs_read_only_fnames,
+                    source_mode="read-only (stub)",
+                    target_mode="read-only",
+                )
+                return
+            selected_files = run_fzf(addable_files, multi=True)
+            if not selected_files:
+                # If user didn't select any files, convert all editable files to read-only
+                self._cmd_read_only_base(
+                    "",
+                    source_set=self.coder.abs_read_only_stubs_fnames,
+                    target_set=self.coder.abs_read_only_fnames,
+                    source_mode="read-only (stub)",
+                    target_mode="read-only",
+                )
+                return
+            args = " ".join([self.quote_fname(f) for f in selected_files])
+
+        self._cmd_read_only_base(
+            args,
+            source_set=self.coder.abs_read_only_stubs_fnames,
+            target_set=self.coder.abs_read_only_fnames,
+            source_mode="read-only (stub)",
+            target_mode="read-only",
+        )
+
+    def cmd_read_only_stub(self, args):
+        "Add files to the chat as read-only stubs, or turn added files to read-only (stubs)"
+        if not args.strip():
+            # If no args provided, use fuzzy finder to select files to add as read-only stubs
+            all_files = self.coder.get_all_relative_files()
+            files_in_chat = self.coder.get_inchat_relative_files()
+            addable_files = sorted(set(all_files) - set(files_in_chat))
+            if not addable_files:
+                # If no files available to add, convert all editable files to read-only stubs
+                self._cmd_read_only_base(
+                    "",
+                    source_set=self.coder.abs_read_only_fnames,
+                    target_set=self.coder.abs_read_only_stubs_fnames,
+                    source_mode="read-only",
+                    target_mode="read-only (stub)",
+                )
+                return
+            selected_files = run_fzf(addable_files, multi=True)
+            if not selected_files:
+                # If user didn't select any files, convert all editable files to read-only stubs
+                self._cmd_read_only_base(
+                    "",
+                    source_set=self.coder.abs_read_only_fnames,
+                    target_set=self.coder.abs_read_only_stubs_fnames,
+                    source_mode="read-only",
+                    target_mode="read-only (stub)",
+                )
+                return
+            args = " ".join([self.quote_fname(f) for f in selected_files])
+
+        self._cmd_read_only_base(
+            args,
+            source_set=self.coder.abs_read_only_fnames,
+            target_set=self.coder.abs_read_only_stubs_fnames,
+            source_mode="read-only",
+            target_mode="read-only (stub)",
+        )
+
     def cmd_map(self, args):
         "Print out the current repository map"
         repo_map = self.coder.get_repo_map()
@@ -1743,6 +1875,14 @@ class Commands:
                         f.write(f"/read-only {rel_fname}\n")
                     else:
                         f.write(f"/read-only {fname}\n")
+                # Write commands to add read-only stubs files
+                for fname in sorted(self.coder.abs_read_only_stubs_fnames):
+                    # Use absolute path for files outside repo root, relative path for files inside
+                    if Path(fname).is_relative_to(self.coder.root):
+                        rel_fname = self.coder.get_rel_fname(fname)
+                        f.write(f"/read-only-stub {rel_fname}\n")
+                    else:
+                        f.write(f"/read-only-stub {fname}\n")
 
             self.io.tool_output(f"Saved commands to {args.strip()}")
         except Exception as e:

aider/help.py

@@ -17,7 +17,7 @@ warnings.simplefilter("ignore", category=FutureWarning)
 
 def install_help_extra(io):
     pip_install_cmd = [
-        "aider-chat[help]",
+        "aider-ce[help]",
         "--extra-index-url",
         "https://download.pytorch.org/whl/cpu",
     ]

aider/io.py

@@ -71,6 +71,31 @@ def restore_multiline(func):
     return wrapper
 
 
+def without_input_history(func):
+    """Decorator to temporarily disable history saving for the prompt session buffer."""
+
+    @functools.wraps(func)
+    def wrapper(self, *args, **kwargs):
+        orig_buf_append = None
+        try:
+            orig_buf_append = self.prompt_session.default_buffer.append_to_history
+            self.prompt_session.default_buffer.append_to_history = (
+                lambda: None
+            )  # Replace with no-op
+        except AttributeError:
+            pass
+
+        try:
+            return func(self, *args, **kwargs)
+        except Exception:
+            raise
+        finally:
+            if orig_buf_append:
+                self.prompt_session.default_buffer.append_to_history = orig_buf_append
+
+    return wrapper
+
+
 class CommandCompletionException(Exception):
     """Raised when a command should use the normal autocompleter instead of
     command-specific completion."""
@@ -554,6 +579,7 @@ class InputOutput:
         addable_rel_fnames,
         commands,
         abs_read_only_fnames=None,
+        abs_read_only_stubs_fnames=None,
         edit_format=None,
     ):
         self.rule()
@@ -567,9 +593,15 @@ class InputOutput:
             rel_read_only_fnames = [
                 get_rel_fname(fname, root) for fname in (abs_read_only_fnames or [])
             ]
-            show = self.format_files_for_input(rel_fnames, rel_read_only_fnames)
+            rel_read_only_stubs_fnames = [
+                get_rel_fname(fname, root) for fname in (abs_read_only_stubs_fnames or [])
+            ]
+            show = self.format_files_for_input(
+                rel_fnames, rel_read_only_fnames, rel_read_only_stubs_fnames
+            )
 
         prompt_prefix = ""
+
         if edit_format:
             prompt_prefix += edit_format
         if self.multiline_mode:
@@ -591,7 +623,8 @@ class InputOutput:
                 addable_rel_fnames,
                 commands,
                 self.encoding,
-                abs_read_only_fnames=abs_read_only_fnames,
+                abs_read_only_fnames=(abs_read_only_fnames or set())
+                | (abs_read_only_stubs_fnames or set()),
             )
         )
 
@@ -853,6 +886,7 @@ class InputOutput:
         return False
 
     @restore_multiline
+    @without_input_history
     def confirm_ask(
         self,
         question,
@@ -1186,67 +1220,84 @@ class InputOutput:
                 print(err)
                 self.chat_history_file = None  # Disable further attempts to write
 
-    def format_files_for_input(self, rel_fnames, rel_read_only_fnames):
+    def format_files_for_input(self, rel_fnames, rel_read_only_fnames, rel_read_only_stubs_fnames):
         # Optimization for large number of files
-        total_files = len(rel_fnames) + len(rel_read_only_fnames or [])
+        total_files = (
+            len(rel_fnames)
+            + len(rel_read_only_fnames or [])
+            + len(rel_read_only_stubs_fnames or [])
+        )
 
         # For very large numbers of files, use a summary display
         if total_files > 50:
             read_only_count = len(rel_read_only_fnames or [])
+            stub_file_count = len(rel_read_only_stubs_fnames or [])
             editable_count = len([f for f in rel_fnames if f not in (rel_read_only_fnames or [])])
 
             summary = f"{editable_count} editable file(s)"
             if read_only_count > 0:
                 summary += f", {read_only_count} read-only file(s)"
+            if stub_file_count > 0:
+                summary += f", {stub_file_count} stub file(s)"
             summary += " (use /ls to list all files)\n"
             return summary
 
         # Original implementation for reasonable number of files
         if not self.pretty:
-            read_only_files = []
-            for full_path in sorted(rel_read_only_fnames or []):
-                read_only_files.append(f"{full_path} (read only)")
-
-            editable_files = []
-            for full_path in sorted(rel_fnames):
-                if full_path in rel_read_only_fnames:
-                    continue
-                editable_files.append(f"{full_path}")
-
-            return "\n".join(read_only_files + editable_files) + "\n"
+            lines = []
+            # Handle regular read-only files
+            for fname in sorted(rel_read_only_fnames or []):
+                lines.append(f"{fname} (read only)")
+            # Handle stub files separately
+            for fname in sorted(rel_read_only_stubs_fnames or []):
+                lines.append(f"{fname} (read only stub)")
+            # Handle editable files
+            for fname in sorted(rel_fnames):
+                if fname not in rel_read_only_fnames and fname not in rel_read_only_stubs_fnames:
+                    lines.append(fname)
+            return "\n".join(lines) + "\n"
 
         output = StringIO()
         console = Console(file=output, force_terminal=False)
 
-        read_only_files = sorted(rel_read_only_fnames or [])
-        editable_files = [f for f in sorted(rel_fnames) if f not in rel_read_only_fnames]
-
-        if read_only_files:
-            # Use shorter of abs/rel paths for readonly files
+        # Handle read-only files
+        if rel_read_only_fnames or rel_read_only_stubs_fnames:
             ro_paths = []
-            for rel_path in read_only_files:
+            # Regular read-only files
+            for rel_path in sorted(rel_read_only_fnames or []):
                 abs_path = os.path.abspath(os.path.join(self.root, rel_path))
-                ro_paths.append(Text(abs_path if len(abs_path) < len(rel_path) else rel_path))
-
-            files_with_label = [Text("Readonly:")] + ro_paths
-            read_only_output = StringIO()
-            Console(file=read_only_output, force_terminal=False).print(Columns(files_with_label))
-            read_only_lines = read_only_output.getvalue().splitlines()
-            console.print(Columns(files_with_label))
-
+                ro_paths.append(abs_path if len(abs_path) < len(rel_path) else rel_path)
+            # Stub files with (stub) marker
+            for rel_path in sorted(rel_read_only_stubs_fnames or []):
+                abs_path = os.path.abspath(os.path.join(self.root, rel_path))
+                path = abs_path if len(abs_path) < len(rel_path) else rel_path
+                ro_paths.append(f"{path} (stub)")
+
+            if ro_paths:
+                files_with_label = ["Readonly:"] + ro_paths
+                read_only_output = StringIO()
+                Console(file=read_only_output, force_terminal=False).print(
+                    Columns(files_with_label)
+                )
+                read_only_lines = read_only_output.getvalue().splitlines()
+                console.print(Columns(files_with_label))
+
+        # Handle editable files
+        editable_files = [
+            f
+            for f in sorted(rel_fnames)
+            if f not in rel_read_only_fnames and f not in rel_read_only_stubs_fnames
+        ]
         if editable_files:
-            text_editable_files = [Text(f) for f in editable_files]
-            files_with_label = text_editable_files
-            if read_only_files:
-                files_with_label = [Text("Editable:")] + text_editable_files
+            files_with_label = editable_files
+            if rel_read_only_fnames or rel_read_only_stubs_fnames:
+                files_with_label = ["Editable:"] + editable_files
                 editable_output = StringIO()
                 Console(file=editable_output, force_terminal=False).print(Columns(files_with_label))
                 editable_lines = editable_output.getvalue().splitlines()
-
                 if len(read_only_lines) > 1 or len(editable_lines) > 1:
                     console.print()
             console.print(Columns(files_with_label))
-
         return output.getvalue()
 
 

aider/main.py

@@ -211,7 +211,7 @@ def check_streamlit_install(io):
         io,
         "streamlit",
         "You need to install the aider browser feature",
-        ["aider-chat[browser]"],
+        ["aider-ce[browser]"],
     )
 
 
@@ -991,6 +991,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             repo=repo,
             fnames=fnames,
             read_only_fnames=read_only_fnames,
+            read_only_stubs_fnames=[],
             show_diffs=args.show_diffs,
             auto_commits=args.auto_commits,
             dirty_commits=args.dirty_commits,

aider/queries/tree-sitter-languages/julia-tags.scm

@@ -0,0 +1,60 @@
+;; derived from: https://github.com/tree-sitter/tree-sitter-julia
+;; License: MIT
+
+(module
+  name: (identifier) @name.definition.module) @definition.module
+
+(module
+  name: (scoped_identifier) @name.definition.module) @definition.module
+
+(struct_definition
+  name: (type_identifier) @name.definition.class) @definition.class
+
+(mutable_struct_definition
+  name: (type_identifier) @name.definition.class) @definition.class
+
+(abstract_type_declaration
+  name: (type_identifier) @name.definition.class) @definition.class
+
+(constant_assignment
+  left: (identifier) @name.definition.class) @definition.class
+
+(function_definition
+  name: (identifier) @name.definition.function) @definition.function
+
+(function_definition
+  name: (scoped_identifier) @name.definition.function) @definition.function
+
+(assignment
+  left: (call_expression
+          function: (identifier) @name.definition.function)) @definition.function
+
+(method_definition
+  name: (identifier) @name.definition.method) @definition.method
+
+(macro_definition
+  name: (identifier) @name.definition.macro) @definition.macro
+
+(macro_call
+  name: (identifier) @name.reference.call) @reference.call
+
+(call_expression
+  function: (identifier) @name.reference.call) @reference.call
+
+(call_expression
+  function: (scoped_identifier) @name.reference.call) @reference.call
+
+(type_expression
+  name: (type_identifier) @name.reference.type) @reference.type
+
+(constant_assignment
+  left: (identifier) @name.definition.constant) @definition.constant
+
+(export_statement
+  (identifier) @name.reference.export) @reference.export
+
+(using_statement
+  (identifier) @name.reference.module) @reference.module
+
+(import_statement
+  (identifier) @name.reference.module) @reference.module

aider/repomap.py

@@ -102,6 +102,38 @@ class RepoMap:
         # Add more based on tree-sitter queries if needed
     }
 
+    @staticmethod
+    def get_file_stub(fname, io):
+        """Generate a complete structural outline of a source code file.
+
+        Args:
+            fname (str): Absolute path to the source file
+            io: InputOutput instance for file operations
+
+        Returns:
+            str: Formatted outline showing the file's structure
+        """
+        # Use cached instance if available
+        if not hasattr(RepoMap, "_stub_instance"):
+            RepoMap._stub_instance = RepoMap(map_tokens=0, io=io)
+
+        rm = RepoMap._stub_instance
+
+        rel_fname = rm.get_rel_fname(fname)
+
+        # Reuse existing tag parsing
+        tags = rm.get_tags(fname, rel_fname)
+        if not tags:
+            return "# No outline available"
+
+        # Get all definition lines
+        lois = [tag.line for tag in tags if tag.kind == "def"]
+
+        # Reuse existing tree rendering
+        outline = rm.render_tree(fname, rel_fname, lois)
+
+        return f"{outline}"
+
     def __init__(
         self,
         map_tokens=1024,

aider/scrape.py

@@ -42,7 +42,7 @@ def install_playwright(io):
     if has_pip and has_chromium:
         return True
 
-    pip_cmd = utils.get_pip_install(["aider-chat[playwright]"])
+    pip_cmd = utils.get_pip_install(["aider-ce[playwright]"])
     chromium_cmd = "-m playwright install --with-deps chromium"
     chromium_cmd = [sys.executable] + chromium_cmd.split()
 

{aider_ce-0.87.5.dev15.dist-info → aider_ce-0.87.7.dev11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-ce
-Version: 0.87.5.dev15
+Version: 0.87.7.dev11
 Summary: Aider is AI pair programming in your terminal
 Project-URL: Homepage, https://github.com/dwash96/aider-ce
 Classifier: Development Status :: 4 - Beta
@@ -93,6 +93,7 @@ This project aims to be compatible with upstream Aider, but with priority commit
 * [Map Cache Location Config: #2911](https://github.com/Aider-AI/aider/pull/2911)
 * [Enhanced System Prompts: #3804](https://github.com/Aider-AI/aider/pull/3804)
 * [Repo Map File Name Truncation Fix: #4320](https://github.com/Aider-AI/aider/pull/4320)
+* [Read Only Stub Files For Context Window Management : #3056](https://github.com/Aider-AI/aider/pull/3056)
 
 ### Other Updates
 
@@ -108,6 +109,7 @@ This project aims to be compatible with upstream Aider, but with priority commit
 * [Edit Before Adding Files and Reflecting](https://github.com/dwash96/aider-ce/pull/22)
 * [Fix Deepseek model configurations](https://github.com/Aider-AI/aider/commit/c839a6dd8964d702172cae007375e299732d3823)
 * [Relax Version Pinning For Easier Distribution](https://github.com/dwash96/aider-ce/issues/18)
+* [Remove Confirm Responses from History](https://github.com/Aider-AI/aider/pull/3958)
 
 ### Other Notes
 * [MCP Configuration](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/config/mcp.md)

{aider_ce-0.87.5.dev15.dist-info → aider_ce-0.87.7.dev11.dist-info}/RECORD

@@ -1,11 +1,11 @@
-aider/__init__.py,sha256=LWj2sw4A4BDQQ6ijpD78hwJMJg_j530bpiLPpghY03M,496
+aider/__init__.py,sha256=sBT6unAQIv2JlQ0UoaNBwwMxi65ZLpviMGyRLbk7SSY,496
 aider/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
-aider/_version.py,sha256=qQW5j1_8gMHF86LZit1yRddSbDKkM3RGYxR63CNueI0,721
+aider/_version.py,sha256=HDFK5zgSFoctKeBa4GGB9G8KVUj7B1jw-DH8hFrnNj8,721
 aider/analytics.py,sha256=c5ujaCcMc3yG-9rz_0oSsqBwmVQRxJnui6iE_yDyY_M,7507
 aider/args.py,sha256=yjfHJm-eKBEXJ7MlqoGQEjkFhBlCvGtwp44AajAtROs,32491
 aider/args_formatter.py,sha256=CBRnzHyZk-fFCK0ekAzb6C4PPJOU-VTpWIIsJe3qUhk,6369
 aider/change_tracker.py,sha256=djUlUuewhwRAlC0x6jIUZNpn6_PK1YyiNTMYvlvDeTE,4884
-aider/commands.py,sha256=uhJC21k7ARzBXTQRlvwQ_SPf9b2z9Ct-YisCGCfQ2Fw,73679
+aider/commands.py,sha256=TfOJyqjNQ78eTghzQFHiIpuJ2fIfNw2vbmF1nkQmZ5k,80010
 aider/copypaste.py,sha256=J99QrXILUED_GPdEqxt7WjGZ5if8sfy0VQTzsV2jBrE,2095
 aider/deprecated.py,sha256=SNeAWR7ih87F5AyFpC4pxRoJAaw8measBW583w0EUT8,4277
 aider/diffs.py,sha256=y6_rxIKe3FPCIsVy_RRkHdofguYOhYBr2Oytr5AqjHI,3028
@@ -14,13 +14,13 @@ aider/editor.py,sha256=_WAipJYEOx-q69mPp_hHAQ2yfeoZklBYjS0rTLxCHEA,4364
 aider/exceptions.py,sha256=W9Qw83348Xl0KwSMc1jYNZ-o8Ok65rBAuB1Mz9P6fUk,3914
 aider/format_settings.py,sha256=wHW4bLTKwqUKDGX4onxirC4cNgeJ-lHPuS1H04_R444,1041
 aider/gui.py,sha256=JnHvli1JTCGHAgsOZ8HkAWOKAFxmngbyviZIJeYvjsw,17573
-aider/help.py,sha256=Q8KS0G05Ick2YsVetpj9lAlNH3WjJTHg3t8sf5ZwlC0,4434
+aider/help.py,sha256=wExA1E9vuJccKBH1VvKmH-zJqFi-vhNc0n3CD3Y-8fI,4432
 aider/help_pats.py,sha256=syn7pSVJdcf8uMKTxnZUZBQu-r8JMAi-rrC-k2er1Fk,376
 aider/history.py,sha256=r3OP3kVxl6-PZmXEI9oK1mVAM-hYCbUqacISz4e_khY,5957
-aider/io.py,sha256=ncUO5OFbNIBW6Pd7yaBnJL-_JP7ejDftDN8t1mr4hT4,45534
+aider/io.py,sha256=gecsU8k3TOywKynspE_6GvcHNnopbRvIMa5xWBSTpv4,47538
 aider/linter.py,sha256=t5jwWZ1dvIzRtig1kTSjzl6u1LRfw0e19qwNIen2jAg,7998
 aider/llm.py,sha256=fGCemP1X9MBwrDfsTKGJ_1sx-yKz3DyoOvxZYOkvGak,1103
-aider/main.py,sha256=mC6-Q2UQG8-vWWG4GbkOY_vSk4I212pBEzCSs-i9-A0,44997
+aider/main.py,sha256=LyHwjkxz3_7tH_jerneLpDVzMY7svkkLW2NGXmfEzY8,45034
 aider/mdstream.py,sha256=fS9iQUQmIJPEMo7o1psPGE2yYj31MI3m3msdN-jEzUw,7594
 aider/models.py,sha256=hic7Wb8cwudH9fkfJykxEP8k98nNROBwDkbNHWnW3OE,47146
 aider/onboarding.py,sha256=XdCPsi6idsRvV0TsnaBOk0QoH-g3KgctafSMxoxvx6k,16105
@@ -28,10 +28,10 @@ aider/openrouter.py,sha256=FAdv7L8xgILXgmC_b1gnuYJStmpaPyiZMp-7nSdInlQ,4642
 aider/prompts.py,sha256=Qv-JS8BzGjusEPmR3-qmjjvN3S9mb7W4KpWiGui-Jk0,1954
 aider/reasoning_tags.py,sha256=VOg5wM7JSrMo47OyS1FFuLrr2cp2KyutEC4_zsUsCbY,2288
 aider/repo.py,sha256=ZLq0E6gwm7KabzYASib-7bqv-E55JZOWCpXfC3IZJeE,22922
-aider/repomap.py,sha256=LU5QGiHX2TBJnHH8bXVdZ0UdhsIuz9Gz11HoxPay550,32365
+aider/repomap.py,sha256=WRdBrP6GT8JxlHyqBxUcuVk9NemcJl0aJFain2z0KOY,33331
 aider/report.py,sha256=WobVDEK6YxB0GpHrF5twTfUYH5dsNWFIHFsB9lds7E8,5899
 aider/run_cmd.py,sha256=9-NpSL4hlqIndf_EN1jnmWfjX7vIPbDgKgGPGRAr2Rw,4223
-aider/scrape.py,sha256=Ei4Jy1xUsVD4lmuyVMONAVVHEB03hiVsGuE54etY4G0,8336
+aider/scrape.py,sha256=RyKlO3cN2QvfovaLQFJNx8j1Zaz6Qx2wqWhYO9H2Yug,8334
 aider/sendchat.py,sha256=Gq5A5E2kEg0MPE3tTKulhQseroXCwsGtLDH_OEHB2-4,1854
 aider/special.py,sha256=OhsBWWM-DWwjWbi6kE7EqR4CiUfyJ6qJuCgcmywZSAc,4415
 aider/urls.py,sha256=W0OL4pahSIZAaSUHPvn9KPN1aIkXE5nAKcizMKy4EKg,1122
@@ -46,7 +46,7 @@ aider/coders/architect_coder.py,sha256=b7KqtivnllPdyMfxbnEUd9G0C1ZFaiappV25Rz0Dk
 aider/coders/architect_prompts.py,sha256=R0_KxZjo-km_yNaeDAquDP9qfp3IdWgrdMirCWe0RIE,1658
 aider/coders/ask_coder.py,sha256=Omk4Ih8-prefkMZ_jnRS3faoW5CQUakHOvZ-s7piM3U,210
 aider/coders/ask_prompts.py,sha256=W6HwDUfzfOLt9q8sl6rw7fN7b5ND90FkxCZrtrWl5vY,1171
-aider/coders/base_coder.py,sha256=nNX-pm-jTU_tdUvsK4ybZTGM1pYqECKzwZ7ObzRe2nQ,109882
+aider/coders/base_coder.py,sha256=913yo4jkpjxwATUYP_oApz088i2dL4bfzEzVyLmtC4M,112125
 aider/coders/base_prompts.py,sha256=O3bBjhf0hgvtKbQ9QyOMnRy8LrmfLyT9dVAcXxHS_3k,3659
 aider/coders/chat_chunks.py,sha256=8HPet6cmQdgWvaA_tGpinO4ASMst53uTcSEtNVTYDXE,1981
 aider/coders/context_coder.py,sha256=Y5LdIaYHywMB03lXsmHTYsDnyHIHJ6FNZLMWa9wjArs,1571
@@ -127,6 +127,7 @@ aider/queries/tree-sitter-languages/go-tags.scm,sha256=mHtS5NEuxWJGfVz1rq4YlJRMY
 aider/queries/tree-sitter-languages/hcl-tags.scm,sha256=yOVCBeF4C3ZrFG-gg0adWg2QkxylPcI2dbVeEgD7EPE,2137
 aider/queries/tree-sitter-languages/java-tags.scm,sha256=7WKb-djGv0Ief6XEWQPYpfLpgJHtMPPukIUi55PegvE,627
 aider/queries/tree-sitter-languages/javascript-tags.scm,sha256=svVct6pxbcYP_-xEBwzGy6t1SlN7ajkEUCivUkBZn_Q,2251
+aider/queries/tree-sitter-languages/julia-tags.scm,sha256=OdZDoUUljhmY5gnKlRPebbA6lh4OC3RuN4kpJqpKCGs,1719
 aider/queries/tree-sitter-languages/kotlin-tags.scm,sha256=ugk8v7Or3PXiBk-_HfZznwLuV-b-s3TYm03Wm3q2h_o,632
 aider/queries/tree-sitter-languages/matlab-tags.scm,sha256=GqF7QBytU-xGkcUWkGlMi7iJ7XnmmoMFB_mtMKXaJgw,309
 aider/queries/tree-sitter-languages/ocaml-tags.scm,sha256=NAcyzmQuQPUjkchrQvcfhsvKqdcqbAt5eFb1chfEhMA,2695
@@ -256,9 +257,9 @@ aider/website/docs/usage/tutorials.md,sha256=ZKBztbUtucHOiv9h8gvWiWTP6MTSsFyz4mA
 aider/website/docs/usage/voice.md,sha256=BtX7pHRgHRWUmrNbS4JssC-SO8RrJ_OetBCtIYpO0pU,3452
 aider/website/docs/usage/watch.md,sha256=OVF14lGtv1vhSXRE8PpxQ3YW-uXSifarUbmLBjmLRyA,7940
 aider/website/share/index.md,sha256=P51aDw9AT8AVbsU7v6g1tWuMjly7y_plM_ZI1ScaT8Y,3172
-aider_ce-0.87.5.dev15.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-aider_ce-0.87.5.dev15.dist-info/METADATA,sha256=M0L6DI9sQXHO85F70rUEsOMOi17thp8uN9yLgXgXBIU,18053
-aider_ce-0.87.5.dev15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aider_ce-0.87.5.dev15.dist-info/entry_points.txt,sha256=OxI0JxfyJrc24nTmsdvpaWUx8Flz2huOij_-ifp-48w,69
-aider_ce-0.87.5.dev15.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
-aider_ce-0.87.5.dev15.dist-info/RECORD,,
+aider_ce-0.87.7.dev11.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+aider_ce-0.87.7.dev11.dist-info/METADATA,sha256=-4jIUenEPFsRRyujDIQlJm-W8lNRmoe4yPb1tDuZqoE,18248
+aider_ce-0.87.7.dev11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aider_ce-0.87.7.dev11.dist-info/entry_points.txt,sha256=OxI0JxfyJrc24nTmsdvpaWUx8Flz2huOij_-ifp-48w,69
+aider_ce-0.87.7.dev11.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
+aider_ce-0.87.7.dev11.dist-info/RECORD,,