From 994ec72d917ff3cf7c3d2a4df39b8b2a66626849 Mon Sep 17 00:00:00 2001
From: harshbansal7 <harshbansal1036@gmail.com>
Date: Wed, 18 Feb 2026 16:55:20 +0530
Subject: [PATCH] Fix parsing of SKILL.md file frontmatter - regex

---
 pkg/skills/loader.go | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkg/skills/loader.go b/pkg/skills/loader.go
index 0c63ae067..15e82c31b 100644
--- a/pkg/skills/loader.go
+++ b/pkg/skills/loader.go
@@ -9,6 +9,8 @@ import (
 	"path/filepath"
 	"regexp"
 	"strings"
+
+	"github.com/sipeed/picoclaw/pkg/logger"
 )
 
 var namePattern = regexp.MustCompile(`^[a-zA-Z0-9]+(-[a-zA-Z0-9]+)*$`)
@@ -251,6 +253,11 @@ func (sl *SkillsLoader) BuildSkillsSummary() string {
 func (sl *SkillsLoader) getSkillMetadata(skillPath string) *SkillMetadata {
 	content, err := os.ReadFile(skillPath)
 	if err != nil {
+		logger.WarnCF("skills", "Failed to read skill metadata",
+			map[string]interface{}{
+				"skill_path": skillPath,
+				"error":      err.Error(),
+			})
 		return nil
 	}
 
@@ -306,9 +313,9 @@ func (sl *SkillsLoader) parseSimpleYAML(content string) map[string]string {
 }
 
 func (sl *SkillsLoader) extractFrontmatter(content string) string {
-	// (?s) enables DOTALL mode so . matches newlines
-	// Match first ---, capture everything until next --- on its own line
-	re := regexp.MustCompile(`(?s)^---\n(.*)\n---`)
+	// Support both Unix (\n) and Windows (\r\n) line endings for frontmatter blocks
+	// (?s) enables DOTALL so . matches newlines; ^--- at start, then ... --- at start of line
+	re := regexp.MustCompile(`(?s)^---\r?\n(.*?)\r?\n---`)
 	match := re.FindStringSubmatch(content)
 	if len(match) > 1 {
 		return match[1]