Skip to content

Re-order update application and tool call usage to ensure file edits … #17

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

Merged
dwash96 merged 1 commit into from
Aug 22, 2025
Merged

Re-order update application and tool call usage to ensure file edits … #17

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions aider/coders/base_coder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1716,6 +1716,18 @@ def send_message(self, inp):
else:
content = ""

if interrupted:
if self.cur_messages and self.cur_messages[-1]["role"] == "user":
self.cur_messages[-1]["content"] += "\n^C KeyboardInterrupt"
else:
self.cur_messages += [dict(role="user", content="^C KeyboardInterrupt")]
self.cur_messages += [
dict(role="assistant", content="I see that you interrupted my previous reply.")
]
return

edited = self.apply_updates()

if not interrupted:
add_rel_files_message = self.check_for_file_mentions(content)
if add_rel_files_message:
Expand All @@ -1739,18 +1751,6 @@ def send_message(self, inp):
except KeyboardInterrupt:
interrupted = True

if interrupted:
if self.cur_messages and self.cur_messages[-1]["role"] == "user":
self.cur_messages[-1]["content"] += "\n^C KeyboardInterrupt"
else:
self.cur_messages += [dict(role="user", content="^C KeyboardInterrupt")]
self.cur_messages += [
dict(role="assistant", content="I see that you interrupted my previous reply.")
]
return

edited = self.apply_updates()

if edited:
self.aider_edited_files.update(edited)
saved_message = self.auto_commit(edited)
Expand Down
Loading