fix: correct /undo prompt to match actual git reset --soft behavior#4928
Open
karesansui-u wants to merge 1 commit intoAider-AI:mainfrom
Open
fix: correct /undo prompt to match actual git reset --soft behavior#4928karesansui-u wants to merge 1 commit intoAider-AI:mainfrom
karesansui-u wants to merge 1 commit intoAider-AI:mainfrom
Conversation
The undo_command_reply tells the LLM that `git reset --hard HEAD~1` was executed, but commands.py actually runs `git reset --soft HEAD~1`. This causes the LLM to believe all changes were discarded when they are actually still staged, leading to incorrect editing decisions.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Bug description
undo_command_replyinprompts.pytells the LLM thatgit reset --hard HEAD~1was executed, butcommands.pyL644 actually runsgit reset --soft HEAD~1.This causes the LLM to believe all changes were discarded (working tree clean), when they are actually still staged. Subsequent editing decisions are based on an incorrect understanding of the repository state.
Fix
Update the prompt string to accurately describe the
--softreset and mention that changes remain staged.Steps to reproduce
/undo--hardwiped everythingAffected files
aider/prompts.py(L25-29) — 1 line change