@waishnav/devspace 1.0.2 → 1.0.4

package/dist/skills.js

@@ -1,16 +1,60 @@
+import { existsSync } from "node:fs";
 import { homedir } from "node:os";
-import { resolve, sep } from "node:path";
+import { join, resolve, sep } from "node:path";
+import { fileURLToPath } from "node:url";
 import { loadSkills, } from "@earendil-works/pi-coding-agent";
 import { expandHomePath, isPathInsideRoot } from "./roots.js";
+const SUBAGENT_DELEGATION_NAME = "subagent-delegation";
+const SUBAGENT_DELEGATION_SKILL = join(SUBAGENT_DELEGATION_NAME, "SKILL.md");
+function bundledSkillsDir() {
+    return fileURLToPath(new URL("../skills", import.meta.url));
+}
+function hasSubagentDelegationSkill(skillDir) {
+    return existsSync(join(skillDir, SUBAGENT_DELEGATION_SKILL));
+}
+export function effectiveSkillPaths(config, cwd) {
+    const bundledSkills = bundledSkillsDir();
+    const defaultPathCandidates = [
+        join(homedir(), ".agents", "skills"),
+        resolve(cwd, ".agents", "skills"),
+        config.devspaceSkillsDir,
+        join(config.agentDir, "skills"),
+        config.subagents && !hasSubagentDelegationSkill(config.devspaceSkillsDir)
+            ? bundledSkills
+            : undefined,
+    ];
+    const defaultPaths = defaultPathCandidates.filter((path) => path !== undefined && existsSync(path));
+    const seen = new Set();
+    return [...defaultPaths, ...config.skillPaths]
+        .map((path) => resolveSkillPath(path, cwd))
+        .filter((path) => {
+        if (seen.has(path))
+            return false;
+        seen.add(path);
+        return true;
+    });
+}
+function resolveSkillPath(path, cwd) {
+    return resolve(cwd, expandHomePath(path));
+}
 export function loadWorkspaceSkills(config, cwd) {
     if (!config.skillsEnabled)
         return { skills: [], diagnostics: [] };
-    return loadSkills({
+    const result = loadSkills({
         cwd,
         agentDir: config.agentDir,
-        skillPaths: config.skillPaths,
-        includeDefaults: true,
+        skillPaths: effectiveSkillPaths(config, cwd),
+        includeDefaults: false,
     });
+    if (config.subagents)
+        return result;
+    return {
+        skills: result.skills.filter((skill) => skill.name !== SUBAGENT_DELEGATION_NAME),
+        diagnostics: result.diagnostics.filter((diagnostic) => {
+            const collision = diagnostic.collision;
+            return !(collision?.resourceType === "skill" && collision.name === SUBAGENT_DELEGATION_NAME);
+        }),
+    };
 }
 export function resolveSkillReadPath(skills, activatedSkillDirs, inputPath) {
     const absolutePath = resolve(expandHomePath(inputPath));