@polymorphism-tech/morph-spec 8.16.0 → 8.18.0

package/src/utils/skills-installer.js

@@ -75,8 +75,14 @@ function copyDirectory(src, dest) {
  *
  * @param {string} srcDir - Source directory to walk
  * @param {string} destDir - Destination base directory (.claude/skills/)
+ * @param {string[]} projectTags - Stack tags from config
+ * @param {Set<string>} installedNow - Accumulator: skill names this call
+ *   actually (re)installed. NOT derived by re-scanning destDir afterwards —
+ *   a disk scan can't distinguish "installed this run" from "leftover from a
+ *   previous run with different projectTags", which is exactly the stale
+ *   entry a stack change needs cleaned up.
  */
-function installSkillsFromDir(srcDir, destDir, projectTags) {
+function installSkillsFromDir(srcDir, destDir, projectTags, installedNow) {
   const entries = readdirSync(srcDir);
   for (const entry of entries) {
     const srcPath = join(srcDir, entry);
@@ -90,9 +96,10 @@ function installSkillsFromDir(srcDir, destDir, projectTags) {
         if (!shouldInstallSkill(content, projectTags)) continue;
         const skillDestDir = join(destDir, entry);
         copyDirectory(srcPath, skillDestDir);
+        installedNow.add(entry);
       } else {
         // Level/category directory — recurse
-        installSkillsFromDir(srcPath, destDir, projectTags);
+        installSkillsFromDir(srcPath, destDir, projectTags, installedNow);
       }
     } else if (entry.endsWith('.md') && entry !== 'README.md') {
       // Legacy flat .md skill — check stack filter before copying
@@ -102,6 +109,7 @@ function installSkillsFromDir(srcDir, destDir, projectTags) {
       const skillDir = join(destDir, skillName);
       mkdirSync(skillDir, { recursive: true });
       copyFileSync(srcPath, join(skillDir, 'SKILL.md'));
+      installedNow.add(skillName);
     }
   }
 }
@@ -147,28 +155,33 @@ export async function installSkills(projectDir, { projectTags = [] } = {}) {
   const claudeSkillsDir = join(projectDir, '.claude', 'skills');
   mkdirSync(claudeSkillsDir, { recursive: true });
 
+  // Skill names this call actually (re)installs, given projectTags. Tracked
+  // as we go (NOT by re-scanning claudeSkillsDir afterwards) — a disk scan
+  // can't tell "installed this run" apart from "leftover from a previous
+  // run with different projectTags", which is exactly the stale entry a
+  // stack change (or a re-run that narrows the stack) needs cleaned up.
+  const installedNow = new Set();
   for (const level of SKILL_LEVELS_TO_INSTALL) {
     const levelDir = join(FRAMEWORK_SKILLS_DIR, level);
     if (!existsSync(levelDir)) continue;
-    installSkillsFromDir(levelDir, claudeSkillsDir, projectTags);
-  }
-
-  // Collect installed morph-* skill names
-  const installed = new Set();
-  for (const entry of readdirSync(claudeSkillsDir)) {
-    if (existsSync(join(claudeSkillsDir, entry, 'SKILL.md'))) {
-      installed.add(entry);
-    }
+    installSkillsFromDir(levelDir, claudeSkillsDir, projectTags, installedNow);
   }
 
-  // Cleanup orphan morph-* skill dirs that exist in source but were filtered out
+  // Clean-slate: remove any skill dir that is a KNOWN framework skill (still
+  // present in framework/skills/core/) but did NOT get (re)installed this
+  // run — i.e. it was filtered out by a `stacks:` mismatch (project.stack
+  // changed, or a re-run narrowed the tags). Previously scoped to `morph-`
+  // prefixed names only, which silently exempted every non-`morph-` skill
+  // (the Umbraco pair) from ever being cleaned up: install once with
+  // `umbraco` in the stack, drop the stack later, and they'd survive every
+  // reinstall/update forever. Names outside allSourceSkills (user-added,
+  // non-framework skills) are never touched.
   const allSourceSkills = collectSourceSkillNames();
   for (const entry of readdirSync(claudeSkillsDir)) {
-    if (!entry.startsWith('morph-')) continue;
-    if (!installed.has(entry) && allSourceSkills.has(entry)) {
+    if (!installedNow.has(entry) && allSourceSkills.has(entry)) {
       rmSync(join(claudeSkillsDir, entry), { recursive: true, force: true });
     }
   }
 
-  return { installed: installed.size };
+  return { installed: installedNow.size };
 }