Repository navigation
fix(core): prefer nearest skill source - #41788
Merged
Merged
Conversation
kitlangton
marked this pull request as ready for review
August 11, 2026 20:13
jinhuang712
pushed a commit
to jinhuang712/opencode
that referenced
this pull request
Sep 26, 2026
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.
What
Ensure duplicate discovered skill IDs resolve to the source nearest the session directory. In a nested git worktree, the worktree copy now wins over a farther parent checkout copy, keeping the selected skill on the checked-out branch and inside the session directory.
Closes #39871
Before / After
Before: Config ancestor discovery returned nearby
.agentsand.claudedirectories first. The skill plugin applies later-source precedence, so a duplicate skill from the farther parent checkout replaced the worktree copy and could trigger anexternal_directorypermission request.After: Discovered
.agentsand.claudedirectories are ordered from farthest to nearest. Existing later-source precedence deterministically selects the nearest duplicate skill, including its localSKILL.mdlocation.How
.agentsand.claudeconfig entries from low to high priority, consistent with direct config and.opencodediscovery.Scope
This preserves the cross-git/project-boundary ancestor discovery introduced by #36577. It does not restore a git-root stop boundary: farther parent checkout config and skills are still discovered when no nearer source overrides them.
Testing
bun run test test/config/skill.test.tsfrompackages/core(9 passed)bun run test test/config/config.test.tsfrompackages/core(33 passed)bun typecheckfrompackages/core(passed)bun turbo typecheck --concurrency=3(33 tasks passed)bunx prettier --check src/config.ts test/config/config.test.ts test/config/skill.test.tsfrompackages/core(passed)The new regression was run before the implementation change and failed with
Expected: "Worktree", Received: "Parent checkout"; it passes after the fix.