mirror of
https://gitcode.com/JianFeeeee/HomeAgent.git
synced 2026-09-21 09:28:14 +00:00
新增 internal/plugins/skillmgr(native skill 全生命周期 owner): - skill_list/info/load/unload/enable/disable/create/export/install - skill_create 两步式:先生成骨架模板,LLM 补全后传 content 覆盖写入 (plugin.ValidateSKILLContent 校验)并自动加载生效 - .skm 分发包(tar.gz):packSkill/unpackSkill 含 TarSlip 防护 (拒绝绝对路径/../逃逸、强制单根目录、校验包内 SKILL.md) - skills 目录扫描:纯 SKILL.md/skill.json 条目归本插件; sidecar(main.js/main.py)/OC plugin(openclaw.plugin.json) 留给兼容层 clawhubadapter 职责分离(OpenClaw 兼容层不再持有 native skill): - 删除 p.skills 字段与 default 分支 LoadSKILL 逻辑 - 发现纯 SKILL 条目改为发布 events.EventSkillDetected 移交事件, 由 skillmgr 订阅注册;启动时序 c<s 下全扫兜底,事件用于热新增 - claw_list/plugin_info 不再输出 SKILL 段,统一走 skill_list 方案B prompt 注入: - agentCore 新增 SkillIndexProvider 接口 + SetSkillIndexProvider - buildSystemPrompt 注入【可用技能】轻量索引(名称+版本+描述), LLM 匹配场景时主动 skill_info 拉全文按文档执行 - main.go 在插件加载后将 skillmgr 实例接线到 agent 内核小修: - extractDescription 跳过 YAML frontmatter 块(此前所有带 frontmatter 的 SKILL.md 描述都被误判为 '---') - extractField 剥离 YAML 成对引号(version: "1.0" 不再带尾引号) - plugin.ValidateSKILLContent 导出供生成侧校验
269 lines
7.3 KiB
Go
269 lines
7.3 KiB
Go
// Package skillmgr 实现原生 SKILL 插件管理器。
|
||
//
|
||
// 职责边界:
|
||
// - 本插件是 native skill(SKILL.md / skill.json 指令文档型插件)的唯一归属者,
|
||
// 负责其全生命周期:加载、卸载、启停、生成(模板)、导出(.skm 包)、安装。
|
||
// - clawhubadapter(OpenClaw 兼容层)扫描 skills 目录时发现纯 SKILL 条目后
|
||
// 发布 skill_detected 事件移交本插件注册;sidecar/OC plugin 不归本插件管。
|
||
//
|
||
// skill 的运行模型:SKILL.md 是给 LLM 的指令文档,agent 通过 skill_info 读取全文后
|
||
// 用 cmd_run 等工具按文档执行;skill 不注册可调用 handler 工具。
|
||
package skillmgr
|
||
|
||
import (
|
||
"encoding/json"
|
||
"fmt"
|
||
"log"
|
||
"os"
|
||
"path/filepath"
|
||
"sort"
|
||
"strings"
|
||
"sync"
|
||
|
||
"gitcode.com/JianFeeeee/HomeAgent/internal/events"
|
||
"gitcode.com/JianFeeeee/HomeAgent/internal/plugin"
|
||
"gitcode.com/JianFeeeee/HomeAgent/internal/sdk"
|
||
)
|
||
|
||
const (
|
||
// SkillFileName 标准 skill 主文件名
|
||
SkillFileName = "SKILL.md"
|
||
// MetaFileName 可选元数据文件(覆盖 SKILL.md frontmatter 字段)
|
||
MetaFileName = "skill.json"
|
||
// PackExt 导出包扩展名
|
||
PackExt = ".skm"
|
||
// detectEvent 兼容层移交事件类型
|
||
detectEvent = events.EventSkillDetected
|
||
)
|
||
|
||
func init() {
|
||
plugin.RegisterPluginMeta("skillmgr", "技能管理器", "Skill Manager")
|
||
plugin.RegisterFactory("skillmgr", func(name string, cfg map[string]interface{}) (sdk.Plugin, error) {
|
||
dir := ""
|
||
if dataDir, ok := cfg["data_dir"].(string); ok && dataDir != "" {
|
||
dir = filepath.Join(dataDir, "skills")
|
||
}
|
||
return New(name, dir), nil
|
||
})
|
||
}
|
||
|
||
// SkillEntry 一个已加载的 native skill 及其实时状态。
|
||
type SkillEntry struct {
|
||
sk *plugin.SKILLPlugin
|
||
path string
|
||
enabled bool
|
||
}
|
||
|
||
type Plugin struct {
|
||
name string
|
||
skillsDir string
|
||
|
||
mu sync.RWMutex
|
||
skills map[string]*SkillEntry // name -> entry
|
||
sdk *sdk.PluginSDK
|
||
|
||
unsub func() // skill_detected 订阅注销
|
||
}
|
||
|
||
func New(name, skillsDir string) *Plugin {
|
||
return &Plugin{
|
||
name: name,
|
||
skillsDir: skillsDir,
|
||
skills: map[string]*SkillEntry{},
|
||
}
|
||
}
|
||
|
||
func (p *Plugin) Name() string { return p.name }
|
||
|
||
func (p *Plugin) Start(s *sdk.PluginSDK) error {
|
||
p.sdk = s
|
||
|
||
// 默认目录:内核 data_dir 下 skills 目录(与配置 core.daemon.data_dir 对齐)
|
||
if p.skillsDir == "" {
|
||
if v, _ := s.Settings().GetCore("daemon.data_dir"); v != nil {
|
||
if dir, ok := v.(string); ok && dir != "" {
|
||
p.skillsDir = filepath.Join(dir, "skills")
|
||
}
|
||
}
|
||
}
|
||
if err := os.MkdirAll(p.skillsDir, 0755); err != nil {
|
||
return fmt.Errorf("mkdir skills dir: %w", err)
|
||
}
|
||
|
||
// 订阅兼容层移交事件(clawhubadapter 发现纯 SKILL 后发布)
|
||
p.unsub = s.Subscribe(detectEvent, func(evt *events.Event) {
|
||
path, _ := evt.Payload["path"].(string)
|
||
if path == "" {
|
||
return
|
||
}
|
||
if _, err := p.loadOne(path); err != nil {
|
||
log.Printf("[skillmgr] detected skill %s: %v", path, err)
|
||
return
|
||
}
|
||
log.Printf("[skillmgr] registered via %s event: %s", detectEvent, filepath.Base(path))
|
||
})
|
||
|
||
// 启动全扫:兜底接管所有已存在的纯 SKILL 目录/单文件
|
||
// (时序上 skillmgr(c<s) 先于 clawhubadapter 启动,此处先扫到的条目
|
||
// 后续事件重复到达时 loadOne 幂等跳过)
|
||
n := p.scanExisting()
|
||
p.registerTools()
|
||
log.Printf("[skillmgr] started, dir=%s, loaded %d native skills", p.skillsDir, n)
|
||
return nil
|
||
}
|
||
|
||
func (p *Plugin) Stop() error {
|
||
if p.unsub != nil {
|
||
p.unsub()
|
||
p.unsub = nil
|
||
}
|
||
return nil
|
||
}
|
||
|
||
// scanExisting 扫描 skills 目录加载全部纯 SKILL 条目。返回加载数量。
|
||
func (p *Plugin) scanExisting() int {
|
||
entries, err := os.ReadDir(p.skillsDir)
|
||
if err != nil {
|
||
return 0
|
||
}
|
||
count := 0
|
||
for _, e := range entries {
|
||
if strings.HasPrefix(e.Name(), ".") || e.Name() == "node_modules" {
|
||
continue
|
||
}
|
||
path := filepath.Join(p.skillsDir, e.Name())
|
||
if !isNativeSkillPath(path) {
|
||
continue
|
||
}
|
||
if _, err := p.loadOne(path); err != nil {
|
||
log.Printf("[skillmgr] scan skip %s: %v", e.Name(), err)
|
||
continue
|
||
}
|
||
count++
|
||
}
|
||
return count
|
||
}
|
||
|
||
// isNativeSkillPath 判断路径是否为纯 SKILL 类型(非 sidecar 非 OC plugin)。
|
||
// sidecar: main.js/main.py;OC plugin: openclaw.plugin.json 或带 openclaw 扩展的 package.json。
|
||
func isNativeSkillPath(path string) bool {
|
||
info, err := os.Stat(path)
|
||
if err != nil {
|
||
return false
|
||
}
|
||
if !info.IsDir() {
|
||
return strings.HasSuffix(strings.ToLower(path), ".md")
|
||
}
|
||
// 目录内含 sidecar / OC plugin 标志文件的归兼容层管
|
||
for _, flag := range []string{"main.js", "main.py", "openclaw.plugin.json"} {
|
||
if fileExists(filepath.Join(path, flag)) {
|
||
return false
|
||
}
|
||
}
|
||
if hasOCExtensions(filepath.Join(path, "package.json")) {
|
||
return false
|
||
}
|
||
// 纯 skill:有 SKILL.md 或 skill.json 即认
|
||
return fileExists(filepath.Join(path, SkillFileName)) ||
|
||
fileExists(filepath.Join(path, MetaFileName))
|
||
}
|
||
|
||
// hasOCExtensions 检查 package.json 是否带 openclaw 扩展声明(与 clawhubadapter 同语义)。
|
||
func hasOCExtensions(pkgPath string) bool {
|
||
data, err := os.ReadFile(pkgPath)
|
||
if err != nil {
|
||
return false
|
||
}
|
||
var pkg struct {
|
||
Openclaw json.RawMessage `json:"openclaw"`
|
||
}
|
||
return json.Unmarshal(data, &pkg) == nil && len(pkg.Openclaw) > 0
|
||
}
|
||
|
||
func fileExists(path string) bool {
|
||
info, err := os.Stat(path)
|
||
return err == nil && !info.IsDir()
|
||
}
|
||
|
||
// loadOne 从路径加载单个 skill 并入表(幂等:已存在且未变更则跳过)。
|
||
func (p *Plugin) loadOne(path string) (*SkillEntry, error) {
|
||
sk, err := plugin.LoadSKILL(path)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
name := sk.Name()
|
||
if name == "" || name == "." {
|
||
return nil, fmt.Errorf("skill at %s has empty name", path)
|
||
}
|
||
|
||
p.mu.Lock()
|
||
defer p.mu.Unlock()
|
||
if old, ok := p.skills[name]; ok {
|
||
// 幂等:同路径同内容不重复加载
|
||
if old.path == path {
|
||
return old, nil
|
||
}
|
||
// 重名不同路径:拒绝并提示
|
||
p.mu.Unlock()
|
||
return nil, fmt.Errorf("skill name conflict: %q already loaded from %s", name, old.path)
|
||
}
|
||
entry := &SkillEntry{sk: sk, path: path, enabled: true}
|
||
p.skills[name] = entry
|
||
return entry, nil
|
||
}
|
||
|
||
// removeOne 从表中移除 skill(不动磁盘)。
|
||
func (p *Plugin) removeOne(name string) bool {
|
||
p.mu.Lock()
|
||
defer p.mu.Unlock()
|
||
if _, ok := p.skills[name]; !ok {
|
||
return false
|
||
}
|
||
delete(p.skills, name)
|
||
return true
|
||
}
|
||
|
||
// snapshot 返回排序后的 skill 名列表。
|
||
func (p *Plugin) snapshot() []*SkillEntry {
|
||
p.mu.RLock()
|
||
defer p.mu.RUnlock()
|
||
names := make([]string, 0, len(p.skills))
|
||
for n := range p.skills {
|
||
names = append(names, n)
|
||
}
|
||
sort.Strings(names)
|
||
out := make([]*SkillEntry, 0, len(names))
|
||
for _, n := range names {
|
||
out = append(out, p.skills[n])
|
||
}
|
||
return out
|
||
}
|
||
|
||
func (p *Plugin) get(name string) (*SkillEntry, bool) {
|
||
p.mu.RLock()
|
||
defer p.mu.RUnlock()
|
||
e, ok := p.skills[name]
|
||
return e, ok
|
||
}
|
||
|
||
// SkillIndex 实现 agentCore.SkillIndexProvider:返回已启用技能的精炼索引。
|
||
// 每次 LLM 调用都会执行,必须轻量(只读锁 + 字符串拼接,无 IO)。
|
||
func (p *Plugin) SkillIndex() string {
|
||
entries := p.snapshot()
|
||
var b strings.Builder
|
||
for _, e := range entries {
|
||
if !e.enabled {
|
||
continue
|
||
}
|
||
desc := e.sk.Description()
|
||
if desc == "" || desc == "---" {
|
||
desc = "(无描述)"
|
||
}
|
||
if len(desc) > 80 {
|
||
desc = desc[:80] + "..."
|
||
}
|
||
fmt.Fprintf(&b, "%s v%s - %s\n", e.sk.Name(), e.sk.Version(), desc)
|
||
}
|
||
return strings.TrimRight(b.String(), "\n")
|
||
}
|