@rudderhq/cli 0.3.6-canary.35 → 0.3.6-canary.37

package/dist/index.js

@@ -7466,6 +7466,15 @@ function isMaintainerOnlySkillTarget(candidate) {
   const normalized = normalizePathSlashes(candidate);
   return normalized.includes("/server/resources/bundled-skills/") || normalized.includes("/.agents/skills/");
 }
+function parseObject(value) {
+  if (typeof value !== "object" || value === null || Array.isArray(value)) {
+    return {};
+  }
+  return value;
+}
+function asString(value, fallback) {
+  return typeof value === "string" && value.length > 0 ? value : fallback;
+}
 
 // ../packages/agent-runtime-utils/dist/server-utils.prompts.js
 var RUDDER_AGENT_OPERATING_CONTRACT = [
@@ -7577,25 +7586,48 @@ async function resolveRudderSkillsDir(moduleDir, additionalCandidates = []) {
   return null;
 }
 async function removeMaintainerOnlySkillSymlinks(skillsHome, allowedSkillNames) {
+  return removeUnselectedRudderSkillSymlinks(skillsHome, allowedSkillNames);
+}
+async function readRudderMaterializedSkillSource(target) {
+  const manifestPath = path9.join(target, ".rudder", "materialized-skill.json");
+  const raw = await fs6.readFile(manifestPath, "utf8").catch(() => null);
+  if (!raw)
+    return null;
+  try {
+    const parsed = parseObject(JSON.parse(raw));
+    const sourcePath = asString(parsed.sourcePath, "").trim();
+    return sourcePath.length > 0 ? path9.resolve(sourcePath) : null;
+  } catch {
+    return null;
+  }
+}
+async function removeUnselectedRudderSkillSymlinks(skillsHome, allowedSkillNames, knownSkillSources = []) {
   const allowed = new Set(Array.from(allowedSkillNames));
+  const knownSources = new Set(Array.from(knownSkillSources).map((value) => value.trim()).filter(Boolean).map((value) => path9.resolve(value)));
   try {
     const entries = await fs6.readdir(skillsHome, { withFileTypes: true });
     const removed = [];
     for (const entry of entries) {
-      if (allowed.has(entry.name))
-        continue;
       const target = path9.join(skillsHome, entry.name);
       const existing = await fs6.lstat(target).catch(() => null);
-      if (!existing?.isSymbolicLink())
+      if (!existing)
         continue;
-      const linkedPath = await fs6.readlink(target).catch(() => null);
-      if (!linkedPath)
+      let isRudderManagedSkill = false;
+      if (existing.isSymbolicLink()) {
+        const linkedPath = await fs6.readlink(target).catch(() => null);
+        if (!linkedPath)
+          continue;
+        const resolvedLinkedPath = path9.isAbsolute(linkedPath) ? linkedPath : path9.resolve(path9.dirname(target), linkedPath);
+        isRudderManagedSkill = knownSources.has(path9.resolve(resolvedLinkedPath)) || isMaintainerOnlySkillTarget(linkedPath) || isMaintainerOnlySkillTarget(resolvedLinkedPath);
+      } else if (existing.isDirectory()) {
+        const materializedSource = await readRudderMaterializedSkillSource(target);
+        isRudderManagedSkill = materializedSource !== null && knownSources.has(materializedSource);
+      }
+      if (!isRudderManagedSkill)
         continue;
-      const resolvedLinkedPath = path9.isAbsolute(linkedPath) ? linkedPath : path9.resolve(path9.dirname(target), linkedPath);
-      if (!isMaintainerOnlySkillTarget(linkedPath) && !isMaintainerOnlySkillTarget(resolvedLinkedPath)) {
+      if (allowed.has(entry.name))
         continue;
-      }
-      await fs6.unlink(target);
+      await fs6.rm(target, { recursive: true, force: true });
       removed.push(entry.name);
     }
     return removed;