com.amanotes.prefabpool 1.3.0 → 2.0.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## [2.0.2] - 2026-09-14
+
+### Fixed
+- Pool-group registration during prewarm updates the registration without invalidating the initialization traversal.
+
+### Removed
+- Runtime tests from the distributable UPM package; tests remain in the development project.
+
+## [2.0.1] - 2026-08-15
+
+### Fixed
+- `PrefabPool.DestroyPool` now destroys checked-out instances (not only inactive `_pool` lists). Previously live clones with `HideFlags.DontSave` and a null spawn parent survived scene unload on device because `_instanceTypeMap` was only resolved in the Editor.
+- `PrefabPool.OnDestroy` calls `DestroyPool` so scene teardown always wipes every clone the pool instantiated.
+
+## [2.0.0] - 2026-07-22
+
+### Added
+- `UnityObjectId` / `UnityObjectIdentity` — cross-version object identity using `EntityId` on Unity 6.0.4+ and `GetInstanceID()` on earlier versions (`UnityObjectIdentity.cs`)
+
+### Changed
+- **Breaking:** `MaterialPool.Take(Material, int borrowId)` → `MaterialPool.Take(Material, UnityObject borrower)` (`MaterialPool.cs`)
+- **Breaking:** `MaterialPool.Return(int borrowId)` → `MaterialPool.Return(UnityObject borrower)` (`MaterialPool.cs`)
+- Internal pool dictionaries use `UnityObjectId` keys instead of `int` instance IDs (`MaterialPool.cs`, `PrefabPool.cs`)
+
 ## [1.3.0] - 2026-06-12
 
 ### Added

package/Docs/PrefabPool-API.md

@@ -1,6 +1,6 @@
 # PrefabPool API Reference
 
-**Package:** `com.amanotes.prefabpool` | **Version:** 1.2.0 | **Namespace:** `Amanotes.Core`
+**Package:** `com.amanotes.prefabpool` | **Version:** 2.0.2 | **Namespace:** `Amanotes.Core`
 
 Generic object pooling system to eliminate garbage collection spikes from frequent instantiation/destruction.
 
@@ -22,6 +22,8 @@ public interface IPrefabPool
     GameObject Get(PoolGroup group, string prefabId, Vector3 localPosition = default, Transform customParent = null);
     void Return(PoolGroup group, GameObject gameObject);
     IEnumerator Initialize();                // Pre-allocate pooled objects
+    void MarkShutdown();
+    void DestroyPool();                      // Inactive + checked-out clones
 }
 ```
 
@@ -175,22 +177,24 @@ Static utility for pooling material instances.
 ```csharp
 public static class MaterialPool
 {
-    public static Material Take(Material sourceOrClone, int borrowId);
-    public static void Return(int borrowId);
+    public static Material Take(Material sourceOrClone, UnityObject borrower);
+    public static void Return(UnityObject borrower);
 }
 ```
 
 **Example:**
 ```csharp
+using UnityEngine;
+
 // Borrow material
-Material mat = MaterialPool.Take(originalMaterial, GetInstanceID());
-renderer.material = mat;
+Material mat = MaterialPool.Take(originalMaterial, renderer);
+renderer.sharedMaterial = mat;
 mat.SetAlpha(0.5f);
 
 // Return on destroy
 void OnDestroy()
 {
-    MaterialPool.Return(GetInstanceID());
+    MaterialPool.Return(renderer);
 }
 ```
 
@@ -313,17 +317,19 @@ void UpdateTileCount(int count)
 ### Pattern 4: Material Pooling
 
 ```csharp
+using UnityEngine;
+
 // When to use: Dynamic color/alpha changes without creating material instances
 public class ColoredTile : MonoBehaviour
 {
     private Material instanceMaterial;
-    private int borrowId;
+    private Renderer _renderer;
     
     void Start()
     {
-        borrowId = GetInstanceID();
-        instanceMaterial = MaterialPool.Take(GetComponent<Renderer>().sharedMaterial, borrowId);
-        GetComponent<Renderer>().material = instanceMaterial;
+        _renderer = GetComponent<Renderer>();
+        instanceMaterial = MaterialPool.Take(_renderer.sharedMaterial, _renderer);
+        _renderer.sharedMaterial = instanceMaterial;
     }
     
     public void SetColor(Color color)
@@ -333,7 +339,7 @@ public class ColoredTile : MonoBehaviour
     
     void OnDestroy()
     {
-        MaterialPool.Return(borrowId);
+        MaterialPool.Return(_renderer);
     }
 }
 ```

package/README.md

@@ -1,7 +1,7 @@
 # PrefabPool
 
 **Package:** `com.amanotes.prefabpool`  
-**Version:** 1.3.0
+**Version:** 2.0.2
 
 Generic object pooling system for Unity with lifecycle callbacks and material pooling support.
 
@@ -30,7 +30,7 @@ Add the package to your Unity project via `Packages/manifest.json`:
 ```json
 {
   "dependencies": {
-    "com.amanotes.prefabpool": "1.3.0"
+    "com.amanotes.prefabpool": "2.0.2"
   },
   "scopedRegistries": [
     {

package/Runtime/MaterialPool.cs

@@ -23,28 +23,29 @@ namespace Amanotes.Core
     
     public partial class MaterialPool
     {
-        [NonSerialized] private static readonly Dictionary<int, MaterialPool> _map = new Dictionary<int, MaterialPool>();
-        [NonSerialized] private static readonly Dictionary<int, MaterialPool> _cloned = new Dictionary<int, MaterialPool>();
+        [NonSerialized] private static readonly Dictionary<UnityObjectId, MaterialPool> _map = new Dictionary<UnityObjectId, MaterialPool>();
+        [NonSerialized] private static readonly Dictionary<UnityObjectId, MaterialPool> _cloned = new Dictionary<UnityObjectId, MaterialPool>();
         
         private static MaterialPool GetPool(Material sourceOrClone)
         {
             if (sourceOrClone == null) return null;
-            var instId = sourceOrClone.GetInstanceID();
+            var instId = UnityObjectIdentity.GetId(sourceOrClone);
             var isCloned = sourceOrClone.hideFlags == HideFlags.DontSave;
             return isCloned
                 ? _cloned.GetValueOrDefault(instId)
                 : _map.GetValueOrDefault(instId);
         }
         
-        public static Material Take(Material sourceOrClone, int borrowId)
+        public static Material Take(Material sourceOrClone, UnityObject borrower)
         {
             if (sourceOrClone == null) return null;
             var pool = GetPool(sourceOrClone) ?? new MaterialPool(sourceOrClone);
-            return pool.InternalTake(borrowId);
+            return pool.InternalTake(UnityObjectIdentity.GetId(borrower));
         }
         
-        public static void Return(int borrowId)
+        public static void Return(UnityObject borrower)
         {
+            var borrowId = UnityObjectIdentity.GetId(borrower);
             foreach (var kvp in _map)
             {
                 kvp.Value.InternalReturn(borrowId);
@@ -56,12 +57,12 @@ namespace Amanotes.Core
     {
         private readonly Material original;
         private readonly List<Material> pool = new List<Material>();
-        private readonly Dictionary<int, Material> borrowed = new Dictionary<int, Material>();
+        private readonly Dictionary<UnityObjectId, Material> borrowed = new Dictionary<UnityObjectId, Material>();
 
         private MaterialPool(Material source)
         {
             original = source;
-            _map[original.GetInstanceID()] = this;
+            _map[UnityObjectIdentity.GetId(original)] = this;
 
             if (source.hideFlags == HideFlags.DontSave)
             {
@@ -78,7 +79,7 @@ namespace Amanotes.Core
             if (pool.Count <= 0)
             {
                 result = new Material(original) { hideFlags = HideFlags.DontSave };
-                _cloned[result.GetInstanceID()] = this;
+                _cloned[UnityObjectIdentity.GetId(result)] = this;
                 return result;
             }
             
@@ -87,7 +88,7 @@ namespace Amanotes.Core
             return result;
         }
 
-        private Material InternalTake(int borrowId)
+        private Material InternalTake(UnityObjectId borrowId)
         {
             if (borrowed.TryGetValue(borrowId, out var mat)) return mat;
             
@@ -97,7 +98,7 @@ namespace Amanotes.Core
             return material;
         }
         
-        private void InternalReturn(int borrowId)
+        private void InternalReturn(UnityObjectId borrowId)
         {
             if (borrowed.Remove(borrowId, out var mat)) pool.Add(mat);
         }

package/Runtime/PrefabPool.cs

@@ -23,14 +23,14 @@ namespace Amanotes.Core
         [NonSerialized] private PoolGroup _parentGroup;
         
         // Per-instance IPoolPrefab cache — components don't change on pooled prefabs
-        [NonSerialized] private readonly Dictionary<int, IPoolPrefab[]> _poolPrefabCache = new Dictionary<int, IPoolPrefab[]>(32);
+        [NonSerialized] private readonly Dictionary<UnityObjectId, IPoolPrefab[]> _poolPrefabCache = new Dictionary<UnityObjectId, IPoolPrefab[]>(32);
         [NonSerialized] private static readonly List<IPoolPrefab> _tempPoolPrefabs = new List<IPoolPrefab>(8);
         
         public void SetParentGroup(PoolGroup parentGroup) => _parentGroup = parentGroup;
         
         private IPoolPrefab[] GetCachedPoolPrefabs(GameObject go)
         {
-            var instanceId = go.GetInstanceID();
+            var instanceId = UnityObjectIdentity.GetId(go);
             if (_poolPrefabCache.TryGetValue(instanceId, out var cached)) return cached;
             
             go.GetComponents(_tempPoolPrefabs);
@@ -214,6 +214,10 @@ namespace Amanotes.Core
         /// when the pool's hierarchy is being deactivated.
         /// </summary>
         void MarkShutdown();
+        /// <summary>
+        /// Destroys every clone this pool instantiated (inactive lists and checked-out live instances).
+        /// </summary>
+        void DestroyPool();
     }
 
     public static class PrefabPoolExtensions
@@ -311,7 +315,10 @@ namespace Amanotes.Core
         [NonSerialized] private bool _isReady = false;
         [NonSerialized] private bool _isInitializing = false;
         [NonSerialized] private readonly Dictionary<string, PoolGroup> _groups = new Dictionary<string, PoolGroup>();
-        [NonSerialized] private readonly Dictionary<int, PoolEntry> _instanceTypeMap = new Dictionary<int, PoolEntry>();
+        // Registration order for Initialize — only appended on first RegisterGroup per id.
+        [NonSerialized] private readonly List<PoolGroup> _groupOrder = new List<PoolGroup>();
+        [NonSerialized] private readonly Dictionary<UnityObjectId, PoolEntry> _instanceTypeMap = new Dictionary<UnityObjectId, PoolEntry>();
+        [NonSerialized] private readonly Dictionary<UnityObjectId, GameObject> _liveInstances = new Dictionary<UnityObjectId, GameObject>();
         [NonSerialized] private readonly Dictionary<GameObject, PoolEntry> _customPool = new Dictionary<GameObject, PoolEntry>();
         
         public void Resize<T>(GameObject prefab, List<T> list, int count, Transform parent) where T: Component
@@ -359,8 +366,24 @@ namespace Amanotes.Core
         public void RegisterGroup(PoolGroup group, Transform spawnParent)
         {
             if (group == null) return;
-            
+
+            if (_groups.TryGetValue(group.id, out var existing))
+            {
+                // AttachHost re-registers tile/vfx groups from Start while Initialize is yielding.
+                // Updating spawn parent must not touch _groups — that invalidates Dictionary enumeration.
+                group.Register(this, spawnParent);
+                if (!ReferenceEquals(existing, group))
+                {
+                    _groups[group.id] = group;
+                    var index = _groupOrder.IndexOf(existing);
+                    if (index >= 0) _groupOrder[index] = group;
+                }
+                PurgeStaleInstanceMap();
+                return;
+            }
+
             _groups[group.id] = group;
+            _groupOrder.Add(group);
             group.Register(this, spawnParent);
             PurgeStaleInstanceMap();
         }
@@ -385,7 +408,9 @@ namespace Amanotes.Core
             var result = entry.Get(transform, p, localPosition);
             if (result != null)
             {
-                _instanceTypeMap[result.GetInstanceID()] = entry;
+                var id = UnityObjectIdentity.GetId(result);
+                _instanceTypeMap[id] = entry;
+                _liveInstances[id] = result;
             }
             
             return result;
@@ -395,11 +420,12 @@ namespace Amanotes.Core
         {
             if (_isDestroyed || group == null || go == null) return;
             
-            var instanceId = go.GetInstanceID();
+            var instanceId = UnityObjectIdentity.GetId(go);
             if (_instanceTypeMap.TryGetValue(instanceId, out var entry))
             {
                 entry.Return(go, transform);
                 _instanceTypeMap.Remove(instanceId);
+                _liveInstances.Remove(instanceId);
             }
         }
         
@@ -407,12 +433,16 @@ namespace Amanotes.Core
         {
 #if UNITY_EDITOR
             if (_instanceTypeMap.Count == 0) return;
-            var stale = new List<int>();
+            var stale = new List<UnityObjectId>();
             foreach (var kvp in _instanceTypeMap)
             {
-                if (EditorUtility.InstanceIDToObject(kvp.Key) == null) stale.Add(kvp.Key);
+                if (UnityObjectIdentity.IdToObject(kvp.Key) == null) stale.Add(kvp.Key);
+            }
+            foreach (var id in stale)
+            {
+                _instanceTypeMap.Remove(id);
+                _liveInstances.Remove(id);
             }
-            foreach (var id in stale) _instanceTypeMap.Remove(id);
 #endif
         }
         
@@ -425,26 +455,29 @@ namespace Amanotes.Core
             EditorApplication.playModeStateChanged -= HandlePlayModeChanged;
             EditorApplication.playModeStateChanged += HandlePlayModeChanged;
             #endif
-            
-            foreach (var group in _groups.Values)
-            {
-                foreach (var entry in group.entries)
-                {
-                    if (entry.prefab == null) continue;
-                    yield return entry.PreAllocate(transform);
-                }
-                
-                // Pre-allocate fallback entry if available
-                if (group.fallbackEntry != null && group.fallbackEntry.prefab != null)
-                {
-                    yield return group.fallbackEntry.PreAllocate(transform);
-                }
-            }
+
+            // Drain _groupOrder by index so groups appended during PreAllocate yields still prewarm.
+            for (var i = 0; i < _groupOrder.Count; i++)
+                yield return PrewarmGroup(_groupOrder[i]);
             
             _isInitializing = false;
             _isReady = true;
         }
 
+        IEnumerator PrewarmGroup(PoolGroup group)
+        {
+            if (group == null) yield break;
+
+            foreach (var entry in group.entries)
+            {
+                if (entry.prefab == null) continue;
+                yield return entry.PreAllocate(transform);
+            }
+
+            if (group.fallbackEntry != null && group.fallbackEntry.prefab != null)
+                yield return group.fallbackEntry.PreAllocate(transform);
+        }
+
 #if UNITY_EDITOR
         protected void HandlePlayModeChanged(PlayModeStateChange changed)
         {
@@ -454,39 +487,54 @@ namespace Amanotes.Core
             }
         }
 #endif
+
+        void OnDestroy()
+        {
+#if UNITY_EDITOR
+            EditorApplication.playModeStateChanged -= HandlePlayModeChanged;
+#endif
+            DestroyPool();
+        }
         
         public void DestroyPool()
         {
             _isDestroyed = true;
+
+            foreach (var go in _liveInstances.Values)
+                DestroyClone(go);
+            _liveInstances.Clear();
+            _instanceTypeMap.Clear();
             
-            foreach (var group in _groups.Values)
+            foreach (var group in _groupOrder)
             {
                 foreach (var entry in group.entries)
-                {
                     entry.DestroyPool();
-                }
-                
+
                 if (group.fallbackEntry != null)
-                {
                     group.fallbackEntry.DestroyPool();
-                }
             }
             _groups.Clear();
+            _groupOrder.Clear();
             
             foreach (var entry in _customPool.Values)
             {
                 entry.DestroyPool();
             }
             _customPool.Clear();
-            
+        }
+
+        static void DestroyClone(GameObject go)
+        {
+            if (go == null) return;
 #if UNITY_EDITOR
-            foreach (var kvp in _instanceTypeMap)
+            if (!Application.isPlaying)
             {
-                var obj = EditorUtility.InstanceIDToObject(kvp.Key);
-                if (obj != null) UnityObject.DestroyImmediate(obj);
+                UnityObject.DestroyImmediate(go);
+                return;
             }
 #endif
-            _instanceTypeMap.Clear();
+            UnityObject.Destroy(go);
         }
     }
-} 
+}
+ 

package/Runtime/UnityObjectIdentity.cs

@@ -0,0 +1,60 @@
+using System;
+using UnityEngine;
+using UnityObject = UnityEngine.Object;
+
+namespace Amanotes.Core
+{
+    internal readonly struct UnityObjectId : IEquatable<UnityObjectId>
+    {
+#if UNITY_6000_4_OR_NEWER
+        private readonly EntityId _id;
+
+        public UnityObjectId(UnityObject obj) => _id = obj != null ? obj.GetEntityId() : default;
+
+        public bool IsValid => _id.IsValid();
+
+        public bool Equals(UnityObjectId other) => _id.Equals(other._id);
+
+        public override int GetHashCode() => _id.GetHashCode();
+
+        public override string ToString() => _id.ToString();
+
+#if UNITY_EDITOR
+        public UnityObject ToObject() => UnityEditor.EditorUtility.EntityIdToObject(_id);
+#endif
+#else
+        private readonly int _id;
+
+        public UnityObjectId(UnityObject obj) => _id = obj != null ? obj.GetInstanceID() : 0;
+
+        public bool IsValid => _id != 0;
+
+        public bool Equals(UnityObjectId other) => _id == other._id;
+
+        public override int GetHashCode() => _id;
+
+        public override string ToString() => _id.ToString();
+
+#if UNITY_EDITOR
+        public UnityObject ToObject() => UnityEditor.EditorUtility.InstanceIDToObject(_id);
+#endif
+#endif
+
+        public static bool operator ==(UnityObjectId left, UnityObjectId right) => left.Equals(right);
+
+        public static bool operator !=(UnityObjectId left, UnityObjectId right) => !left.Equals(right);
+
+        public override bool Equals(object obj) => obj is UnityObjectId other && Equals(other);
+    }
+
+    internal static class UnityObjectIdentity
+    {
+        public static UnityObjectId GetId(UnityObject obj) => new UnityObjectId(obj);
+
+        public static bool IsValid(UnityObjectId id) => id.IsValid;
+
+#if UNITY_EDITOR
+        public static UnityObject IdToObject(UnityObjectId id) => id.ToObject();
+#endif
+    }
+}

package/{Tests/Runtime/PrefabPoolLifecycleTests.cs.meta → Runtime/UnityObjectIdentity.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 9c6969a47577843fb977ab5e2c7c1ad2
+guid: 082b2708eccfb47e1b78c452d24ec500
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.amanotes.prefabpool",
-  "version": "1.3.0",
+  "version": "2.0.2",
   "displayName": "[Ama] Prefab Pool",
   "description": "Generic object pooling system for Unity",
   "unity": "2022.3",

package/Tests/Runtime/PrefabPool.Test.asmdef

@@ -1,11 +0,0 @@
-{
-    "name": "PrefabPool.Tests",
-    "rootNamespace": "Amanotes.Core",
-    "references": [
-        "PrefabPool",
-        "Unity.PerformanceTesting"
-    ],
-    "optionalUnityReferences": [
-        "TestAssemblies"
-    ]
-}

package/Tests/Runtime/PrefabPool.Test.asmdef.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f4f4c6bd22a404f98bd5cc47335df5d8
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Tests/Runtime/PrefabPoolGroupTests.cs

@@ -1,224 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using NUnit.Framework;
-using UnityEngine;
-using UnityEngine.TestTools;
-using UnityObject = UnityEngine.Object;
-
-namespace Amanotes.Core
-{
-    public class PrefabPoolGroupTests
-    {
-        private PrefabPool _pool;
-        private PoolGroup _groupA;
-        private PoolGroup _groupB;
-        private GameObject _prefabA;
-        private GameObject _prefabB;
-        private Transform _spawnParentA;
-        private Transform _spawnParentB;
-        
-        [SetUp]
-        public void SetUp()
-        {
-            var poolObject = new GameObject("TestPool");
-            _pool = poolObject.AddComponent<PrefabPool>();
-            
-            var spawnParentObjectA = new GameObject("SpawnParentA");
-            _spawnParentA = spawnParentObjectA.transform;
-            
-            var spawnParentObjectB = new GameObject("SpawnParentB");
-            _spawnParentB = spawnParentObjectB.transform;
-            
-            _prefabA = new GameObject("PrefabA");
-            _prefabA.AddComponent<MockPoolPrefab>();
-            
-            _prefabB = new GameObject("PrefabB");
-            _prefabB.AddComponent<MockPoolPrefab>();
-            
-            _groupA = new PoolGroup
-            {
-                id = "GroupA",
-                entries = new List<PoolEntry>
-                {
-                    new PoolEntry
-                    {
-                        id = "PrefabA",
-                        prefab = _prefabA,
-                        prewarmCount = 5
-                    }
-                }
-            };
-            
-            _groupB = new PoolGroup
-            {
-                id = "GroupB",
-                entries = new List<PoolEntry>
-                {
-                    new PoolEntry
-                    {
-                        id = "PrefabB",
-                        prefab = _prefabB,
-                        prewarmCount = 5
-                    }
-                }
-            };
-            
-            _pool.RegisterGroup(_groupA, _spawnParentA);
-            _pool.RegisterGroup(_groupB, _spawnParentB);
-        }
-        
-        [TearDown]
-        public void TearDown()
-        {
-            if (_pool != null)
-            {
-                _pool.DestroyPool();
-                UnityObject.DestroyImmediate(_pool.gameObject);
-            }
-            
-            if (_spawnParentA != null)
-            {
-                UnityObject.DestroyImmediate(_spawnParentA.gameObject);
-            }
-            
-            if (_spawnParentB != null)
-            {
-                UnityObject.DestroyImmediate(_spawnParentB.gameObject);
-            }
-            
-            if (_prefabA != null)
-            {
-                UnityObject.DestroyImmediate(_prefabA);
-            }
-            
-            if (_prefabB != null)
-            {
-                UnityObject.DestroyImmediate(_prefabB);
-            }
-            
-            var allObjects = UnityObject.FindObjectsOfType<GameObject>();
-            foreach (var obj in allObjects)
-            {
-                if (obj.hideFlags == HideFlags.DontSave)
-                {
-                    UnityObject.DestroyImmediate(obj);
-                }
-            }
-        }
-        
-        [UnityTest]
-        public IEnumerator PoolGroupIsolation_MultipleGroups_ObjectsNeverCrossBetweenGroups()
-        {
-            yield return _pool.Initialize();
-            
-            for (int i = 0; i < 100; i++)
-            {
-                var objFromA = _groupA.Get("PrefabA");
-                Assert.IsNotNull(objFromA, $"Iteration {i}: GroupA should return valid GameObject");
-                
-                var objFromB = _groupB.Get("PrefabB");
-                Assert.IsNotNull(objFromB, $"Iteration {i}: GroupB should return valid GameObject");
-                
-                var instanceIdA = objFromA.GetInstanceID();
-                var instanceIdB = objFromB.GetInstanceID();
-                
-                Assert.AreNotEqual(instanceIdA, instanceIdB, 
-                    $"Iteration {i}: Objects from different groups should have different instance IDs");
-                
-                Assert.IsTrue(objFromA.name.Contains("PrefabA"), 
-                    $"Iteration {i}: Object from GroupA should be PrefabA instance");
-                Assert.IsTrue(objFromB.name.Contains("PrefabB"), 
-                    $"Iteration {i}: Object from GroupB should be PrefabB instance");
-                
-                _groupA.Return(objFromA);
-                _groupB.Return(objFromB);
-                
-                var reusedFromA = _groupA.Get("PrefabA");
-                var reusedFromB = _groupB.Get("PrefabB");
-                
-                Assert.AreEqual(instanceIdA, reusedFromA.GetInstanceID(), 
-                    $"Iteration {i}: GroupA should reuse its own objects");
-                Assert.AreEqual(instanceIdB, reusedFromB.GetInstanceID(), 
-                    $"Iteration {i}: GroupB should reuse its own objects");
-                
-                Assert.IsTrue(reusedFromA.name.Contains("PrefabA"), 
-                    $"Iteration {i}: GroupA should never return PrefabB instances");
-                Assert.IsTrue(reusedFromB.name.Contains("PrefabB"), 
-                    $"Iteration {i}: GroupB should never return PrefabA instances");
-                
-                _groupA.Return(reusedFromA);
-                _groupB.Return(reusedFromB);
-            }
-        }
-        
-        [UnityTest]
-        public IEnumerator ReturnGroupRouting_ReturnToGroup_SubsequentGetRetrievesSameInstanceFromSameGroup()
-        {
-            yield return _pool.Initialize();
-            
-            for (int i = 0; i < 100; i++)
-            {
-                var objA1 = _groupA.Get("PrefabA");
-                var objA2 = _groupA.Get("PrefabA");
-                var objB1 = _groupB.Get("PrefabB");
-                var objB2 = _groupB.Get("PrefabB");
-                
-                Assert.IsNotNull(objA1, $"Iteration {i}: GroupA Get 1 should return valid GameObject");
-                Assert.IsNotNull(objA2, $"Iteration {i}: GroupA Get 2 should return valid GameObject");
-                Assert.IsNotNull(objB1, $"Iteration {i}: GroupB Get 1 should return valid GameObject");
-                Assert.IsNotNull(objB2, $"Iteration {i}: GroupB Get 2 should return valid GameObject");
-                
-                var instanceIdA1 = objA1.GetInstanceID();
-                var instanceIdA2 = objA2.GetInstanceID();
-                var instanceIdB1 = objB1.GetInstanceID();
-                var instanceIdB2 = objB2.GetInstanceID();
-                
-                _groupA.Return(objA1);
-                _groupA.Return(objA2);
-                _groupB.Return(objB1);
-                _groupB.Return(objB2);
-                
-                var reusedA1 = _groupA.Get("PrefabA");
-                var reusedA2 = _groupA.Get("PrefabA");
-                var reusedB1 = _groupB.Get("PrefabB");
-                var reusedB2 = _groupB.Get("PrefabB");
-                
-                var reusedInstanceIdsA = new HashSet<int> 
-                { 
-                    reusedA1.GetInstanceID(), 
-                    reusedA2.GetInstanceID() 
-                };
-                var reusedInstanceIdsB = new HashSet<int> 
-                { 
-                    reusedB1.GetInstanceID(), 
-                    reusedB2.GetInstanceID() 
-                };
-                
-                Assert.IsTrue(reusedInstanceIdsA.Contains(instanceIdA1), 
-                    $"Iteration {i}: Object returned to GroupA should be retrieved from GroupA");
-                Assert.IsTrue(reusedInstanceIdsA.Contains(instanceIdA2), 
-                    $"Iteration {i}: Object returned to GroupA should be retrieved from GroupA");
-                
-                Assert.IsTrue(reusedInstanceIdsB.Contains(instanceIdB1), 
-                    $"Iteration {i}: Object returned to GroupB should be retrieved from GroupB");
-                Assert.IsTrue(reusedInstanceIdsB.Contains(instanceIdB2), 
-                    $"Iteration {i}: Object returned to GroupB should be retrieved from GroupB");
-                
-                Assert.IsFalse(reusedInstanceIdsA.Contains(instanceIdB1), 
-                    $"Iteration {i}: GroupA should not return objects from GroupB");
-                Assert.IsFalse(reusedInstanceIdsA.Contains(instanceIdB2), 
-                    $"Iteration {i}: GroupA should not return objects from GroupB");
-                
-                Assert.IsFalse(reusedInstanceIdsB.Contains(instanceIdA1), 
-                    $"Iteration {i}: GroupB should not return objects from GroupA");
-                Assert.IsFalse(reusedInstanceIdsB.Contains(instanceIdA2), 
-                    $"Iteration {i}: GroupB should not return objects from GroupA");
-                
-                _groupA.Return(reusedA1);
-                _groupA.Return(reusedA2);
-                _groupB.Return(reusedB1);
-                _groupB.Return(reusedB2);
-            }
-        }
-    }
-}

package/Tests/Runtime/PrefabPoolGroupTests.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 52ad4e4f94f0b41ff9df7f00bcbdd701
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Tests/Runtime/PrefabPoolLifecycleTests.cs

@@ -1,257 +0,0 @@
-using System.Collections;
-using NUnit.Framework;
-using UnityEngine;
-using UnityEngine.TestTools;
-using UnityObject = UnityEngine.Object;
-
-namespace Amanotes.Core
-{
-    public class PrefabPoolLifecycleTests
-    {
-        private PrefabPool _pool;
-        private GameObject _testPrefab;
-        private PoolGroup _testGroup;
-        private Transform _spawnParent;
-        
-        [SetUp]
-        public void SetUp()
-        {
-            var poolObject = new GameObject("TestPool");
-            _pool = poolObject.AddComponent<PrefabPool>();
-            
-            var spawnParentObject = new GameObject("SpawnParent");
-            _spawnParent = spawnParentObject.transform;
-            
-            _testPrefab = new GameObject("TestPrefab");
-            _testPrefab.AddComponent<MockPoolPrefab>();
-            
-            _testGroup = new PoolGroup
-            {
-                id = "TestGroup",
-                entries = new System.Collections.Generic.List<PoolEntry>
-                {
-                    new PoolEntry
-                    {
-                        id = "TestPrefab",
-                        prefab = _testPrefab,
-                        prewarmCount = 5
-                    }
-                }
-            };
-            
-            _pool.RegisterGroup(_testGroup, _spawnParent);
-        }
-        
-        [TearDown]
-        public void TearDown()
-        {
-            if (_pool != null)
-            {
-                _pool.DestroyPool();
-                UnityObject.DestroyImmediate(_pool.gameObject);
-            }
-            
-            if (_spawnParent != null)
-            {
-                UnityObject.DestroyImmediate(_spawnParent.gameObject);
-            }
-            
-            if (_testPrefab != null)
-            {
-                UnityObject.DestroyImmediate(_testPrefab);
-            }
-            
-            var allObjects = UnityObject.FindObjectsOfType<GameObject>();
-            foreach (var obj in allObjects)
-            {
-                if (obj.hideFlags == HideFlags.DontSave)
-                {
-                    UnityObject.DestroyImmediate(obj);
-                }
-            }
-        }
-        
-        [UnityTest]
-        public IEnumerator PoolObjectRoundTrip_GetReturnGet_ReuseSameInstance()
-        {
-            yield return _pool.Initialize();
-            
-            for (int i = 0; i < 100; i++)
-            {
-                var firstGet = _testGroup.Get("TestPrefab");
-                Assert.IsNotNull(firstGet, $"Iteration {i}: First Get should return valid GameObject");
-                
-                var firstInstanceId = firstGet.GetInstanceID();
-                
-                _testGroup.Return(firstGet);
-                
-                var secondGet = _testGroup.Get("TestPrefab");
-                Assert.IsNotNull(secondGet, $"Iteration {i}: Second Get should return valid GameObject");
-                
-                var secondInstanceId = secondGet.GetInstanceID();
-                
-                Assert.AreEqual(firstInstanceId, secondInstanceId, 
-                    $"Iteration {i}: Get-Return-Get should reuse same instance (validates pooling eliminates instantiation)");
-                
-                _testGroup.Return(secondGet);
-            }
-        }
-        
-        [UnityTest]
-        public IEnumerator LifecycleCallbackInvocation_GetReturnCycle_InvokesOnGetAndOnReturnExactlyOnce()
-        {
-            yield return _pool.Initialize();
-            
-            for (int i = 0; i < 100; i++)
-            {
-                var obj = _testGroup.Get("TestPrefab");
-                Assert.IsNotNull(obj, $"Iteration {i}: Get should return valid GameObject");
-                
-                var mock = obj.GetComponent<MockPoolPrefab>();
-                Assert.IsNotNull(mock, $"Iteration {i}: GameObject should have MockPoolPrefab component");
-                
-                mock.ResetCounts();
-                
-                var objAgain = _testGroup.Get("TestPrefab");
-                var mockAgain = objAgain.GetComponent<MockPoolPrefab>();
-                mockAgain.ResetCounts();
-                
-                _testGroup.Return(obj);
-                
-                Assert.AreEqual(1, mock.returnCallCount, 
-                    $"Iteration {i}: OnReturn should be called exactly once during Return");
-                Assert.AreEqual(0, mock.getCallCount, 
-                    $"Iteration {i}: OnGet should not be called during Return");
-                
-                var reusedObj = _testGroup.Get("TestPrefab");
-                var reusedMock = reusedObj.GetComponent<MockPoolPrefab>();
-                
-                Assert.AreEqual(1, reusedMock.getCallCount, 
-                    $"Iteration {i}: OnGet should be called exactly once during Get");
-                
-                _testGroup.Return(objAgain);
-                _testGroup.Return(reusedObj);
-            }
-        }
-        
-        [UnityTest]
-        public IEnumerator PreallocationCorrectness_PrewarmCount_CreatesExactNumberOfPreallocatedObjects()
-        {
-            for (int iteration = 0; iteration < 100; iteration++)
-            {
-                var prewarmCount = UnityEngine.Random.Range(1, 20);
-                
-                var poolObject = new GameObject($"TestPool_{iteration}");
-                var pool = poolObject.AddComponent<PrefabPool>();
-                
-                var spawnParentObject = new GameObject($"SpawnParent_{iteration}");
-                var spawnParent = spawnParentObject.transform;
-                
-                var prefab = new GameObject($"Prefab_{iteration}");
-                prefab.AddComponent<MockPoolPrefab>();
-                
-                var group = new PoolGroup
-                {
-                    id = $"Group_{iteration}",
-                    entries = new System.Collections.Generic.List<PoolEntry>
-                    {
-                        new PoolEntry
-                        {
-                            id = "TestPrefab",
-                            prefab = prefab,
-                            prewarmCount = prewarmCount
-                        }
-                    }
-                };
-                
-                pool.RegisterGroup(group, spawnParent);
-                
-                yield return pool.Initialize();
-                
-                var retrievedObjects = new System.Collections.Generic.List<GameObject>();
-                
-                for (int i = 0; i < prewarmCount; i++)
-                {
-                    var obj = group.Get("TestPrefab");
-                    Assert.IsNotNull(obj, $"Iteration {iteration}: Should retrieve pre-allocated object {i}");
-                    retrievedObjects.Add(obj);
-                }
-                
-                Assert.AreEqual(prewarmCount, retrievedObjects.Count, 
-                    $"Iteration {iteration}: Should retrieve exactly {prewarmCount} pre-allocated objects");
-                
-                foreach (var obj in retrievedObjects)
-                {
-                    group.Return(obj);
-                }
-                
-                pool.DestroyPool();
-                UnityObject.DestroyImmediate(poolObject);
-                UnityObject.DestroyImmediate(spawnParentObject);
-                UnityObject.DestroyImmediate(prefab);
-            }
-        }
-        
-        [UnityTest]
-        public IEnumerator DynamicPoolExpansion_GetBeyondCapacity_SuccessfullyReturnsValidGameObjects()
-        {
-            for (int iteration = 0; iteration < 100; iteration++)
-            {
-                var initialCapacity = UnityEngine.Random.Range(2, 10);
-                var extraRequests = UnityEngine.Random.Range(5, 15);
-                
-                var poolObject = new GameObject($"TestPool_{iteration}");
-                var pool = poolObject.AddComponent<PrefabPool>();
-                
-                var spawnParentObject = new GameObject($"SpawnParent_{iteration}");
-                var spawnParent = spawnParentObject.transform;
-                
-                var prefab = new GameObject($"Prefab_{iteration}");
-                prefab.AddComponent<MockPoolPrefab>();
-                
-                var group = new PoolGroup
-                {
-                    id = $"Group_{iteration}",
-                    entries = new System.Collections.Generic.List<PoolEntry>
-                    {
-                        new PoolEntry
-                        {
-                            id = "TestPrefab",
-                            prefab = prefab,
-                            prewarmCount = initialCapacity
-                        }
-                    }
-                };
-                
-                pool.RegisterGroup(group, spawnParent);
-                
-                yield return pool.Initialize();
-                
-                var retrievedObjects = new System.Collections.Generic.List<GameObject>();
-                
-                var totalRequests = initialCapacity + extraRequests;
-                
-                for (int i = 0; i < totalRequests; i++)
-                {
-                    var obj = group.Get("TestPrefab");
-                    Assert.IsNotNull(obj, 
-                        $"Iteration {iteration}: Get beyond capacity should succeed (request {i + 1}/{totalRequests})");
-                    retrievedObjects.Add(obj);
-                }
-                
-                Assert.AreEqual(totalRequests, retrievedObjects.Count, 
-                    $"Iteration {iteration}: Should retrieve {totalRequests} objects (capacity {initialCapacity} + expansion {extraRequests})");
-                
-                foreach (var obj in retrievedObjects)
-                {
-                    group.Return(obj);
-                }
-                
-                pool.DestroyPool();
-                UnityObject.DestroyImmediate(poolObject);
-                UnityObject.DestroyImmediate(spawnParentObject);
-                UnityObject.DestroyImmediate(prefab);
-            }
-        }
-    }
-}

package/Tests/Runtime/PrefabPoolPerformanceTests.cs

@@ -1,212 +0,0 @@
-using System.Collections;
-using NUnit.Framework;
-using Unity.PerformanceTesting;
-using UnityEngine;
-using UnityEngine.TestTools;
-using UnityObject = UnityEngine.Object;
-
-namespace Amanotes.Core
-{
-    public class PrefabPoolPerformanceTests
-    {
-        private PrefabPool _pool;
-        private GameObject _testPrefab;
-        private PoolGroup _testGroup;
-        private Transform _spawnParent;
-        
-        [SetUp]
-        public void SetUp()
-        {
-            var poolObject = new GameObject("TestPool");
-            _pool = poolObject.AddComponent<PrefabPool>();
-            
-            var spawnParentObject = new GameObject("SpawnParent");
-            _spawnParent = spawnParentObject.transform;
-            
-            _testPrefab = new GameObject("TestPrefab");
-            _testPrefab.AddComponent<MockPoolPrefab>();
-            
-            _testGroup = new PoolGroup
-            {
-                id = "TestGroup",
-                entries = new System.Collections.Generic.List<PoolEntry>
-                {
-                    new PoolEntry
-                    {
-                        id = "TestPrefab",
-                        prefab = _testPrefab,
-                        prewarmCount = 10
-                    }
-                }
-            };
-            
-            _pool.RegisterGroup(_testGroup, _spawnParent);
-        }
-        
-        [TearDown]
-        public void TearDown()
-        {
-            if (_pool != null)
-            {
-                _pool.DestroyPool();
-                UnityObject.DestroyImmediate(_pool.gameObject);
-            }
-            
-            if (_spawnParent != null)
-            {
-                UnityObject.DestroyImmediate(_spawnParent.gameObject);
-            }
-            
-            if (_testPrefab != null)
-            {
-                UnityObject.DestroyImmediate(_testPrefab);
-            }
-            
-            var allObjects = UnityObject.FindObjectsOfType<GameObject>();
-            foreach (var obj in allObjects)
-            {
-                if (obj.hideFlags == HideFlags.DontSave)
-                {
-                    UnityObject.DestroyImmediate(obj);
-                }
-            }
-        }
-        
-        [UnityTest, Performance]
-        public IEnumerator Performance_GetReturnCycles()
-        {
-            yield return _pool.Initialize();
-            
-            Measure.Method(() =>
-            {
-                for (int i = 0; i < 1000; i++)
-                {
-                    var obj = _testGroup.Get("TestPrefab");
-                    _testGroup.Return(obj);
-                }
-            })
-            .WarmupCount(5)
-            .MeasurementCount(10)
-            .IterationsPerMeasurement(1)
-            .GC()
-            .Run();
-        }
-        
-        [UnityTest, Performance]
-        public IEnumerator Performance_GCAllocation()
-        {
-            yield return _pool.Initialize();
-            
-            Measure.Method(() =>
-            {
-                for (int i = 0; i < 100; i++)
-                {
-                    var obj = _testGroup.Get("TestPrefab");
-                    _testGroup.Return(obj);
-                }
-            })
-            .WarmupCount(5)
-            .MeasurementCount(10)
-            .IterationsPerMeasurement(1)
-            .GC()
-            .Run();
-        }
-        
-        [UnityTest, Performance]
-        public IEnumerator Performance_PoolExpansion()
-        {
-            yield return _pool.Initialize();
-            
-            var retrievedObjects = new System.Collections.Generic.List<GameObject>();
-            
-            for (int i = 0; i < 10; i++)
-            {
-                var obj = _testGroup.Get("TestPrefab");
-                retrievedObjects.Add(obj);
-            }
-            
-            Measure.Method(() =>
-            {
-                for (int i = 0; i < 100; i++)
-                {
-                    var obj = _testGroup.Get("TestPrefab");
-                    retrievedObjects.Add(obj);
-                }
-            })
-            .WarmupCount(2)
-            .MeasurementCount(10)
-            .IterationsPerMeasurement(1)
-            .GC()
-            .Run();
-            
-            foreach (var obj in retrievedObjects)
-            {
-                _testGroup.Return(obj);
-            }
-        }
-        
-        [UnityTest, Performance]
-        public IEnumerator Performance_ParentTransformOverhead()
-        {
-            yield return _pool.Initialize();
-            
-            var withParentTime = 0.0;
-            var withoutParentTime = 0.0;
-            
-            Measure.Method(() =>
-            {
-                for (int i = 0; i < 100; i++)
-                {
-                    var obj = _testGroup.Get("TestPrefab");
-                    _testGroup.Return(obj);
-                }
-            })
-            .WarmupCount(5)
-            .MeasurementCount(10)
-            .IterationsPerMeasurement(1)
-            .GC()
-            .Run();
-            
-            var poolObjectNoParent = new GameObject("TestPoolNoParent");
-            var poolNoParent = poolObjectNoParent.AddComponent<PrefabPool>();
-            
-            var prefabNoParent = new GameObject("TestPrefabNoParent");
-            prefabNoParent.AddComponent<MockPoolPrefab>();
-            
-            var groupNoParent = new PoolGroup
-            {
-                id = "TestGroupNoParent",
-                entries = new System.Collections.Generic.List<PoolEntry>
-                {
-                    new PoolEntry
-                    {
-                        id = "TestPrefab",
-                        prefab = prefabNoParent,
-                        prewarmCount = 10
-                    }
-                }
-            };
-            
-            poolNoParent.RegisterGroup(groupNoParent, null);
-            yield return poolNoParent.Initialize();
-            
-            Measure.Method(() =>
-            {
-                for (int i = 0; i < 100; i++)
-                {
-                    var obj = groupNoParent.Get("TestPrefab");
-                    groupNoParent.Return(obj);
-                }
-            })
-            .WarmupCount(5)
-            .MeasurementCount(10)
-            .IterationsPerMeasurement(1)
-            .GC()
-            .Run();
-            
-            poolNoParent.DestroyPool();
-            UnityObject.DestroyImmediate(poolObjectNoParent);
-            UnityObject.DestroyImmediate(prefabNoParent);
-        }
-    }
-}

package/Tests/Runtime/PrefabPoolPerformanceTests.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 16aa39925a01643c3894a56145c56a21
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Tests/Runtime/PrefabPoolTestsSetup.cs

@@ -1,14 +0,0 @@
-using NUnit.Framework;
-using Amanotes.Core;
-
-namespace Amanotes.Core
-{
-    public class PrefabPoolTestsSetup
-    {
-        [Test]
-        public void TestInfrastructureVerification()
-        {
-            Assert.IsTrue(true, "PrefabPool test infrastructure is working");
-        }
-    }
-}

package/Tests/Runtime/PrefabPoolTestsSetup.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: e61f89af128b84b429ac96d86bd0554f
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Tests/Runtime/TestHelpers/MockPoolPrefab.cs

@@ -1,26 +0,0 @@
-using UnityEngine;
-
-namespace Amanotes.Core
-{
-    public class MockPoolPrefab : MonoBehaviour, IPoolPrefab
-    {
-        public int getCallCount;
-        public int returnCallCount;
-        
-        public void OnGet()
-        {
-            getCallCount++;
-        }
-        
-        public void OnReturn()
-        {
-            returnCallCount++;
-        }
-        
-        public void ResetCounts()
-        {
-            getCallCount = 0;
-            returnCallCount = 0;
-        }
-    }
-}

package/Tests/Runtime/TestHelpers/MockPoolPrefab.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8e7402f0e0f2440338429ebbb480ffc3
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Tests/Runtime/TestHelpers.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 2ce9db2584cc4444f930d1ab257afcaf
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Tests/Runtime.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f4d670095ee40448b93f6f5dbc2c07e6
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Tests.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 518067fd8d1ac4415b0468af746cce4a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: