fix(prompt): bound agent context to explicit @ references#18958
Open
Haohao-end wants to merge 3 commits intoanomalyco:devfrom
Open
fix(prompt): bound agent context to explicit @ references#18958Haohao-end wants to merge 3 commits intoanomalyco:devfrom
Haohao-end wants to merge 3 commits intoanomalyco:devfrom
Conversation
Author
|
Local verification for this change passed:
After updating the branch to the latest
My change only touches:
|
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.
Issue for this PR
Closes #18910
Type of change
What does this PR do?
This fixes a prompt-scoping issue for explicit
@file/@directoryreferences.Right now
resolvePromptParts()expands explicit references into message parts, but there is no strong reminder telling the model that those references are the intended working set for the current turn. Because of that, the model can still greedily expand into sibling directories, parent directories, or unrelated files even when the user already pointed it at a specific file or directory.This change does three small things:
resolvePromptParts()now preserves source text metadata for explicit@...file and directory referencescreateUserMessage()injects a short synthetic<system-reminder>only when the current user message contains explicit file references from@...default.txtgets one short rule reinforcing that explicit references should be treated as the initial working setWhy this works:
the fix binds the reminder to the current turn’s explicit references instead of all later-read files. That means the model is told to start from the user-provided scope and avoid broadening unless that scope is not enough to complete the task.
I also added focused regression tests for:
@...referencesHow did you verify your code works?
I tested this locally with:
cd packages/opencode && bun test test/session/prompt.test.tscd packages/opencode && bun typecheckThe branch also passed the pre-push typecheck:
bun turbo typecheckScreenshots / recordings
Not a UI change.
Checklist
If you do not follow this template your PR will be automatically rejected.