Prevent duplicate instruction appending in generate_prompts #2916
+50
−3
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.
The
generate_promptsfunction appended instructions multiple times when called repeatedly with the sameoptsobject, causing duplicate content in both the instruction string and messages array.Resolves #2907
Changes
Instruction file loading (lines 265-273): Added
opts._instructions_loadedguard flag to prevent re-reading and re-appending file content. Flag set after file processing regardless of content to avoid redundant I/O.Message array insertion (lines 444-447): Added
opts._instructions_added_to_messagesguard flag to prevent duplicate instruction messages.Example
Tests
Added two test cases validating no duplication occurs across multiple
generate_promptscalls with the sameoptsobject.Copilot PR from my fork: ccope#1
Original prompt
This pull request was created from Copilot chat.