From abdad25df3898aa63a3fa7133fcf1840314dede7 Mon Sep 17 00:00:00 2001
From: dongmucat <1127093059@qq.com>
Date: Mon, 15 Jun 2026 14:45:09 +0800
Subject: [PATCH] feat(bootstrap): add agentguard builtin skill

Signed-off-by: dongmucat <1127093059@qq.com>
---
 .../resources/builtin-skills/manifest.json    |  5 +++
 .../skill/metadata/SkillMetadataParser.java   | 12 ++++++
 .../metadata/SkillMetadataParserTest.java     | 40 +++++++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/server/skillhub-app/src/main/resources/builtin-skills/manifest.json b/server/skillhub-app/src/main/resources/builtin-skills/manifest.json
index 8dba7bac..a9fc8cac 100644
--- a/server/skillhub-app/src/main/resources/builtin-skills/manifest.json
+++ b/server/skillhub-app/src/main/resources/builtin-skills/manifest.json
@@ -4,6 +4,11 @@
       "slug": "skillhub-hello",
       "version": "1.0.0",
       "url": "https://bjcdn.openstorage.cn/aicontest/2026-06-11/f8a59af3-30d4-4031-80f6-ebff74b05195.zip"
+    },
+    {
+      "slug": "agentguard",
+      "version": "1.1",
+      "url": "https://bjcdn.openstorage.cn/aicontest/2026-06-12/9d063bc7-223a-4762-adeb-305c268aa29e.zip"
     }
   ]
 }
diff --git a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java
index 36fc1ffc..c44a4516 100644
--- a/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java
+++ b/server/skillhub-domain/src/main/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParser.java
@@ -50,6 +50,9 @@ public class SkillMetadataParser {
         String name = extractRequiredField(frontmatter, "name");
         String description = extractRequiredField(frontmatter, "description");
         String version = extractOptionalField(frontmatter, "version");
+        if (version == null) {
+            version = extractNestedOptionalField(frontmatter, "metadata", "version");
+        }
 
         return new SkillMetadata(name, description, version, body, frontmatter);
     }
@@ -122,4 +125,13 @@ public class SkillMetadataParser {
         Object value = frontmatter.get(fieldName);
         return value == null ? null : value.toString();
     }
+
+    private String extractNestedOptionalField(Map<String, Object> frontmatter, String objectFieldName, String fieldName) {
+        Object nestedValue = frontmatter.get(objectFieldName);
+        if (!(nestedValue instanceof Map<?, ?> nestedMap)) {
+            return null;
+        }
+        Object value = nestedMap.get(fieldName);
+        return value == null ? null : value.toString();
+    }
 }
diff --git a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java
index 15969023..aececcd2 100644
--- a/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java
+++ b/server/skillhub-domain/src/test/java/com/iflytek/skillhub/domain/skill/metadata/SkillMetadataParserTest.java
@@ -123,6 +123,46 @@ class SkillMetadataParserTest {
         assertNull(metadata.version());
     }
 
+    @Test
+    void testUsesMetadataVersionWhenTopLevelVersionIsMissing() {
+        String content = """
+            ---
+            name: agentguard
+            description: Agent security guard
+            metadata:
+              author: GoPlusSecurity
+              version: "1.1"
+            ---
+            Body
+            """;
+
+        SkillMetadata metadata = parser.parse(content);
+
+        assertEquals("agentguard", metadata.name());
+        assertEquals("Agent security guard", metadata.description());
+        assertEquals("1.1", metadata.version());
+    }
+
+    @Test
+    void testTopLevelVersionTakesPrecedenceOverMetadataVersion() {
+        String content = """
+            ---
+            name: versioned-skill
+            description: Prefer top-level version
+            version: 2.0.0
+            metadata:
+              version: "1.1"
+            ---
+            Body
+            """;
+
+        SkillMetadata metadata = parser.parse(content);
+
+        assertEquals("versioned-skill", metadata.name());
+        assertEquals("Prefer top-level version", metadata.description());
+        assertEquals("2.0.0", metadata.version());
+    }
+
     @Test
     void testFallsBackToLooseFrontmatterParsingWhenYamlSyntaxIsNotStrict() {
         String content = """