fix: preserve architect context when file-add dialog triggers#4953
Open
ameenalkhaldi wants to merge 1 commit intoAider-AI:mainfrom
Open
fix: preserve architect context when file-add dialog triggers#4953ameenalkhaldi wants to merge 1 commit intoAider-AI:mainfrom
ameenalkhaldi wants to merge 1 commit intoAider-AI:mainfrom
Conversation
When the architect's response mentions a file not in the chat, check_for_file_mentions triggers and sets reflected_message, returning before reply_completed runs. The architect gets called again with the reflection, but only that second (shorter) response reaches the editor. The original response with the actual code changes is lost. Now reply_completed collects all assistant messages from cur_messages so the editor receives the full architect output including the original response that triggered the file-add. Fixes Aider-AI#3033
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
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.
When the architect's response mentions a file not in the chat,
check_for_file_mentionstriggers a reflection loop. It setsreflected_messageand returns beforereply_completedruns. The architect gets called again with the reflection message, but only that second (shorter) response reaches the editor viapartial_response_content. The original response containing the actual code changes is incur_messagesbut never forwarded.This causes the editor to work with incomplete context, as shown in #3033 where token counts drop from 6.6k to 3.4k after a file-add dialog.
The fix collects all assistant messages from
cur_messagesinreply_completedso the editor receives the full architect output. Falls back topartial_response_contentfor the normal (no reflection) path.Fixes #3033