fix: merge instructions arrays across config files #6663
Merged
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
instructionsconfig array was being replaced instead of merged when combining global and project configs. This meant global instructions (e.g. from~/.config/opencode/opencode.json) were lost when a project had its owninstructionsarray.this PR:
mergeConfigWithPluginstomergeConfigConcatArraysto reflect its broader purposeinstructionsarray merging alongside the existingpluginarray handlingThe
pluginarray already had this fix (PR #4724), butinstructionswas missed.Paths are deduplicated by their raw string value, not their resolved location. Resolving paths at merge time isn't feasible since globs need filesystem access and project context isn't fully established yet.
instructionsvalue~/.config/opencode/opencode.json["INSTRUCTIONS.md"]~/.config/opencode/opencode.json["~/.config/opencode/INSTRUCTIONS.md"]./opencode.json["INSTRUCTIONS.md"]Users should use absolute or
~/paths in global config to ensure they resolve correctly.