Skip to content

[dotnet-port] Align fsskills nested discovery with .NET #348

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.

Sign up for GitHub

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
Quim Muntal (qmuntal) merged 3 commits into from
Jun 25, 2026
+57 −2
Merged

[dotnet-port] Align fsskills nested discovery with .NET #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f52d151
Align fsskills nested discovery with .NET
github-actions[bot] Jun 24, 2026
348d87d
Fix root fsskills discovery handling
Copilot Jun 24, 2026
1aa9c54
Clarify fsskills subfs error handling
Copilot Jun 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions agent/skills/fsskills/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,9 +188,14 @@ func discoverSkillDirectories(filesystems []fs.FS) []discoveredSkillDir {
func searchForSkills(filesystem fs.FS, dir string, results *[]discoveredSkillDir, currentDepth int) {
skillPath := path.Join(dir, skillFileName)
if _, err := fs.Stat(filesystem, skillPath); err == nil {
sub, err := fs.Sub(filesystem, dir)
if err == nil {
sub := filesystem
var subErr error
if dir != "." {
sub, subErr = fs.Sub(filesystem, dir)
}
if subErr == nil {
*results = append(*results, discoveredSkillDir{fsys: sub, path: dir})
return
}
}
if currentDepth >= defaultSearchDepth {
Expand Down
50 changes: 50 additions & 0 deletions agent/skills/fsskills/source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,56 @@ func TestFileSource_NestedSkillDirectory_DiscoveredWithinDepthLimit(t *testing.T
}
}

func TestFileSource_RootSkillFileWithNestedSkillFile_DoesNotAbortDiscovery(t *testing.T) {
root := t.TempDir()
if err := os.WriteFile(filepath.Join(root, "SKILL.md"), []byte("---\nname: root-skill\ndescription: Root\n---\nRoot body."), 0o644); err != nil {
t.Fatal(err)
}
childDir := filepath.Join(root, "child")
if err := os.MkdirAll(childDir, 0o755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(childDir, "SKILL.md"), []byte("---\nname: child\ndescription: Child\n---\nChild body."), 0o644); err != nil {
t.Fatal(err)
}

source := fsskills.NewSource(os.DirFS(root))
loaded, err := source.Skills(t.Context())
if err != nil {
t.Fatal(err)
}
if len(loaded) != 1 {
t.Fatalf("expected 1 skill, got %d", len(loaded))
}
if loaded[0].Frontmatter.Name != "root-skill" {
t.Fatalf("expected root-skill, got %q", loaded[0].Frontmatter.Name)
}
}

func TestFileSource_NestedSkillFileUnderSkillRoot_NotDiscoveredAsIndependentSkill(t *testing.T) {
root := t.TempDir()
createSkillDir(t, root, "parent-skill", "Parent", "Parent body.")
childDir := filepath.Join(root, "parent-skill", "child")
if err := os.MkdirAll(childDir, 0o755); err != nil {
t.Fatal(err)
}
if err := os.WriteFile(filepath.Join(childDir, "SKILL.md"), []byte("---\nname: child\ndescription: Child\n---\nChild body."), 0o644); err != nil {
t.Fatal(err)
}

source := fsskills.NewSource(os.DirFS(root))
loaded, err := source.Skills(t.Context())
if err != nil {
t.Fatal(err)
}
if len(loaded) != 1 {
t.Fatalf("expected 1 skill, got %d", len(loaded))
}
if loaded[0].Frontmatter.Name != "parent-skill" {
t.Fatalf("expected parent-skill, got %q", loaded[0].Frontmatter.Name)
}
}

func TestFileSource_SkillBeyondMaxDepth_NotDiscovered(t *testing.T) {
root := t.TempDir()
createSkillDir(t, filepath.Join(root, "l1", "l2", "l3"), "deep-skill", "Too deep", "Body.")
Expand Down
Loading