dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-05-31 01:35:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

feat: enhance shell command output handling and chat integration

Browse source
This commit is contained in:
Paul Gauthier 2024-08-27 11:17:59 -07:00 • committed by Paul Gauthier (aider)
parent cd48eda88c
commit 2b2569b787
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
aider/coders/base_coder.py
View file

@ -1166,7 +1166,12 @@ class Coder:
self.update_cur_messages() self.update_cur_messages()
return return
self.run_shell_commands() shared_output = self.run_shell_commands()
if shared_output:
self.cur_messages += [
dict(role="user", content=shared_output),
dict(role="assistant", content="Ok"),
]
if edited and self.auto_test: if edited and self.auto_test:
test_errors = self.commands.cmd_test(self.test_cmd) test_errors = self.commands.cmd_test(self.test_cmd)
@ -1870,7 +1875,7 @@ class Coder:
output = self.handle_shell_commands(command, group) output = self.handle_shell_commands(command, group)
if output: if output:
accumulated_output += output + "\n\n" accumulated_output += output + "\n\n"
return accumulated_output.strip() return accumulated_output
def handle_shell_commands(self, commands_str, group): def handle_shell_commands(self, commands_str, group):
commands = commands_str.strip().splitlines() commands = commands_str.strip().splitlines()
@ -1895,15 +1900,11 @@ class Coder:
self.io.add_to_input_history(f"/run {command.strip()}") self.io.add_to_input_history(f"/run {command.strip()}")
exit_status, output = run_cmd(command) exit_status, output = run_cmd(command)
if output: if output:
self.io.tool_output(output) accumulated_output += f"Output from {command}\n{output}\n"
accumulated_output += f"$ {command}\n{output}\n"
if exit_status != 0:
error_message = f"Command exited with status {exit_status}"
self.io.tool_error(error_message)
accumulated_output += f"{error_message}\n"
accumulated_output = accumulated_output.strip() if accumulated_output.strip() and not self.io.confirm_ask(
if accumulated_output and not self.io.confirm_ask("Add command output to the chat?"): "Add command output to the chat?"
):
accumulated_output = "" accumulated_output = ""
return accumulated_output return accumulated_output