chore: refactor agent to skill-first; structured skills dirs; enhance ReAct and tool logs

internal/knowledge/loader.go

@@ -8,6 +8,12 @@ import (
 	"strings"
 )
 
+type Skill struct {
+	Name    string
+	Content string
+	Source  string
+}
+
 func LoadSoul(path string) (string, error) {
 	b, err := os.ReadFile(path)
 	if err != nil {
@@ -21,37 +27,17 @@ func LoadSoul(path string) (string, error) {
 }
 
 func LoadSkills(dir string) (string, error) {
-	entries, err := os.ReadDir(dir)
+	skills, err := LoadSkillSet(dir)
 	if err != nil {
-		return "", fmt.Errorf("read skills dir failed: %w", err)
+		return "", err
 	}
 
-	files := make([]string, 0)
-	for _, entry := range entries {
-		if entry.IsDir() {
-			continue
-		}
-		name := entry.Name()
-		if strings.HasSuffix(strings.ToLower(name), ".md") {
-			files = append(files, filepath.Join(dir, name))
-		}
-	}
-	sort.Strings(files)
-
 	builder := strings.Builder{}
-	for _, file := range files {
-		b, err := os.ReadFile(file)
-		if err != nil {
-			return "", fmt.Errorf("read skill file failed: %w", err)
-		}
-		content := strings.TrimSpace(string(b))
-		if content == "" {
-			continue
-		}
+	for _, skill := range skills {
 		builder.WriteString("## ")
-		builder.WriteString(filepath.Base(file))
+		builder.WriteString(skill.Name)
 		builder.WriteString("\n")
-		builder.WriteString(content)
+		builder.WriteString(skill.Content)
 		builder.WriteString("\n\n")
 	}
 
@@ -61,3 +47,66 @@ func LoadSkills(dir string) (string, error) {
 	}
 	return out, nil
 }
+
+func LoadSkillSet(dir string) ([]Skill, error) {
+	entries, err := os.ReadDir(dir)
+	if err != nil {
+		return nil, fmt.Errorf("read skills dir failed: %w", err)
+	}
+
+	skillDirs := make([]string, 0)
+	for _, entry := range entries {
+		if entry.IsDir() {
+			skillDirs = append(skillDirs, entry.Name())
+		}
+	}
+	sort.Strings(skillDirs)
+
+	out := make([]Skill, 0, len(skillDirs))
+	for _, skillDir := range skillDirs {
+		file := filepath.Join(dir, skillDir, "skill.md")
+		b, err := os.ReadFile(file)
+		if err != nil {
+			if os.IsNotExist(err) {
+				continue
+			}
+			return nil, fmt.Errorf("read skill file failed: %w", err)
+		}
+		content := strings.TrimSpace(string(b))
+		if content == "" {
+			continue
+		}
+
+		name := extractSkillName(skillDir, content)
+		out = append(out, Skill{
+			Name:    name,
+			Content: content,
+			Source:  file,
+		})
+	}
+
+	if len(out) == 0 {
+		return nil, fmt.Errorf("no valid skills loaded from %s (expected: skills/<skill_name>/skill.md)", dir)
+	}
+	return out, nil
+}
+
+func extractSkillName(fileName, markdown string) string {
+	for _, line := range strings.Split(markdown, "\n") {
+		line = strings.TrimSpace(line)
+		if !strings.HasPrefix(line, "#") {
+			continue
+		}
+		title := strings.TrimSpace(strings.TrimLeft(line, "#"))
+		title = strings.TrimSpace(strings.TrimPrefix(title, "Skill:"))
+		title = strings.TrimSpace(strings.TrimPrefix(title, "skill:"))
+		if title != "" {
+			return title
+		}
+	}
+	base := strings.TrimSuffix(fileName, filepath.Ext(fileName))
+	if base == "" {
+		return fileName
+	}
+	return base
+}