Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Add read-only stub files feature #3056

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+250 −75
Open

Draft: Add read-only stub files feature #3056

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e04b5d
feat: add cmd /read-only-stub for adding the outline of files to the …
lutzleonhardt Jan 28, 2025
bac804a
refactor: simplify outline display by removing redundant filename
lutzleonhardt Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 51 additions & 7 deletions aider/coders/base_coder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ def wrap_fence(name):
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
Expand Down Expand Up @@ -150,6 +151,7 @@ def create(
update = dict(
fnames=list(from_coder.abs_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,
Expand Down Expand Up @@ -250,6 +252,10 @@ def get_announcements(self):
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.")

Expand All @@ -265,6 +271,7 @@ def __init__(
repo=None,
fnames=None,
read_only_fnames=None,
read_only_stubs_fnames=None,
show_diffs=False,
auto_commits=True,
dirty_commits=True,
Expand Down Expand Up @@ -341,6 +348,8 @@ def __init__(
self.verbose = verbose
self.abs_fnames = set()
self.abs_read_only_fnames = set()
self.abs_read_only_stubs_fnames = set()


if cur_messages:
self.cur_messages = cur_messages
Expand Down Expand Up @@ -429,6 +438,15 @@ def __init__(
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
Expand Down Expand Up @@ -550,6 +568,10 @@ def choose_fence(self):
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
Expand Down Expand Up @@ -594,6 +616,7 @@ def get_files_content(self, fnames=None):

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):
Expand All @@ -603,6 +626,17 @@ def get_read_only_files_content(self):
prompt += f"\n{self.fence[0]}\n"
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):
Expand Down Expand Up @@ -654,7 +688,8 @@ def get_repo_map(self, force_refresh=False):

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(
Expand Down Expand Up @@ -713,7 +748,9 @@ def get_readonly_files_messages(self):
]

# 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,
Expand Down Expand Up @@ -833,15 +870,17 @@ def copy_context(self):

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,
)

Expand Down Expand Up @@ -1555,7 +1594,7 @@ def get_file_mentions(self, content):

# 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()
Expand Down Expand Up @@ -1893,6 +1932,10 @@ def get_multi_response_content(self, final=False):

return res


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)
Expand Down Expand Up @@ -1929,7 +1972,8 @@ def get_addable_relative_files(self):
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:
Expand Down
Loading