opencode/picoclaw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf: refactoring collecting skills

Browse source
This commit is contained in:
Yasuhiro Matsumoto 2026-02-20 16:07:05 +09:00
parent ae74fa3812
commit 81bc49226c
No known key found for this signature in database
GPG key ID: F2EA90DF2C146D1E
1 changed files with 39 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

140
pkg/skills/loader.go
View file

@ -71,112 +71,50 @@ func NewSkillsLoader(workspace string, globalSkills string, builtinSkills string
func (sl *SkillsLoader) ListSkills() []SkillInfo { func (sl *SkillsLoader) ListSkills() []SkillInfo {
skills := make([]SkillInfo, 0) skills := make([]SkillInfo, 0)
seen := make(map[string]bool)
if sl.workspaceSkills != "" { addSkills := func(dir, source string) {
if dirs, err := os.ReadDir(sl.workspaceSkills); err == nil { if dir == "" {
for _, dir := range dirs { return
if dir.IsDir() { }
skillFile := filepath.Join(sl.workspaceSkills, dir.Name(), "SKILL.md") dirs, err := os.ReadDir(dir)
if _, err := os.Stat(skillFile); err == nil { if err != nil {
info := SkillInfo{ return
Name: dir.Name(), }
Path: skillFile, for _, d := range dirs {
Source: "workspace", if !d.IsDir() {
} continue
metadata := sl.getSkillMetadata(skillFile)
if metadata != nil {
info.Description = metadata.Description
info.Name = metadata.Name
}
if err := info.validate(); err != nil {
slog.Warn("invalid skill from workspace", "name", info.Name, "error", err)
continue
}
skills = append(skills, info)
}
}
} }
if seen[d.Name()] {
continue
}
skillFile := filepath.Join(dir, d.Name(), "SKILL.md")
if _, err := os.Stat(skillFile); err != nil {
continue
}
info := SkillInfo{
Name: d.Name(),
Path: skillFile,
Source: source,
}
metadata := sl.getSkillMetadata(skillFile)
if metadata != nil {
info.Description = metadata.Description
info.Name = metadata.Name
}
if err := info.validate(); err != nil {
slog.Warn("invalid skill from "+source, "name", info.Name, "error", err)
continue
}
seen[d.Name()] = true
skills = append(skills, info)
} }
} }
// 全局 skills (~/.picoclaw/skills) - 被 workspace skills 覆盖 // Priority: workspace > global > builtin
if sl.globalSkills != "" { addSkills(sl.workspaceSkills, "workspace")
if dirs, err := os.ReadDir(sl.globalSkills); err == nil { addSkills(sl.globalSkills, "global")
for _, dir := range dirs { addSkills(sl.builtinSkills, "builtin")
if dir.IsDir() {
skillFile := filepath.Join(sl.globalSkills, dir.Name(), "SKILL.md")
if _, err := os.Stat(skillFile); err == nil {
// 检查是否已被 workspace skills 覆盖
exists := false
for _, s := range skills {
if s.Name == dir.Name() && s.Source == "workspace" {
exists = true
break
}
}
if exists {
continue
}
info := SkillInfo{
Name: dir.Name(),
Path: skillFile,
Source: "global",
}
metadata := sl.getSkillMetadata(skillFile)
if metadata != nil {
info.Description = metadata.Description
info.Name = metadata.Name
}
if err := info.validate(); err != nil {
slog.Warn("invalid skill from global", "name", info.Name, "error", err)
continue
}
skills = append(skills, info)
}
}
}
}
}
if sl.builtinSkills != "" {
if dirs, err := os.ReadDir(sl.builtinSkills); err == nil {
for _, dir := range dirs {
if dir.IsDir() {
skillFile := filepath.Join(sl.builtinSkills, dir.Name(), "SKILL.md")
if _, err := os.Stat(skillFile); err == nil {
// 检查是否已被 workspace 或 global skills 覆盖
exists := false
for _, s := range skills {
if s.Name == dir.Name() && (s.Source == "workspace" || s.Source == "global") {
exists = true
break
}
}
if exists {
continue
}
info := SkillInfo{
Name: dir.Name(),
Path: skillFile,
Source: "builtin",
}
metadata := sl.getSkillMetadata(skillFile)
if metadata != nil {
info.Description = metadata.Description
info.Name = metadata.Name
}
if err := info.validate(); err != nil {
slog.Warn("invalid skill from builtin", "name", info.Name, "error", err)
continue
}
skills = append(skills, info)
}
}
}
}
}
return skills return skills
} }