@google/adk 2.3.0 → 2.5.0

package/dist/esm/skills/loader.js

@@ -8,10 +8,12 @@ var __name = (target, value) => __defProp(target, "name", { value, configurable:
  * SPDX-License-Identifier: Apache-2.0
  */
 import AdmZip from "adm-zip";
-import yaml from "js-yaml";
+import * as yaml from "js-yaml";
 import { isUtf8 } from "node:buffer";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { InputValidationError } from "../errors/input_validation_error.js";
+import { NotFoundError } from "../errors/not_found_error.js";
 import { logger } from "../utils/logger.js";
 import {
   FrontmatterSchema
@@ -65,7 +67,7 @@ async function loadDir(directoryPath) {
         }
         await walk(fullPath);
       } else if (entry.isFile()) {
-        const relativePath = path.relative(directoryPath, fullPath);
+        const relativePath = path.relative(directoryPath, fullPath).split(path.sep).join("/");
         if (IGNORED_EXTENSIONS.has(path.extname(entry.name))) {
           continue;
         }
@@ -88,32 +90,55 @@ async function loadDir(directoryPath) {
   return files;
 }
 __name(loadDir, "loadDir");
+const FRONTMATTER_BOM = "\uFEFF";
+const FRONTMATTER_PATTERN = /^---[ \t]*\r?\n(?:([\s\S]*?)\r?\n)??---[ \t]*(?:\r?\n|$)/;
 function parseFrontmatterYaml(content) {
-  if (!content.startsWith("---")) {
-    throw new Error("SKILL.md must start with YAML frontmatter (---)");
+  var _a;
+  const text = content.startsWith(FRONTMATTER_BOM) ? content.slice(FRONTMATTER_BOM.length) : content;
+  if (!/^---[ \t]*(?:\r?\n|$)/.test(text)) {
+    throw new InputValidationError(
+      "SKILL.md must start with YAML frontmatter (---)"
+    );
   }
-  const parts = content.split("---");
-  if (parts.length < 3) {
-    throw new Error("SKILL.md frontmatter not properly closed with ---");
+  const match = FRONTMATTER_PATTERN.exec(text);
+  if (!match) {
+    throw new InputValidationError(
+      "SKILL.md frontmatter not properly closed with ---"
+    );
   }
-  const frontmatterStr = parts[1];
-  const body = parts.filter((_, i) => i >= 2).join("---").trim();
-  try {
-    const parsed = yaml.load(frontmatterStr);
-    if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
-      throw new Error("SKILL.md frontmatter must be a YAML mapping");
+  const frontmatterStr = (_a = match[1]) != null ? _a : "";
+  const body = text.slice(match[0].length).trim();
+  const hasYamlContent = frontmatterStr.split(/\r?\n/).some((line) => {
+    const trimmed = line.trim();
+    return trimmed.length > 0 && !trimmed.startsWith("#");
+  });
+  let parsed = null;
+  if (hasYamlContent) {
+    try {
+      parsed = yaml.load(frontmatterStr);
+    } catch (e) {
+      throw new InputValidationError(
+        `Invalid YAML in frontmatter: ${e.message}`,
+        { cause: e }
+      );
     }
-    return { raw: parsed, body };
-  } catch (e) {
-    throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
   }
+  if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+    throw new InputValidationError(
+      "Invalid YAML in frontmatter: SKILL.md frontmatter must be a YAML mapping"
+    );
+  }
+  return { raw: parsed, body };
 }
 __name(parseFrontmatterYaml, "parseFrontmatterYaml");
 function validateFrontmatter(raw) {
   try {
     return FrontmatterSchema.parse(raw);
   } catch (e) {
-    throw new Error(`Invalid YAML in frontmatter: ${e.message}`);
+    throw new InputValidationError(
+      `Invalid YAML in frontmatter: ${e.message}`,
+      { cause: e }
+    );
   }
 }
 __name(validateFrontmatter, "validateFrontmatter");
@@ -160,28 +185,34 @@ __name(loadSkillFromDir, "loadSkillFromDir");
 async function validateSkillDir(skillDir) {
   const problems = [];
   const resolvedDir = path.resolve(skillDir);
+  try {
+    const stats = await fs.stat(resolvedDir);
+    if (!stats.isDirectory()) {
+      return [`'${resolvedDir}' is not a directory.`];
+    }
+  } catch (e) {
+    const code = e.code;
+    if (code === "ENOENT" || code === "ENOTDIR") {
+      return [`Directory '${resolvedDir}' does not exist.`];
+    }
+    return [`Failed to access '${resolvedDir}': ${e.message}`];
+  }
   let skill;
   try {
     skill = await loadSkillFile(resolvedDir);
   } catch (e) {
     return [e.message];
   }
-  try {
-    const keys = Object.keys(skill.frontmatter);
-    const unknown = keys.filter((k) => !ALLOWED_FRONTMATTER_KEYS.has(k));
-    if (unknown.length > 0) {
-      problems.push(
-        `Unknown frontmatter fields: [${unknown.sort().join(", ")}]`
-      );
-    }
-    const dirName = path.basename(resolvedDir);
-    if (dirName !== skill.frontmatter.name) {
-      problems.push(
-        `Skill name '${skill.frontmatter.name}' does not match directory name '${dirName}'.`
-      );
-    }
-  } catch (e) {
-    problems.push(e.message);
+  const keys = Object.keys(skill.frontmatter);
+  const unknown = keys.filter((k) => !ALLOWED_FRONTMATTER_KEYS.has(k));
+  if (unknown.length > 0) {
+    problems.push(`Unknown frontmatter fields: [${unknown.sort().join(", ")}]`);
+  }
+  const dirName = path.basename(resolvedDir);
+  if (dirName !== skill.frontmatter.name) {
+    problems.push(
+      `Skill name '${skill.frontmatter.name}' does not match directory name '${dirName}'.`
+    );
   }
   return problems;
 }
@@ -209,7 +240,7 @@ async function loadSkillFile(skillDir) {
     );
   }
   if (!skillMdPath) {
-    throw new Error(
+    throw new NotFoundError(
       `SKILL.md (or any case variation like skill.md) not found in '${skillDir}'.`
     );
   }
@@ -217,7 +248,7 @@ async function loadSkillFile(skillDir) {
   const frontmatter = FrontmatterSchema.parse(parsed);
   const dirName = path.basename(resolvedDir);
   if (dirName !== frontmatter.name) {
-    throw new Error(
+    throw new InputValidationError(
       `Skill name '${frontmatter.name}' does not match directory name '${dirName}'.`
     );
   }
@@ -279,10 +310,12 @@ function loadSkillFromZipBuffer(zipBuffer) {
   const entries = zip.getEntries();
   for (const entry of entries) {
     if (isDangerousZipEntryName(entry.entryName)) {
-      throw new Error(`Dangerous zip entry ignored: ${entry.entryName}`);
+      throw new InputValidationError(
+        `Dangerous zip entry ignored: ${entry.entryName}`
+      );
     }
   }
-  let skillMdContent = "";
+  let skillMdContent;
   for (const entry of entries) {
     if (entry.isDirectory) continue;
     if (entry.entryName.toLowerCase() === "skill.md") {
@@ -290,16 +323,18 @@ function loadSkillFromZipBuffer(zipBuffer) {
       break;
     }
   }
-  if (!skillMdContent) {
-    throw new Error("SKILL.md not found in zipped filesystem.");
+  if (skillMdContent === void 0) {
+    throw new NotFoundError("SKILL.md not found in zipped filesystem.");
   }
   const { raw, body } = parseFrontmatterYaml(skillMdContent);
   const skillName = raw["name"];
   if (!skillName) {
-    throw new Error("SKILL.md frontmatter must contain 'name'");
+    throw new InputValidationError("SKILL.md frontmatter must contain 'name'");
   }
   if (typeof skillName !== "string" || !isBareSkillName(skillName)) {
-    throw new Error(`Invalid skill name in SKILL.md: ${String(skillName)}`);
+    throw new InputValidationError(
+      `Invalid skill name in SKILL.md: ${String(skillName)}`
+    );
   }
   const frontmatter = validateFrontmatter(raw);
   const references = {};