@nylorun/agents 0.20.0-beta → 0.21.0-beta

package/dist/skills/skills.js

@@ -1,8 +1,7 @@
 import { basename } from "node:path";
-import { formatSkillCatalog, SKILLS_USAGE } from "./catalog.js";
 import { loadSkillsFromDirectory, resolveSkillsRoot, } from "./load.js";
 /**
- * Load an agentskills.io catalog folder and return one capability for `Agent.use`.
+ * Load an agentskills.io catalog folder as one part of an agent, for `.skills()`.
  *
  * Expected layout:
  * ```
@@ -15,39 +14,34 @@ import { loadSkillsFromDirectory, resolveSkillsRoot, } from "./load.js";
  *
  * Sets `skills`: each skill's name, description and files (every file of its folder, binary
  * included, by content hash). The client uploads the files the Runtime lacks when it registers
- * the agent, and the Runtime serves `load_skill` / `read_skill_resource` from them.
+ * the agent; the Runtime adds the skill catalog and serves `load_skill` / `read_skill_resource`
+ * from them.
  */
-export function skills(directory, options = {}) {
+export function skills(directory) {
     const root = resolveSkillsRoot(directory);
     const diagnostics = [];
     const loaded = loadSkillsFromDirectory(root, diagnostics);
     const listed = Object.values(loaded);
-    const id = options.id ?? basename(root);
+    const id = `skills:${basename(root)}`;
     if (listed.length === 0) {
         return { id, root, diagnostics };
     }
-    const { skills: skillManifest, skillFiles } = skillsDeclaration(listed);
-    return {
-        id,
-        root,
-        instructions: [
-            SKILLS_USAGE,
-            formatSkillCatalog(listed.map((skill) => ({
-                name: skill.name,
-                description: skill.description,
-            }))),
-        ],
-        skills: skillManifest,
-        skillFiles,
-        diagnostics,
-    };
+    return { id, root, ...skillsDeclaration(listed), diagnostics };
 }
-/** The manifest's skills and the bytes behind their files, for a capability declaration. */
-export function skillsDeclaration(listed) {
+/**
+ * The manifest's skills and the bytes behind their files. A plugin's skills carry its label, so
+ * a tool call can be traced to the plugin that brought the skill.
+ */
+export function skillsDeclaration(listed, plugin) {
     return {
         skills: Object.fromEntries(listed.map((skill) => [
             skill.name,
-            { name: skill.name, description: skill.description, files: skill.files },
+            {
+                name: skill.name,
+                description: skill.description,
+                files: skill.files,
+                ...(plugin === undefined ? {} : { plugin }),
+            },
         ])),
         skillFiles: Object.assign({}, ...listed.map((skill) => skill.sources)),
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nylorun/agents",
-  "version": "0.20.0-beta",
+  "version": "0.21.0-beta",
   "description": "Nylorun agent definitions and session client",
   "type": "module",
   "license": "Apache-2.0",
@@ -43,7 +43,7 @@
     "test": "vitest run --passWithNoTests"
   },
   "dependencies": {
-    "@nylorun/core": "0.20.0-beta",
+    "@nylorun/core": "0.21.0-beta",
     "gray-matter": "^4.0.3"
   },
   "peerDependencies": {

package/dist/skills/catalog.d.ts

@@ -1,5 +0,0 @@
-export declare const SKILLS_USAGE = "The following skills provide specialized instructions. When a task matches a skill description, call load_skill with that name before proceeding.";
-export declare function formatSkillCatalog(skills: readonly {
-    name: string;
-    description: string;
-}[]): string;

package/dist/skills/catalog.js

@@ -1,14 +0,0 @@
-export const SKILLS_USAGE = "The following skills provide specialized instructions. When a task matches a skill description, call load_skill with that name before proceeding.";
-export function formatSkillCatalog(skills) {
-    const entries = skills
-        .map((skill) => `  <skill>\n    <name>${escapeXml(skill.name)}</name>\n    <description>${escapeXml(skill.description)}</description>\n  </skill>`)
-        .join("\n");
-    return `<available_skills>\n${entries}\n</available_skills>`;
-}
-function escapeXml(value) {
-    return value
-        .replaceAll("&", "&amp;")
-        .replaceAll("<", "&lt;")
-        .replaceAll(">", "&gt;")
-        .replaceAll('"', "&quot;");
-}