nexrall-code 0.5.94 → 0.5.95

package/dist/index.js

@@ -11654,17 +11654,86 @@ var require_frontmatter = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.parseFrontmatter = parseFrontmatter;
+    var TOP_LEVEL_KEY = /^([A-Za-z0-9_-]+)\s*:\s*(.*)$/;
+    var BLOCK_SCALAR = /^[|>][+-]?$/;
+    function leadingIndent(line) {
+      const m2 = /^[ \t]*/.exec(line);
+      return m2 ? m2[0].length : 0;
+    }
+    function unquote(v) {
+      return v.trim().replace(/^["']|["']$/g, "");
+    }
     function parseFrontmatter(raw) {
       const m2 = /^\s*---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/.exec(raw);
       if (!m2)
-        return { meta: {}, body: raw.trim() };
+        return { meta: {}, body: raw.trim(), ok: false };
+      const lines = m2[1].split(/\r?\n/);
       const meta = {};
-      for (const line of m2[1].split(/\r?\n/)) {
-        const kv = /^([A-Za-z0-9_-]+)\s*:\s*(.*)$/.exec(line.trim());
-        if (kv)
-          meta[kv[1].toLowerCase()] = kv[2].trim().replace(/^["']|["']$/g, "");
+      let nested;
+      let i2 = 0;
+      while (i2 < lines.length) {
+        const line = lines[i2];
+        if (!line.trim() || leadingIndent(line) > 0) {
+          i2++;
+          continue;
+        }
+        const kv = TOP_LEVEL_KEY.exec(line.trim());
+        if (!kv) {
+          i2++;
+          continue;
+        }
+        const key = kv[1].toLowerCase();
+        const value = kv[2].trim();
+        const continuation = [];
+        let j = i2 + 1;
+        while (j < lines.length && (leadingIndent(lines[j]) > 0 || !lines[j].trim())) {
+          continuation.push(lines[j]);
+          j++;
+        }
+        while (continuation.length && !continuation[continuation.length - 1].trim())
+          continuation.pop();
+        if (BLOCK_SCALAR.test(value)) {
+          const folded = value.startsWith(">");
+          const base = continuation.length ? leadingIndent(continuation.find((l2) => l2.trim()) ?? continuation[0]) : 0;
+          const dedented = continuation.map((l2) => l2.trim() ? l2.slice(Math.min(base, leadingIndent(l2))) : "");
+          meta[key] = folded ? dedented.join(" ").replace(/\s+/g, " ").trim() : dedented.join("\n").trim();
+        } else if (value === "") {
+          const looksNested = continuation.length > 0 && continuation.every((l2) => !l2.trim() || TOP_LEVEL_KEY.test(l2.trim()));
+          if (looksNested && continuation.some((l2) => l2.trim())) {
+            const map = {};
+            for (const l2 of continuation) {
+              const sub = TOP_LEVEL_KEY.exec(l2.trim());
+              if (sub)
+                map[sub[1].toLowerCase()] = unquote(sub[2]);
+            }
+            nested = nested ?? {};
+            nested[key] = map;
+          } else if (continuation.length) {
+            meta[key] = [value, ...continuation.map((l2) => l2.trim())].filter(Boolean).join(" ").trim();
+          } else {
+            meta[key] = "";
+          }
+        } else {
+          const looksNested = continuation.length > 0 && continuation.every((l2) => !l2.trim() || TOP_LEVEL_KEY.test(l2.trim()));
+          if (continuation.length && !looksNested) {
+            meta[key] = unquote([value, ...continuation.map((l2) => l2.trim())].join(" "));
+          } else if (continuation.length && looksNested) {
+            meta[key] = unquote(value);
+            const map = {};
+            for (const l2 of continuation) {
+              const sub = TOP_LEVEL_KEY.exec(l2.trim());
+              if (sub)
+                map[sub[1].toLowerCase()] = unquote(sub[2]);
+            }
+            nested = nested ?? {};
+            nested[key] = map;
+          } else {
+            meta[key] = unquote(value);
+          }
+        }
+        i2 = j;
       }
-      return { meta, body: (m2[2] ?? "").trim() };
+      return { meta, body: (m2[2] ?? "").trim(), nested, ok: true };
     }
   }
 });
@@ -11898,6 +11967,7 @@ var require_skills = __commonJS({
       };
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.loadSkillsWithWarnings = loadSkillsWithWarnings;
     exports2.loadSkills = loadSkills2;
     exports2.findSkill = findSkill2;
     exports2.autoInvokableSkills = autoInvokableSkills;
@@ -11910,6 +11980,19 @@ var require_skills = __commonJS({
     var index_1 = require_plugins();
     var loader_1 = require_loader();
     var frontmatter_1 = require_frontmatter();
+    var KNOWN_META_KEYS = /* @__PURE__ */ new Set([
+      "name",
+      "description",
+      "model",
+      "mode",
+      "disable-model-invocation",
+      "user-invocable",
+      "license",
+      "compatibility",
+      "metadata",
+      "allowed-tools"
+    ]);
+    var SPEC_NAME_RE = /^[a-z0-9]+(-[a-z0-9]+)*$/;
     function parseBool(v, fallback) {
       if (v === void 0)
         return fallback;
@@ -11920,7 +12003,13 @@ var require_skills = __commonJS({
         return false;
       return fallback;
     }
-    function toSkill(meta, body, name, source2, dir) {
+    function parseSpaceList(v) {
+      if (!v)
+        return void 0;
+      const items = v.split(/[,\s]+/).map((t2) => t2.trim()).filter(Boolean);
+      return items.length ? items : void 0;
+    }
+    function toSkill(meta, body, name, source2, dir, nested) {
       const model = ["turbo", "pro", "ultra"].find((x2) => x2 === (meta.model ?? "").toLowerCase());
       return {
         name,
@@ -11931,10 +12020,38 @@ var require_skills = __commonJS({
         source: source2,
         dir,
         disableModelInvocation: parseBool(meta["disable-model-invocation"], false),
-        userInvocable: parseBool(meta["user-invocable"], true)
+        userInvocable: parseBool(meta["user-invocable"], true),
+        license: meta.license || void 0,
+        compatibility: meta.compatibility || void 0,
+        metadata: nested?.metadata,
+        allowedTools: parseSpaceList(meta["allowed-tools"])
       };
     }
-    function loadFlatCommandDir(dir, source2, into) {
+    function validateSkillMeta(meta, rawName, effectiveName, dirName, file, warnings) {
+      if (!warnings)
+        return;
+      if (!SPEC_NAME_RE.test(rawName)) {
+        warnings.push({
+          file,
+          name: effectiveName,
+          message: `name "${rawName}" does not match the agentskills.io convention (lowercase letters, numbers, and single hyphens only) \u2014 loaded anyway, but other clients reading this skill may warn or reject it.`
+        });
+      } else if (rawName.length > 64) {
+        warnings.push({ file, name: effectiveName, message: `name is ${rawName.length} characters \u2014 the spec caps this at 64. Loaded anyway.` });
+      }
+      if (dirName !== void 0 && meta.name && meta.name.trim().toLowerCase() !== dirName.toLowerCase()) {
+        warnings.push({
+          file,
+          name: effectiveName,
+          message: `frontmatter name "${meta.name}" does not match its directory name "${dirName}" \u2014 the spec requires them to match for cross-client compatibility. Loaded anyway, using the frontmatter name.`
+        });
+      }
+      const strayKeys = Object.keys(meta).filter((k) => !KNOWN_META_KEYS.has(k));
+      if (strayKeys.length) {
+        warnings.push({ file, name: effectiveName, message: `has unrecognised frontmatter key(s): ${strayKeys.join(", ")} \u2014 these are ignored.` });
+      }
+    }
+    function loadFlatCommandDir(dir, source2, into, warnings) {
       let files;
       try {
         files = fs9.readdirSync(dir).filter((f3) => f3.endsWith(".md"));
@@ -11942,20 +12059,24 @@ var require_skills = __commonJS({
         return;
       }
       for (const file of files) {
+        const full = path7.join(dir, file);
         try {
-          const raw = fs9.readFileSync(path7.join(dir, file), "utf-8");
+          const raw = fs9.readFileSync(full, "utf-8");
           const { meta, body } = (0, frontmatter_1.parseFrontmatter)(raw);
-          const name = (meta.name || path7.basename(file, ".md")).trim().toLowerCase();
+          const rawName = (meta.name || path7.basename(file, ".md")).trim();
+          const name = rawName.toLowerCase();
           if (!name)
             continue;
           if (source2 !== "project" && into.has(name))
             continue;
+          validateSkillMeta(meta, rawName, name, void 0, full, warnings);
           into.set(name, toSkill(meta, body, name, source2));
-        } catch {
+        } catch (err) {
+          warnings?.push({ file: full, name: path7.basename(file, ".md"), message: `could not be read or parsed (${err.message}) \u2014 skipped.` });
         }
       }
     }
-    function loadSkillDir(root, source2, into) {
+    function loadSkillDir(root, source2, into, warnings) {
       let entries;
       try {
         entries = fs9.readdirSync(root, { withFileTypes: true });
@@ -11975,14 +12096,17 @@ var require_skills = __commonJS({
         }
         try {
           const raw = fs9.readFileSync(skillFile, "utf-8");
-          const { meta, body } = (0, frontmatter_1.parseFrontmatter)(raw);
-          const name = (meta.name || entry.name).trim().toLowerCase();
+          const { meta, body, nested } = (0, frontmatter_1.parseFrontmatter)(raw);
+          const rawName = (meta.name || entry.name).trim();
+          const name = rawName.toLowerCase();
           if (!name)
             continue;
           if (source2 !== "project" && into.has(name))
             continue;
-          into.set(name, toSkill(meta, body, name, source2, skillDir));
-        } catch {
+          validateSkillMeta(meta, rawName, name, entry.name, skillFile, warnings);
+          into.set(name, toSkill(meta, body, name, source2, skillDir, nested));
+        } catch (err) {
+          warnings?.push({ file: skillFile, name: entry.name, message: `could not be read or parsed (${err.message}) \u2014 skipped.` });
         }
       }
     }
@@ -12022,21 +12146,27 @@ var require_skills = __commonJS({
         ].join("\n")
       }
     ];
-    function loadSkills2(workDir) {
+    function loadSkillsWithWarnings(workDir) {
       const out = /* @__PURE__ */ new Map();
-      loadFlatCommandDir(path7.join(workDir, ".nexrall", "commands"), "project", out);
-      loadSkillDir(path7.join(workDir, ".nexrall", "skills"), "project", out);
-      loadFlatCommandDir(path7.join(os6.homedir(), ".nexrall", "commands"), "global", out);
-      loadSkillDir(path7.join(os6.homedir(), ".nexrall", "skills"), "global", out);
+      const warnings = [];
+      loadSkillDir(path7.join(workDir, ".agents", "skills"), "project", out, warnings);
+      loadFlatCommandDir(path7.join(workDir, ".nexrall", "commands"), "project", out, warnings);
+      loadSkillDir(path7.join(workDir, ".nexrall", "skills"), "project", out, warnings);
+      loadFlatCommandDir(path7.join(os6.homedir(), ".nexrall", "commands"), "global", out, warnings);
+      loadSkillDir(path7.join(os6.homedir(), ".nexrall", "skills"), "global", out, warnings);
+      loadSkillDir(path7.join(os6.homedir(), ".agents", "skills"), "global", out, warnings);
       for (const dir of (0, index_1.pluginAssetDirs)(workDir, "commands"))
-        loadFlatCommandDir(dir, "plugin", out);
+        loadFlatCommandDir(dir, "plugin", out, warnings);
       for (const dir of (0, index_1.pluginAssetDirs)(workDir, "skills"))
-        loadSkillDir(dir, "plugin", out);
+        loadSkillDir(dir, "plugin", out, warnings);
       for (const skill of BUILTIN_SKILLS) {
         if (!out.has(skill.name))
           out.set(skill.name, skill);
       }
-      return [...out.values()];
+      return { skills: [...out.values()], warnings };
+    }
+    function loadSkills2(workDir) {
+      return loadSkillsWithWarnings(workDir).skills;
     }
     function findSkill2(skills, name) {
       const want = name.replace(/^\//, "").trim().toLowerCase();
@@ -101639,6 +101769,7 @@ var require_agentTypes = __commonJS({
     var path7 = __importStar(__require("path"));
     var os6 = __importStar(__require("os"));
     var index_1 = require_plugins();
+    var frontmatter_1 = require_frontmatter();
     var VALID_MEMORY_SCOPES = ["project", "user", "local"];
     function parseMemoryScope(v) {
       const s2 = (v ?? "").trim().toLowerCase();
@@ -101992,18 +102123,6 @@ var require_agentTypes = __commonJS({
       "ultra",
       "fast"
     ];
-    function parseFrontmatter(raw) {
-      const m2 = /^\s*---\r?\n([\s\S]*?)\r?\n---\r?\n?([\s\S]*)$/.exec(raw);
-      if (!m2)
-        return { meta: {}, body: raw.trim(), ok: false };
-      const meta = {};
-      for (const line of m2[1].split(/\r?\n/)) {
-        const kv = /^([A-Za-z0-9_-]+)\s*:\s*(.*)$/.exec(line.trim());
-        if (kv)
-          meta[kv[1].toLowerCase()] = kv[2].trim().replace(/^["']|["']$/g, "");
-      }
-      return { meta, body: (m2[2] ?? "").trim(), ok: true };
-    }
     function parseModel(v) {
       const raw = (v ?? "").trim();
       if (!raw)
@@ -102044,7 +102163,7 @@ var require_agentTypes = __commonJS({
           warnings.push({ file: full, agent: path7.basename(entry.name, ".md"), message: `could not be read (${err.message}) \u2014 this agent was skipped` });
           continue;
         }
-        const { meta, body, ok } = parseFrontmatter(raw);
+        const { meta, body, ok } = (0, frontmatter_1.parseFrontmatter)(raw);
         const name = (meta.name || path7.basename(entry.name, ".md")).trim();
         if (!name)
           continue;
@@ -106956,6 +107075,9 @@ var require_trust = __commonJS({
       if (exists(".nexrall", "agents")) {
         signals.push(".nexrall/agents/ \u2014 custom sub-agent definitions");
       }
+      if (exists(".agents", "skills")) {
+        signals.push(".agents/skills/ \u2014 cross-client agent playbooks (agentskills.io convention)");
+      }
       return signals;
     }
   }
@@ -143340,6 +143462,9 @@ function detectTrustSignals(dir) {
   if (exists(".nexrall", "agents")) {
     signals.push(".nexrall/agents/ \u2014 custom sub-agent definitions");
   }
+  if (exists(".agents", "skills")) {
+    signals.push(".agents/skills/ \u2014 cross-client agent playbooks (agentskills.io convention)");
+  }
   return signals;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nexrall-code",
-  "version": "0.5.94",
+  "version": "0.5.95",
   "description": "Nexrall Code — AI coding assistant for your terminal (headless agent for scripts, CI and automation)",
   "keywords": [
     "ai",
@@ -41,7 +41,7 @@
     "release": "node build.js && node scripts/upload-release.cjs"
   },
   "dependencies": {
-    "@nexrall/code-core": "^1.4.47",
+    "@nexrall/code-core": "^1.4.48",
     "chalk": "^5.3.0",
     "commander": "^12.0.0",
     "diff": "^5.2.0",