fix: discover skills under .github/skills/ directory by spboyer · Pull Request #69 · microsoft/waza

spboyer · 2026-03-04T23:07:09Z

Fixes #52

Changes

This PR enables waza to automatically discover skills in (GitHub Copilot's standard location) without requiring manual configuration.

Phase 1: Workspace Detection ()

Modified to check both configured skills directory and :

After checking the configured (default ), also checks
Merges skills from both locations, deduplicating by name (configured dir wins on conflict)
Backward-compatible: no config changes needed

Phase 2: Discovery ()

Modified to exempt from hidden directory skipping:

Changed condition to: if info.IsDir() && strings.HasPrefix(info.Name(), ".") && info.Name() != ".github"
Other hidden directories (, , etc.) still skipped

Tests

Added comprehensive test coverage:

Workspace tests:

TestDetectContext_GitHubSkillsDir - Skills in .github/skills/ auto-discovered
TestDetectContext_BothSkillsDirs - Skills from both locations merged
TestDetectContext_GitHubSkillsDirDedup - Deduplication works correctly
TestDetectContext_GitHubSkillsDirWithCustomOverride - Custom paths.skills + .github/skills both work

Discovery tests:

TestDiscoverGitHubSkillsDir - Discover() finds skills under .github/skills/
TestDiscoverOtherHiddenDirsStillSkipped - Other hidden dirs remain skipped

Verification

✅ All tests pass: go test ./internal/workspace/ ./internal/discovery/ -v -count=1
✅ Build succeeds: go build ./...
✅ Clean diff: Only touches workspace.go, workspace_test.go, discovery.go, discovery_test.go

Copilot

Pull request overview

Enables automatic discovery of skills placed under GitHub Copilot’s conventional .github/skills/ location, without requiring users to override paths.skills.

Changes:

Update workspace detection to merge skills from the configured skills directory (default skills/) and .github/skills/, deduplicating by skill name (configured directory wins).
Update discovery traversal to avoid skipping the .github directory while still skipping other hidden directories.
Add tests covering .github/skills/ detection, merging, and hidden-directory skip behavior.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 2 comments.

File	Description
internal/workspace/workspace.go	Merges skills from configured skills dir and `.github/skills/` in `DetectContext()`.
internal/workspace/workspace_test.go	Adds workspace tests for `.github/skills/` auto-discovery and merge/dedup behavior.
internal/discovery/discovery.go	Exempts `.github` from hidden-directory skipping during `Discover()` traversal.
internal/discovery/discovery_test.go	Adds discovery tests ensuring `.github/skills/` is discovered while other hidden dirs remain skipped.

spboyer

Both review comments have been addressed in commit e35daae:

✅ .github exemption restricted to root-level only (filepath.Dir(path) == resolvedRoot)
✅ Dedup map updated on append (existingNames[s.Name] = true added)

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

spboyer

✅ Reviewed by Rusty — LGTM. .github/skills/ discovery support with squad state updates per team decisions. Ready to merge (can't self-approve since you authored this).

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Change models to match the YAML, for less confusion.

wbreza

Code Review: PR #69 — fix: discover skills under .github/skills/ directory

✅ What Looks Good

All 8 prior review comments addressed — thorough follow-through across three commits
Comprehensive test coverage — 8 new tests covering discovery, merging, deduplication, custom override, and double-scan prevention
Correct .github scoping — discovery only enters .github/skills/, properly skips workflows/ and other subdirs
Cross-platform path handling — samePath() handles symlinks and Windows case-insensitivity
Backward compatible — no config changes needed; existing behavior preserved

🟡 Suggestions (non-blocking)

samePath() has no direct unit test — It implements non-trivial logic (Abs, EvalSymlinks, Windows case-insensitive). Consider adding a TestSamePath with edge cases.
Consider extracting skill deduplication into a helper — The merge-with-dedup logic is inline. A mergeSkills() helper would improve reuse if a third skill source is ever added.
Edge case tests — No explicit test for .github without skills/ subdirectory or empty .github/skills/ directory. Both work correctly based on the code, but explicit tests would document the behavior.

Summary

Priority	Count
Critical	0
High	0
Medium	2
Low	2

Overall Assessment: ✅ Approve — well-implemented feature with solid test coverage. All prior feedback addressed. Suggestions are quality improvements, not blockers.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 2 comments.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

richardpark-msft

Seems fine. We might want to revisit some of it, but I think the overall feature makes sense.

* fix: discover skills under .github/skills/ directory #52 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: address review feedback on PR #69 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: address PR #69 discovery review comments Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * fix: add samePath tests + extract dedup helper (#69 feedback) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * refactor: optimize and dedupe skill merge logic for PR69 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

spboyer requested a review from chlowell as a code owner March 4, 2026 23:07

Copilot AI review requested due to automatic review settings March 4, 2026 23:07

spboyer requested a review from richardpark-msft as a code owner March 4, 2026 23:07

github-actions Bot enabled auto-merge (squash) March 4, 2026 23:07

Copilot started reviewing on behalf of spboyer March 4, 2026 23:08 View session

Copilot AI reviewed Mar 4, 2026

View reviewed changes

Comment thread internal/discovery/discovery.go Outdated

Comment thread internal/workspace/workspace.go Outdated

spboyer commented Mar 4, 2026

View reviewed changes

spboyer force-pushed the squad/52-github-skills-discovery branch from e35daae to 666221a Compare March 4, 2026 23:32

Copilot AI review requested due to automatic review settings March 4, 2026 23:32

Copilot started reviewing on behalf of spboyer March 4, 2026 23:33 View session

Copilot AI reviewed Mar 4, 2026

View reviewed changes

Comment thread internal/workspace/workspace.go

Comment thread internal/execution/copilot_test.go Outdated

Comment thread internal/execution/copilot_test.go Outdated

spboyer force-pushed the squad/52-github-skills-discovery branch from 666221a to 07e0790 Compare March 4, 2026 23:58

spboyer commented Mar 5, 2026

View reviewed changes

Copilot AI review requested due to automatic review settings March 5, 2026 16:00

spboyer force-pushed the squad/52-github-skills-discovery branch from 07e0790 to 3032f7f Compare March 5, 2026 16:00

Copilot started reviewing on behalf of spboyer March 5, 2026 16:01 View session

Copilot AI reviewed Mar 5, 2026

View reviewed changes

Comment thread internal/discovery/discovery.go Outdated

spboyer added a commit that referenced this pull request Mar 5, 2026

fix: address review feedback on PR #69

8468aef

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

spboyer and others added 2 commits March 5, 2026 12:46

fix: discover skills under .github/skills/ directory #52

a9f496c

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

fix: address review feedback on PR #69

edf7a5a

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings March 5, 2026 17:46

spboyer force-pushed the squad/52-github-skills-discovery branch from 8468aef to edf7a5a Compare March 5, 2026 17:46

Copilot AI reviewed Mar 5, 2026

View reviewed changes

Comment thread internal/workspace/workspace.go

Comment thread internal/discovery/discovery.go Outdated

fix: address PR #69 discovery review comments

5d24836

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

chlowell pushed a commit to chlowell/waza that referenced this pull request Mar 5, 2026

Merge pull request microsoft#69 from richardpark-msft/fixing-model-names

d1988ae

Change models to match the YAML, for less confusion.

wbreza previously approved these changes Mar 5, 2026

View reviewed changes

Comment thread internal/workspace/workspace.go

Comment thread internal/workspace/workspace.go Outdated

fix: add samePath tests + extract dedup helper (#69 feedback)

a90aa64

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot AI review requested due to automatic review settings March 5, 2026 22:01

spboyer dismissed wbreza’s stale review via a90aa64 March 5, 2026 22:01

Copilot AI reviewed Mar 5, 2026

View reviewed changes

Comment thread internal/discovery/discovery.go Outdated

Comment thread internal/discovery/discovery.go

Copilot started reviewing on behalf of spboyer March 5, 2026 23:00 View session

refactor: optimize and dedupe skill merge logic for PR69

a4a91ac

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

richardpark-msft approved these changes Mar 5, 2026

View reviewed changes

github-actions Bot merged commit 3ba02fa into main Mar 5, 2026
6 checks passed

spboyer mentioned this pull request Mar 12, 2026

Release v0.21.0 #122

Merged

4 tasks

spboyer mentioned this pull request Apr 22, 2026

Waza doesn't understand skills under the .github directory #52

Closed

Uh oh!

Conversation

spboyer commented Mar 4, 2026

Changes

Phase 1: Workspace Detection ()

Phase 2: Discovery ()

Tests

Verification

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

spboyer left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

spboyer left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

wbreza left a comment

Choose a reason for hiding this comment

Code Review: PR #69 — fix: discover skills under .github/skills/ directory

✅ What Looks Good

🟡 Suggestions (non-blocking)

Summary

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

richardpark-msft left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants