com.elestrago.unity.package-tools 2.2.0 → 2.2.2

package/CAHNGELOG.md

@@ -2,6 +2,22 @@
 
 ---
 
+## [2.2.2](https://gitlab.com/elestrago-pkg/package-tool/-/tags/2.2.2)
+
+### Changed
+
+- Simplified the `Claude Skills` post-import hook to rely on self-deletion for deduplication, removing the `SessionState` guards so a re-import within the same Unity session runs again instead of being silently skipped.
+
+---
+
+## [2.2.1](https://gitlab.com/elestrago-pkg/package-tool/-/tags/2.2.1)
+
+### Added
+
+- Added cleanup of empty ancestor folders under `Assets/Samples/` after the `Claude Skills` post-import hook finishes, so importing the sample leaves no stub `Assets/Samples/<Package>/<Version>/` directories behind.
+
+---
+
 ## [2.2.0](https://gitlab.com/elestrago-pkg/package-tool/-/tags/2.2.0)
 
 ### Added

package/Samples~/ClaudeSkills/Editor/ClaudeSkillsPostImport.cs

@@ -7,10 +7,12 @@ using UnityEngine;
 namespace PackageTool.Samples.ClaudeSkills
 {
 	/// <summary>
-	/// Runs once after the "Claude Skills" sample is imported into a consumer project. Walks every
-	/// skill subfolder next to this script, copies it to <c>&lt;project&gt;/.claude/skills/&lt;name&gt;</c>,
-	/// prompting before overwriting an existing skill, and then deletes the imported sample folder so
-	/// the operation does not repeat on subsequent domain reloads.
+	/// Runs after the "Claude Skills" sample is imported into a consumer project. Walks every skill
+	/// subfolder next to this script, copies it to <c>&lt;project&gt;/.claude/skills/&lt;name&gt;</c>,
+	/// prompting before overwriting an existing skill, then deletes the imported sample folder
+	/// (including this script itself). Self-deletion is the only dedup mechanism: once gone the type
+	/// can't trigger again until the consumer re-imports the sample, which is exactly when a fresh
+	/// run is wanted.
 	/// </summary>
 	[InitializeOnLoad]
 	internal static class ClaudeSkillsPostImport
@@ -20,8 +22,6 @@ namespace PackageTool.Samples.ClaudeSkills
 		private const string EDITOR_FOLDER_NAME = "Editor";
 		private const string SCRIPT_FILE_NAME = "ClaudeSkillsPostImport.cs";
 		private const string DIALOG_TITLE = "Claude Skills";
-		private const string SESSION_GUARD_KEY_PREFIX = "PackageTool.ClaudeSkillsPostImport.Processed:";
-		private const string SESSION_RUNNING_KEY = "PackageTool.ClaudeSkillsPostImport.Running";
 
 		static ClaudeSkillsPostImport()
 		{
@@ -30,27 +30,15 @@ namespace PackageTool.Samples.ClaudeSkills
 
 		private static void Run()
 		{
-			// Re-entrancy guard. Multiple copies of this type (e.g. in side-by-side sample imports
-			// each shipping their own assembly) would each schedule a delayCall; without this guard
-			// they would race on the same sample folders and double-prompt the user.
-			if (SessionState.GetBool(SESSION_RUNNING_KEY, false))
-				return;
-			SessionState.SetBool(SESSION_RUNNING_KEY, true);
-
 			try
 			{
 				foreach (var sampleRootAssetPath in FindSampleRootAssetPaths())
 				{
-					// Only run from an imported sample location; never act on the source folder
-					// inside a package author's project.
+					// Only act on imported sample locations; never touch the source folder inside a
+					// package author's project.
 					if (!sampleRootAssetPath.StartsWith("Assets/Samples/", StringComparison.Ordinal))
 						continue;
 
-					var guardKey = SESSION_GUARD_KEY_PREFIX + sampleRootAssetPath;
-					if (SessionState.GetBool(guardKey, false))
-						continue;
-					SessionState.SetBool(guardKey, true);
-
 					ProcessSample(sampleRootAssetPath);
 				}
 			}
@@ -58,10 +46,6 @@ namespace PackageTool.Samples.ClaudeSkills
 			{
 				Debug.LogErrorFormat("{0} Post-import failed: {1}", LOG_PREFIX, e);
 			}
-			finally
-			{
-				SessionState.SetBool(SESSION_RUNNING_KEY, false);
-			}
 		}
 
 		private static IEnumerable<string> FindSampleRootAssetPaths()
@@ -152,10 +136,56 @@ namespace PackageTool.Samples.ClaudeSkills
 				"{0} Done. Installed: {1}, Replaced: {2}, Skipped: {3}.",
 				LOG_PREFIX, installed, replaced, skipped);
 
-			AssetDatabase.DeleteAsset(sampleRootAssetPath);
+			DeleteSampleAndEmptyAncestors(sampleRootAssetPath);
+		}
+
+		private static void DeleteSampleAndEmptyAncestors(string sampleRootAssetPath)
+		{
+			if (!AssetDatabase.DeleteAsset(sampleRootAssetPath))
+			{
+				Debug.LogWarningFormat(
+					"{0} Could not remove imported sample folder [{1}].",
+					LOG_PREFIX,
+					sampleRootAssetPath);
+				AssetDatabase.Refresh();
+				return;
+			}
+
+			// Walk up Assets/Samples/<Package>/<Version>/<Sample>, removing each ancestor that the
+			// just-deleted sample left empty. Bounded to the Assets/Samples subtree so we never
+			// touch unrelated project folders.
+			var current = GetParentAssetPath(sampleRootAssetPath);
+			while (!string.IsNullOrEmpty(current) && IsWithinSamplesTree(current))
+			{
+				var fullPath = Path.GetFullPath(current);
+				if (!Directory.Exists(fullPath))
+					break;
+				if (Directory.GetFileSystemEntries(fullPath).Length > 0)
+					break;
+				if (!AssetDatabase.DeleteAsset(current))
+					break;
+
+				Debug.LogFormat("{0} Removed empty folder [{1}].", LOG_PREFIX, current);
+				current = GetParentAssetPath(current);
+			}
+
 			AssetDatabase.Refresh();
 		}
 
+		private static string GetParentAssetPath(string assetPath)
+		{
+			if (string.IsNullOrEmpty(assetPath))
+				return null;
+			var lastSlash = assetPath.LastIndexOf('/');
+			return lastSlash <= 0 ? null : assetPath.Substring(0, lastSlash);
+		}
+
+		private static bool IsWithinSamplesTree(string assetPath)
+		{
+			return string.Equals(assetPath, "Assets/Samples", StringComparison.Ordinal)
+				|| assetPath.StartsWith("Assets/Samples/", StringComparison.Ordinal);
+		}
+
 		private static void CopySkillDirectory(string source, string destination)
 		{
 			Directory.CreateDirectory(destination);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "com.elestrago.unity.package-tools",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "displayName": "Package Tool",
   "description": "Tool for create unity packages",
   "category": "unity",
   "unity": "2021.3",
   "homepage": "https://gitlab.com/elestrago-pkg/package-tool",
-  "documentationUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.0/README.md",
-  "changelogUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.0/CHANGELOG.md",
-  "licensesUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.0/LICENSE",
+  "documentationUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.2/README.md",
+  "changelogUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.2/CHANGELOG.md",
+  "licensesUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.2/LICENSE",
   "license": "MIT",
   "keywords": [
     "unity",