Repository navigation
feat(cli): support custom skill directories via settings #7395
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ea6b525
feat(cli): support custom skill directories via settings (#7394)
qwen-code-dev-bot c5c60f6
fix(cli): regenerate settings schema for skills.directories (#7394)
qwen-code-dev-bot 0a5a8de
Merge branch 'main' into feat/custom-skill-dirs-7394
qwen-code-dev-bot 4f954f0
fix(core): address review feedback for custom skill directories (#7395)
qwen-code-ci-bot 5edfaf2
fix(core): address review feedback for custom skill directories (#7395)
ec8cf37
fix(core): address review feedback for custom skill directories (#7395)
620175d
test(core): add relative path resolution test for custom skill dirs (…
f08fa4e
fix(cli): add Array.isArray guard for skills.directories and safe mod…
0cc88e6
Merge branch 'main' into feat/custom-skill-dirs-7394
qwen-code-dev-bot 6bdcbe2
fix(skills): address review feedback on custom skill directories (#7395)
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
[Suggestion]
skills.directoriesusesMergeStrategy.UNION, which means a trusted workspace's.qwen/settings.jsoncan UNION-merge additional entries into the effective skill directory list. Those workspace-injected directories are then loaded atuserlevel inSkillManager.getSkillsBaseDirs('user')— visible across all workspaces, not scoped to the originating one.This diverges from the MCP server handling:
tagMcpServerScope(workspace, 'workspace')stamps workspace MCP servers withscope: 'workspace', so downstream consumers can distinguish user-configured from workspace-injected servers. Skill directories pass through the merge with no provenance tracking.Concrete scenario: a user trusts a workspace (e.g., to use its MCP servers). That workspace includes
{"skills":{"directories":["/tmp/shared-skills"]}}. Skills in that directory are loaded globally with hook execution capability (PreToolUse/PostToolUseviachild_process.spawn). The schema description warns about trusting the location, but the asymmetry with MCP server provenance tracking means the system could make scope-aware decisions here and currently doesn't.Possible approaches:
tagMcpServerScope) and load workspace-sourced dirs atprojectlevelREPLACEinstead ofUNIONfor workspace scopeskills.directories— qwen3.7-max via Qwen Code /review