chore: Simplify full sync skill cleanup

Assets/Tests/Editor/ToolSkillSynchronizerTests.cs

@@ -315,6 +315,57 @@ await ToolSkillSynchronizer.InstallSkillFilesAtProjectRoot(
             Assert.That(Directory.Exists(managedSkillsRoot), Is.False);
         }
 
+        [Test]
+        public async Task InstallSkillFilesAtProjectRoot_WhenDisabledSkillExistsInBothLayouts_RemovesBothLayouts()
+        {
+            // Tests that full sync removes disabled skills through the scope cleanup before installing enabled skills.
+            string temporaryRoot = CreateTemporaryProjectRoot();
+            CreateFakeSourceSkill(
+                temporaryRoot,
+                "uloop-enabled-skill",
+                "EnabledTool",
+                "reference.md",
+                "enabled-reference");
+            CreateFakeSourceSkill(
+                temporaryRoot,
+                "uloop-disabled-skill",
+                "DisabledTool",
+                "reference.md",
+                "disabled-reference");
+
+            string targetRoot = Path.Combine(temporaryRoot, ".claude");
+            string skillsRoot = Path.Combine(targetRoot, SkillInstallLayout.SkillsDirName);
+            string managedSkillsRoot = Path.Combine(
+                skillsRoot,
+                SkillInstallLayout.ManagedSkillsDirName);
+            string flatDisabledSkillDir = Path.Combine(skillsRoot, "uloop-disabled-skill");
+            string groupedDisabledSkillDir = Path.Combine(managedSkillsRoot, "uloop-disabled-skill");
+            WriteSkillFile(flatDisabledSkillDir, "---\nname: uloop-disabled-skill\n---\n");
+            WriteSkillFile(groupedDisabledSkillDir, "---\nname: uloop-disabled-skill\n---\n");
+
+            ToolSkillSynchronizer.SkillTargetInfo target = new(
+                "Claude Code",
+                ".claude",
+                "--claude",
+                hasSkillsDirectory: true,
+                hasExistingSkills: true);
+
+            ToolSkillSynchronizer.SkillInstallResult result =
+                await ToolSkillSynchronizer.InstallSkillFilesAtProjectRoot(
+                    temporaryRoot,
+                    new[] { target },
+                    groupSkillsUnderUnityCliLoop: false,
+                    disabledTools: new[] { "disabled-skill" },
+                    ct: CancellationToken.None);
+
+            string enabledSkillDir = Path.Combine(skillsRoot, "uloop-enabled-skill");
+
+            Assert.That(result.IsSuccessful, Is.True);
+            Assert.That(File.Exists(Path.Combine(enabledSkillDir, SkillInstallLayout.SkillFileName)), Is.True);
+            Assert.That(Directory.Exists(flatDisabledSkillDir), Is.False);
+            Assert.That(Directory.Exists(groupedDisabledSkillDir), Is.False);
+        }
+
         [Test]
         public async Task InstallSkillFilesAtProjectRoot_WhenFlatLayoutRequested_InstallsProjectLocalCustomSkills()
         {

Packages/src/Editor/Infrastructure/SkillSetup/SkillInstallLayout.cs

@@ -332,18 +332,6 @@ internal static string GetInstalledSkillDirectoryPathForLayout(
             return GetInstalledSkillDirectoryPath(targetRoot, skillName, groupSkillsUnderUnityCliLoop);
         }
 
-        internal static IEnumerable<string> EnumerateInstalledSkillDirectoryNamesForLayout(
-            string targetRoot,
-            bool groupSkillsUnderUnityCliLoop)
-        {
-            IEnumerable<string> installedSkillDirectories = groupSkillsUnderUnityCliLoop
-                ? EnumerateManagedSkillDirectories(targetRoot)
-                : EnumerateLegacyManagedSkillDirectories(targetRoot);
-            return installedSkillDirectories
-                .Select(Path.GetFileName)
-                .Where(name => !string.IsNullOrEmpty(name));
-        }
-
         private static IEnumerable<string> EnumerateManagedSkillDirectories(string targetRoot)
         {
             string managedSkillsRoot = GetManagedSkillsRoot(targetRoot);

Packages/src/Editor/Infrastructure/SkillSetup/SkillTargetInstaller.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -96,27 +95,6 @@ private static void InstallSkillsForTargetCore(
                 DeleteSkillDirectoryIfExists(targetRoot, skill.Name, !groupSkillsUnderUnityCliLoop, ct);
             }
 
-            if (syncScope == SkillSyncScope.FullSync)
-            {
-                HashSet<string> managedSkillNames = GetManagedSkillNames(skills, disabledSkills);
-                DeleteUnexpectedInstalledSkillDirectories(
-                    targetRoot,
-                    skills.Select(skill => skill.Name),
-                    managedSkillNames,
-                    groupSkillsUnderUnityCliLoop,
-                    ct);
-
-                if (!groupSkillsUnderUnityCliLoop)
-                {
-                    DeleteUnexpectedInstalledSkillDirectories(
-                        targetRoot,
-                        skills.Select(skill => skill.Name),
-                        managedSkillNames,
-                        groupSkillsUnderUnityCliLoop: true,
-                        ct);
-                }
-            }
-
             if (!groupSkillsUnderUnityCliLoop)
             {
                 DeleteEmptyManagedSkillsParentDirectoryIfNeeded(
@@ -126,18 +104,6 @@ private static void InstallSkillsForTargetCore(
             }
         }
 
-        private static HashSet<string> GetManagedSkillNames(
-            IEnumerable<SkillInstallLayout.SkillSourceInfo> skills,
-            IEnumerable<SkillInstallLayout.SkillSourceInfo> disabledSkills)
-        {
-            HashSet<string> managedSkillNames = new(
-                skills.Select(skill => skill.Name),
-                StringComparer.Ordinal);
-            managedSkillNames.UnionWith(disabledSkills.Select(skill => skill.Name));
-            managedSkillNames.UnionWith(DeprecatedSkillNames);
-            return managedSkillNames;
-        }
-
         internal static void DeleteSkillDirectoryIfExists(
             string targetRoot,
             string skillName,
@@ -158,34 +124,6 @@ internal static void DeleteSkillDirectoryIfExists(
             DeleteEmptyManagedSkillsParentDirectoryIfNeeded(targetRoot, groupSkillsUnderUnityCliLoop, ct);
         }
 
-        private static void DeleteUnexpectedInstalledSkillDirectories(
-            string targetRoot,
-            IEnumerable<string> expectedSkillNames,
-            IEnumerable<string> removableSkillNames,
-            bool groupSkillsUnderUnityCliLoop,
-            CancellationToken ct)
-        {
-            HashSet<string> expectedSkillNameSet = new(expectedSkillNames, StringComparer.Ordinal);
-            HashSet<string> removableSkillNameSet = new(removableSkillNames, StringComparer.Ordinal);
-            foreach (string installedSkillName in SkillInstallLayout.EnumerateInstalledSkillDirectoryNamesForLayout(
-                         targetRoot,
-                         groupSkillsUnderUnityCliLoop))
-            {
-                ct.ThrowIfCancellationRequested();
-                if (expectedSkillNameSet.Contains(installedSkillName))
-                {
-                    continue;
-                }
-
-                if (!removableSkillNameSet.Contains(installedSkillName))
-                {
-                    continue;
-                }
-
-                DeleteSkillDirectoryIfExists(targetRoot, installedSkillName, groupSkillsUnderUnityCliLoop, ct);
-            }
-        }
-
         private static void DeleteDeprecatedSkillDirectories(
             string targetRoot,
             bool groupSkillsUnderUnityCliLoop,