@dexto/agent-management 1.7.2 → 1.8.1

package/dist/tool-factories/creator-tools/factory.cjs

@@ -33,7 +33,6 @@ __export(factory_exports, {
 module.exports = __toCommonJS(factory_exports);
 var import_node_fs = require("node:fs");
 var import_node_path = __toESM(require("node:path"), 1);
-var import_yaml = require("yaml");
 var import_core = require("@dexto/core");
 var import_discover_skills = require("../../plugins/discover-skills.js");
 var import_schemas = require("./schemas.js");
@@ -43,8 +42,6 @@ const SkillCreateInputSchema = import_zod.z.object({
   id: import_zod.z.string().min(1).describe("Skill id (kebab-case)."),
   description: import_zod.z.string().min(1).describe("Short description of what the skill does."),
   content: import_zod.z.string().min(1).describe("Skill body (markdown) without frontmatter."),
-  allowedTools: import_zod.z.array(import_zod.z.string().min(1)).optional().describe("Optional allowed-tools list for the skill frontmatter."),
-  toolkits: import_zod.z.array(import_zod.z.string().min(1)).optional().describe("Optional toolkits list for the skill frontmatter."),
   scope: import_zod.z.enum(["global", "workspace"]).optional(),
   overwrite: import_zod.z.boolean().optional()
 }).strict();
@@ -52,8 +49,6 @@ const SkillUpdateInputSchema = import_zod.z.object({
   id: import_zod.z.string().min(1),
   content: import_zod.z.string().min(1).describe("New SKILL.md body (markdown) without frontmatter."),
   description: import_zod.z.string().min(1).optional(),
-  allowedTools: import_zod.z.array(import_zod.z.string().min(1)).optional().describe("Optional allowed-tools list for the skill frontmatter."),
-  toolkits: import_zod.z.array(import_zod.z.string().min(1)).optional().describe("Optional toolkits list for the skill frontmatter."),
   scope: import_zod.z.enum(["global", "workspace"]).optional()
 }).strict();
 const SkillListInputSchema = import_zod.z.object({
@@ -85,8 +80,8 @@ function matchesSkillQuery(value, query) {
   if (!normalizedQuery) return false;
   return normalizeSkillQuery(value).includes(normalizedQuery);
 }
-function resolvePromptSkillName(info, id) {
-  return info.displayName || info.name || id;
+function resolveSkillName(info) {
+  return info.displayName || info.id;
 }
 function resolveWorkspaceBasePath(context) {
   const workspacePath = context.workspace?.path;
@@ -101,25 +96,6 @@ function resolveWorkspaceSkillDirs(context) {
     legacy: import_node_path.default.join(base, ".dexto", "skills")
   };
 }
-function findRegisteredSkillFile(skillId, context) {
-  const prompts = context.agent?.getEffectiveConfig().prompts;
-  if (!Array.isArray(prompts)) {
-    return void 0;
-  }
-  for (const prompt of prompts) {
-    if (!prompt || typeof prompt !== "object" || prompt.type !== "file") {
-      continue;
-    }
-    const filePath = typeof prompt.file === "string" ? prompt.file : void 0;
-    if (!filePath || import_node_path.default.basename(filePath) !== "SKILL.md") {
-      continue;
-    }
-    if (import_node_path.default.basename(import_node_path.default.dirname(filePath)) === skillId) {
-      return filePath;
-    }
-  }
-  return void 0;
-}
 function resolveSkillBaseDirectory(scope, context) {
   if (scope === "global") {
     return { baseDir: (0, import_path.getDextoGlobalPath)("skills"), scope: "global" };
@@ -153,20 +129,6 @@ async function resolveSkillUpdateDirectory(input, context) {
   return { baseDir: primary, scope: "workspace" };
 }
 async function resolveExistingSkillLocation(input, context) {
-  if (input.scope !== "global") {
-    const registeredSkillFile = findRegisteredSkillFile(input.id.trim(), context);
-    if (registeredSkillFile) {
-      const skillDir2 = import_node_path.default.dirname(registeredSkillFile);
-      const baseDir2 = import_node_path.default.dirname(skillDir2);
-      ensurePathWithinBase(baseDir2, skillDir2, "skill_refresh");
-      return {
-        baseDir: baseDir2,
-        scope: "workspace",
-        skillDir: skillDir2,
-        skillFile: registeredSkillFile
-      };
-    }
-  }
   const { baseDir, scope } = await resolveSkillUpdateDirectory(input, context);
   const skillDir = import_node_path.default.join(baseDir, input.id.trim());
   ensurePathWithinBase(baseDir, skillDir, "skill_refresh");
@@ -206,10 +168,6 @@ function resolveSkillCreateInput(input) {
     content
   };
 }
-function formatFrontmatterList(key, values) {
-  const normalized = values.map((value) => JSON.stringify(value.trim()));
-  return `${key}: [${normalized.join(", ")}]`;
-}
 function buildSkillMarkdownFromParts(options) {
   const id = options.id.trim();
   const title = titleizeSkillId(id) || id;
@@ -217,12 +175,6 @@ function buildSkillMarkdownFromParts(options) {
   const lines = ["---"];
   lines.push(formatFrontmatterLine("name", id));
   lines.push(formatFrontmatterLine("description", options.description.trim()));
-  if (options.toolkits && options.toolkits.length > 0) {
-    lines.push(formatFrontmatterList("toolkits", options.toolkits));
-  }
-  if (options.allowedTools && options.allowedTools.length > 0) {
-    lines.push(formatFrontmatterList("allowed-tools", options.allowedTools));
-  }
   lines.push("---", "", `# ${title}`);
   if (body.length > 0) {
     lines.push("", body);
@@ -239,69 +191,36 @@ function buildSkillMarkdown(input) {
   return buildSkillMarkdownFromParts({
     id: input.id,
     description: input.description,
-    content: input.content,
-    allowedTools: input.allowedTools,
-    toolkits: input.toolkits
+    content: input.content
   });
 }
-async function readSkillFrontmatter(skillFile) {
+function frontmatterDescription(markdown) {
+  if (!markdown.startsWith("---\n")) return void 0;
+  const end = markdown.indexOf("\n---", 4);
+  if (end < 0) return void 0;
+  const line = markdown.slice(4, end).split("\n").find((candidate) => candidate.trim().startsWith("description:"));
+  return line?.split(":").slice(1).join(":").trim().replace(/^"|"$/g, "") || void 0;
+}
+async function readSkillDescription(skillFile) {
   try {
     const raw = await import_node_fs.promises.readFile(skillFile, "utf-8");
-    const match = raw.match(/^---\s*\n([\s\S]*?)\n---\s*\n/);
-    if (!match) return {};
-    const frontmatter = (0, import_yaml.parse)(match[1] ?? "");
-    if (!frontmatter || typeof frontmatter !== "object") return {};
-    const name = typeof frontmatter.name === "string" ? frontmatter.name.trim() : void 0;
-    const description = typeof frontmatter.description === "string" ? frontmatter.description.trim() : void 0;
-    const allowedToolsRaw = frontmatter["allowed-tools"];
-    const toolkitsRaw = frontmatter.toolkits;
-    const allowedTools = Array.isArray(allowedToolsRaw) ? allowedToolsRaw.filter((item) => typeof item === "string").map((item) => item.trim()).filter((item) => item.length > 0) : void 0;
-    const toolkits = Array.isArray(toolkitsRaw) ? toolkitsRaw.filter((item) => typeof item === "string").map((item) => item.trim()).filter((item) => item.length > 0) : void 0;
-    const result = {};
-    if (name) result.name = name;
-    if (description) result.description = description;
-    if (allowedTools && allowedTools.length > 0) result.allowedTools = allowedTools;
-    if (toolkits && toolkits.length > 0) result.toolkits = toolkits;
-    return result;
+    return frontmatterDescription(raw);
   } catch {
-    return {};
+    return void 0;
   }
 }
-async function refreshAgentPrompts(context, skillFile) {
-  const agent = context.agent;
-  if (!agent) return false;
-  const effective = agent.getEffectiveConfig();
-  const existingPrompts = Array.isArray(effective.prompts) ? [...effective.prompts] : [];
-  const alreadyPresent = existingPrompts.some((prompt) => {
-    if (!prompt || typeof prompt !== "object") return false;
-    const record = prompt;
-    return record.type === "file" && record.file === skillFile;
-  });
-  const nextPrompts = alreadyPresent ? existingPrompts : [...existingPrompts, { type: "file", file: skillFile }];
-  await agent.refreshPrompts(nextPrompts);
+async function refreshAgentSkills(context) {
+  const skillManager = context.services?.skills;
+  if (!skillManager) return false;
+  await skillManager.refresh();
   return true;
 }
-function buildSkillBundleNotes(bundledMcpServers) {
-  const notes = [
-    "Creating or editing files under mcps/ only defines bundled MCP config. It does not implement or verify the target MCP server.",
-    "After editing SKILL.md or bundled MCP files with non-creator tools, run skill_refresh so the current session sees the latest skill content and MCP metadata."
-  ];
-  if (bundledMcpServers.length > 0) {
-    notes.push(
-      "Bundled MCP config is present. Only describe the skill as shipping a real MCP when the config points at a bundled runnable server or a verified external command/package."
-    );
-  }
-  return notes;
-}
-function inspectSkillBundle(skillDir, skillId) {
-  const bundledMcpResult = (0, import_core.loadBundledMcpConfigFromDirectory)(skillDir, skillId, {
-    scanNestedMcps: true
-  });
-  const bundledMcpServers = Object.keys(bundledMcpResult.mcpServers ?? {});
+function inspectSkillBundle() {
   return {
-    bundledMcpServers,
-    bundledMcpWarnings: bundledMcpResult.warnings,
-    notes: buildSkillBundleNotes(bundledMcpServers)
+    notes: [
+      "Files under mcps/ are inert bundled files. Configure MCP servers through normal MCP configuration paths.",
+      "After editing SKILL.md or bundled files with non-creator tools, run skill_refresh so the current session sees the latest skill content."
+    ]
   };
 }
 const creatorToolsFactory = {
@@ -315,7 +234,7 @@ const creatorToolsFactory = {
     const enabledTools = config.enabledTools ?? import_schemas.CREATOR_TOOL_NAMES;
     const skillCreateTool = (0, import_core.defineTool)({
       id: "skill_create",
-      description: "Create a standalone SKILL.md file, scaffold bundled resource directories, and register it with the running agent. This scaffolds mcps/ but does not implement or verify an MCP server.",
+      description: "Create a standalone SKILL.md file, scaffold bundled resource directories, and register it with the running agent. Files under mcps/ are inert bundled files.",
       inputSchema: SkillCreateInputSchema,
       execute: async (input, context) => {
         const resolvedInput = resolveSkillCreateInput(input);
@@ -343,9 +262,9 @@ const creatorToolsFactory = {
             (directory) => import_node_fs.promises.mkdir(import_node_path.default.join(skillDir, directory), { recursive: true })
           )
         );
-        const refreshed = await refreshAgentPrompts(context, skillFile);
+        const refreshed = await refreshAgentSkills(context);
         const displayName = titleizeSkillId(skillId) || skillId;
-        const bundleDetails = inspectSkillBundle(skillDir, skillId);
+        const bundleDetails = inspectSkillBundle();
         return {
           created: true,
           id: skillId,
@@ -356,7 +275,7 @@ const creatorToolsFactory = {
           resourceDirectories: SKILL_RESOURCE_DIRECTORIES.map(
             (directory) => import_node_path.default.join(skillDir, directory)
           ),
-          promptsRefreshed: refreshed,
+          skillsRefreshed: refreshed,
           ...bundleDetails
         };
       }
@@ -371,10 +290,7 @@ const creatorToolsFactory = {
           context: "skill_update",
           hint: "Use kebab-case skill ids (e.g., release-notes)"
         });
-        const { scope, skillDir, skillFile } = await resolveExistingSkillLocation(
-          input,
-          context
-        );
+        const { scope, skillFile } = await resolveExistingSkillLocation(input, context);
         const exists = await pathExists(skillFile);
         if (!exists) {
           throw import_core.ToolError.validationFailed(
@@ -382,40 +298,36 @@ const creatorToolsFactory = {
             `Skill not found at ${skillFile}`
           );
         }
-        const existing = await readSkillFrontmatter(skillFile);
-        const description = input.description?.trim() || existing.description;
+        const existingDescription = await readSkillDescription(skillFile);
+        const description = input.description?.trim() || existingDescription;
         if (!description) {
           throw import_core.ToolError.validationFailed(
             "skill_update",
             "description is required when the existing skill is missing one"
           );
         }
-        const allowedTools = input.allowedTools !== void 0 ? input.allowedTools : existing.allowedTools;
-        const toolkits = input.toolkits !== void 0 ? input.toolkits : existing.toolkits;
         const markdown = buildSkillMarkdownFromParts({
           id: skillId,
           description,
-          content: input.content.trim(),
-          allowedTools,
-          toolkits
+          content: input.content.trim()
         });
         await import_node_fs.promises.writeFile(skillFile, markdown, "utf-8");
-        const refreshed = await refreshAgentPrompts(context, skillFile);
-        const bundleDetails = inspectSkillBundle(skillDir, skillId);
+        const refreshed = await refreshAgentSkills(context);
+        const bundleDetails = inspectSkillBundle();
         return {
           updated: true,
           id: skillId,
           description,
           scope,
           path: skillFile,
-          promptsRefreshed: refreshed,
+          skillsRefreshed: refreshed,
           ...bundleDetails
         };
       }
     });
     const skillRefreshTool = (0, import_core.defineTool)({
       id: "skill_refresh",
-      description: "Refresh one standalone skill bundle in the current session after editing SKILL.md, mcps/, scripts/, or references/. Rebuilds prompt metadata so bundled MCP servers can be discovered without restarting.",
+      description: "Refresh one standalone skill bundle in the current session after editing SKILL.md, handlers/, scripts/, mcps/, or references/.",
       inputSchema: SkillRefreshInputSchema,
       execute: async (input, context) => {
         const skillId = input.id.trim();
@@ -423,15 +335,12 @@ const creatorToolsFactory = {
           context: "skill_refresh",
           hint: "Use kebab-case skill ids (e.g., release-notes)"
         });
-        if (!context.agent) {
+        if (!context.services?.skills) {
           throw import_core.ToolError.configInvalid(
-            "skill_refresh requires ToolExecutionContext.agent"
+            "skill_refresh requires ToolExecutionContext.services.skills"
           );
         }
-        const { scope, skillDir, skillFile } = await resolveExistingSkillLocation(
-          input,
-          context
-        );
+        const { scope, skillFile } = await resolveExistingSkillLocation(input, context);
         const exists = await pathExists(skillFile);
         if (!exists) {
           throw import_core.ToolError.validationFailed(
@@ -439,14 +348,14 @@ const creatorToolsFactory = {
             `Skill not found at ${skillFile}`
           );
         }
-        const refreshed = await refreshAgentPrompts(context, skillFile);
-        const bundleDetails = inspectSkillBundle(skillDir, skillId);
+        const refreshed = await refreshAgentSkills(context);
+        const bundleDetails = inspectSkillBundle();
         return {
           refreshed: true,
           id: skillId,
           scope,
           path: skillFile,
-          promptsRefreshed: refreshed,
+          skillsRefreshed: refreshed,
           ...bundleDetails
         };
       }
@@ -460,28 +369,22 @@ const creatorToolsFactory = {
         const normalizedQuery = normalizeSkillQuery(query);
         const hasQuery = normalizedQuery.length > 0;
         const limit = input.limit ?? (hasQuery ? void 0 : 50);
-        const promptManager = context.services?.prompts;
-        if (!promptManager) {
+        const skillManager = context.services?.skills;
+        if (!skillManager) {
           throw import_core.ToolError.configInvalid(
-            "skill_search requires ToolExecutionContext.services.prompts"
+            "skill_search requires ToolExecutionContext.services.skills"
           );
         }
-        const loaded = await promptManager.list();
-        let results = Object.entries(loaded).map(([id, info]) => ({
-          id,
-          name: resolvePromptSkillName(info, id),
-          ...info.displayName ? { displayName: info.displayName } : {},
-          ...info.commandName ? { commandName: info.commandName } : {},
-          ...info.description ? { description: info.description } : {},
-          ...info.context ? { context: info.context } : {},
-          ...info.agent ? { agent: info.agent } : {}
+        const loaded = await skillManager.list();
+        let results = loaded.map((info) => ({
+          id: info.id,
+          name: resolveSkillName(info),
+          ...info.description ? { description: info.description } : {}
         }));
         if (hasQuery && normalizedQuery) {
           results = results.filter((entry) => {
             if (matchesSkillQuery(entry.id, normalizedQuery)) return true;
             if (matchesSkillQuery(entry.name, normalizedQuery)) return true;
-            if (matchesSkillQuery(entry.displayName, normalizedQuery)) return true;
-            if (matchesSkillQuery(entry.commandName, normalizedQuery)) return true;
             if (matchesSkillQuery(entry.description, normalizedQuery)) return true;
             return false;
           });
@@ -552,7 +455,7 @@ const creatorToolsFactory = {
           count: limited.length,
           total: tools.length,
           tools: limited,
-          _hint: limited.length > 0 ? "Use tool ids in allowed-tools. Use toolkits from the agent config or image defaults." : "No tools matched the query."
+          _hint: limited.length > 0 ? "Use exact tool ids when configuring agent permissions." : "No tools matched the query."
         };
       }
     });

package/dist/tool-factories/creator-tools/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/creator-tools/factory.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAYvD,OAAO,EAIH,KAAK,kBAAkB,EAC1B,MAAM,cAAc,CAAC;AAqetB,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,kBAAkB,CAqT/D,CAAC"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../src/tool-factories/creator-tools/factory.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAUvD,OAAO,EAIH,KAAK,kBAAkB,EAC1B,MAAM,cAAc,CAAC;AAqVtB,eAAO,MAAM,mBAAmB,EAAE,WAAW,CAAC,kBAAkB,CAmS/D,CAAC"}