fix: correct .opencode/ config directory precedence#21405
Open
claygeo wants to merge 1 commit intoanomalyco:devfrom
Open
fix: correct .opencode/ config directory precedence#21405claygeo wants to merge 1 commit intoanomalyco:devfrom
claygeo wants to merge 1 commit intoanomalyco:devfrom
Conversation
Reverse the project .opencode/ directory list so child directories override parent directories during config merge, matching the behavior of plain opencode.json files which already use rootFirst ordering.
github-actions
Bot
added
needs:compliance
Contributor
|
Thanks for updating your PR! It now meets our contributing guidelines. 👍 |
3 tasks
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.
Issue for this PR
Closes #21307
Type of change
What does this PR do?
ConfigPaths.directories()usesFilesystem.up()to collect.opencode/config dirs from child to parent. These get fed intomergeDeepwhere later entries win. Sinceup()yields child-first, the parent dir ends up last in the array and wins the merge. That's backwards.The fix:
.reverse()the array so parent comes first, child comes last. Child config wins the merge, which is the expected behavior. This matches howprojectFilesalready handles the same precedence problem using{ rootFirst: true }.How did you verify your code works?
Added a test that creates nested
.opencode/dirs (parent withusername: "parent-wins", child withusername: "child-should-win"), loads config from the child dir, and asserts child wins.All 76 config tests pass including the new one:
bun test packages/opencode/test/config/config.test.tsScreenshots / recordings
N/A — no UI change.
Checklist