com.valectric.mooserunner 2.1.16 → 2.1.18

package/Samples~/Demos/MooseRunner.Demo.CancellationTokens.Tests/SetupTeardownCancellationTests.cs

@@ -21,6 +21,7 @@ namespace MooseRunner.Internal.Tests
         [OneTimeSetUp]
         public async Task OneTimeSetupMethod(CancellationToken ct)
         {
+            MooseRunnerSampleVersionCheck.EnsureSingleVersion();
             Debug.Log("[OneTimeSetUp] OneTimeSetUp started - 5 second delay");
             Debug.Log("[OneTimeSetUp] Click STOP during OneTimeSetUp to test cancellation");
             await Task.Delay(5000, ct);

package/Samples~/Demos/MooseRunner.Demo.ErrorHandling.Tests/ErrorHandelingTest.cs

@@ -27,6 +27,7 @@ namespace MooseRunner.Internal.Tests
         [OneTimeSetUp]
         public async Task SetUpOnce()
         {
+            MooseRunnerSampleVersionCheck.EnsureSingleVersion();
             await MooseRunnerFacade.Instance.LoadSceneFromNameAsync("OneCameraScene");
         }
 

package/Samples~/Demos/MooseRunner.Demo.RealUseCase/RealUseCaseTest.cs

@@ -27,6 +27,7 @@ namespace MooseRunner.Internal.Tests
         [OneTimeSetUp]
         public async Task SetUpOnce()
         {
+            MooseRunnerSampleVersionCheck.EnsureSingleVersion();
             await MooseRunnerFacade.Instance.LoadSceneFromNameAsync("RealUseCaseScene");
         }
 
@@ -210,14 +211,17 @@ namespace MooseRunner.Internal.Tests
         /// Also demonstrates SessionRecorder usage: records the test, then asks Gemini to describe what happened.
         /// When Unity Recorder isn't installed every facade call throws InvalidOperationException with install
         /// instructions; the catches log the message so all three throw sites surface in the test output.
+        /// The Stop and Analyze calls run in a finally block so they fire even when the ghost-cat scenario
+        /// fails — important for demonstrating all three throw sites in a customer install.
         /// </summary>
         [Test]
         public async Task TestDying()
         {
-            // SessionRecorder soft-dep: start a recording. Throws with install instructions if
-            // com.unity.recorder isn't installed.
             SessionInfo recordingSession = null;
             string outputPath = Path.Combine(Application.dataPath, "../.mooserunner/Recordings/TestDying");
+
+            // SessionRecorder soft-dep: start a recording. Throws with install instructions if
+            // com.unity.recorder isn't installed.
             try
             {
                 var cfg = new SessionRecordingConfig(Camera.main, outputPath);
@@ -229,92 +233,90 @@ namespace MooseRunner.Internal.Tests
                 Debug.LogWarning("[SessionRecorder] StartRecordingAsync threw: " + ex.Message);
             }
 
-            // Load the "Ghost_Cat" prefab from the Resources folder
-            GameObject ghostCatPrefab = Resources.Load<GameObject>("Ghost_Cat");
-            Assert.IsNotNull(ghostCatPrefab, "The Ghost_Cat prefab could not be found in the Resources folder.");
-
-            // Spawn the "Ghost_Cat" prefab into the scene
-            GameObject ghostCatInstance =
-                Object.Instantiate(ghostCatPrefab, new Vector3(0f, 2f, 0f), Quaternion.identity);
-            Assert.IsNotNull(ghostCatInstance, "Failed to instantiate the Ghost_Cat prefab.");
+            try
+            {
+                // Load the "Ghost_Cat" prefab from the Resources folder
+                GameObject ghostCatPrefab = Resources.Load<GameObject>("Ghost_Cat");
+                Assert.IsNotNull(ghostCatPrefab, "The Ghost_Cat prefab could not be found in the Resources folder.");
 
-            // Get the Enemy component
-            Enemy enemyComponent = ghostCatInstance.GetComponent<Enemy>();
-            Assert.IsNotNull(enemyComponent, "The Ghost_Cat instance does not have an Enemy component.");
+                // Spawn the "Ghost_Cat" prefab into the scene
+                GameObject ghostCatInstance =
+                    Object.Instantiate(ghostCatPrefab, new Vector3(0f, 2f, 0f), Quaternion.identity);
+                Assert.IsNotNull(ghostCatInstance, "Failed to instantiate the Ghost_Cat prefab.");
 
-            // Create a box object
-            GameObject box = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            box.transform.position =
-                new Vector3(ghostCatInstance.transform.position.x, 0.5f,
-                    0.5f); // Position the wall directly in front of the Ghost_Cat
+                // Get the Enemy component
+                Enemy enemyComponent = ghostCatInstance.GetComponent<Enemy>();
+                Assert.IsNotNull(enemyComponent, "The Ghost_Cat instance does not have an Enemy component.");
 
-            // Add a Rigidbody and Collider component to ensure collision detection works
-            box.AddComponent<BoxCollider>();
-            Rigidbody wallRigidbody = box.AddComponent<Rigidbody>();
-            wallRigidbody.isKinematic = true;
+                // Create a box object
+                GameObject box = GameObject.CreatePrimitive(PrimitiveType.Cube);
+                box.transform.position =
+                    new Vector3(ghostCatInstance.transform.position.x, 0.5f,
+                        0.5f); // Position the wall directly in front of the Ghost_Cat
 
-            // Create a red block simulating fire
-            GameObject fire = GameObject.CreatePrimitive(PrimitiveType.Cube);
-            fire.name = "Fire"; // Rename the block to "Fire"
-            fire.transform.position =
-                new Vector3(ghostCatInstance.transform.position.x, 0f, 2.5f); // Position the block appropriately
-            fire.transform.localScale = new Vector3(1f, 1f, 3f); // Scale the box to 2 along the x-axis
+                // Add a Rigidbody and Collider component to ensure collision detection works
+                box.AddComponent<BoxCollider>();
+                Rigidbody wallRigidbody = box.AddComponent<Rigidbody>();
+                wallRigidbody.isKinematic = true;
 
-            // Change the color to red
-            fire.GetComponent<Renderer>().material.color = Color.red;
+                // Create a red block simulating fire
+                GameObject fire = GameObject.CreatePrimitive(PrimitiveType.Cube);
+                fire.name = "Fire"; // Rename the block to "Fire"
+                fire.transform.position =
+                    new Vector3(ghostCatInstance.transform.position.x, 0f, 2.5f);
+                fire.transform.localScale = new Vector3(1f, 1f, 3f);
 
-            // Add a Box Collider to detect collisions
-            BoxCollider collider = fire.AddComponent<BoxCollider>();
-            collider.isTrigger = true; // Set the collider to be a trigger
+                fire.GetComponent<Renderer>().material.color = Color.red;
 
-            // Add a custom FireComponent to handle collision logic
-            fire.AddComponent<FireComponent>();
+                BoxCollider collider = fire.AddComponent<BoxCollider>();
+                collider.isTrigger = true;
 
-            // Start the Ghost_Cat moving towards the wall
-            enemyComponent.moveForward = true;
+                fire.AddComponent<FireComponent>();
 
-            // Wait for the next frame to begin the simulation
-            await Task.Yield();
+                enemyComponent.moveForward = true;
 
-            // Simulate falling for 7 seconds
-            float initialY = ghostCatInstance.transform.position.y;
-            await WaitForSecondsUnity(7f);
+                await Task.Yield();
 
-            // Stop the character after simulation ends
-            enemyComponent.moveForward = false;
+                float initialY = ghostCatInstance.transform.position.y;
+                await WaitForSecondsUnity(7f);
 
-            // SessionRecorder soft-dep: stop recording. Throws the same install-instruction
-            // message when Recorder isn't installed.
-            try
-            {
-                SessionRecorderFacade.Instance.StopRecording();
-                Debug.Log("[SessionRecorder] Stopped recording");
-            }
-            catch (InvalidOperationException ex)
-            {
-                Debug.LogWarning("[SessionRecorder] StopRecording threw: " + ex.Message);
-            }
+                enemyComponent.moveForward = false;
 
-            // SessionRecorder soft-dep: video analysis via Gemini. Throws the install-instruction
-            // message when Recorder isn't installed (different from a Gemini-not-configured error
-            // — that one only surfaces once we get past the Recorder gate).
-            try
-            {
-                string sessionPath = recordingSession?.SessionPath ?? outputPath;
-                var result = await SessionRecorderFacade.Instance.AnalyzeVideoSegmentAsync(
-                    sessionPath, 0.0, 5.0,
-                    "Did the Ghost_Cat catch fire and die?",
-                    CancellationToken.None);
-                Debug.Log("[SessionRecorder] Gemini analysis: " + result.Summary);
+                Assert.IsTrue(ghostCatInstance == null || !ghostCatInstance.activeSelf,
+                    "The Ghost_Cat was not destroyed or deactivated.");
             }
-            catch (InvalidOperationException ex)
+            finally
             {
-                Debug.LogWarning("[SessionRecorder] AnalyzeVideoSegmentAsync threw: " + ex.Message);
+                // SessionRecorder soft-dep: stop recording. Throws the same install-instruction
+                // message when Recorder isn't installed. In finally so it fires even when the
+                // scenario above failed (e.g. prefab/component resolution issues).
+                try
+                {
+                    SessionRecorderFacade.Instance.StopRecording();
+                    Debug.Log("[SessionRecorder] Stopped recording");
+                }
+                catch (InvalidOperationException ex)
+                {
+                    Debug.LogWarning("[SessionRecorder] StopRecording threw: " + ex.Message);
+                }
+
+                // SessionRecorder soft-dep: video analysis via Gemini. Same install-instruction
+                // message when Recorder isn't installed (different from a Gemini-not-configured
+                // error — that one only surfaces once we get past the Recorder gate).
+                try
+                {
+                    string sessionPath = recordingSession?.SessionPath ?? outputPath;
+                    var result = await SessionRecorderFacade.Instance.AnalyzeVideoSegmentAsync(
+                        sessionPath, 0.0, 5.0,
+                        "Did the Ghost_Cat catch fire and die?",
+                        CancellationToken.None);
+                    Debug.Log("[SessionRecorder] Gemini analysis: " + result.Summary);
+                }
+                catch (InvalidOperationException ex)
+                {
+                    Debug.LogWarning("[SessionRecorder] AnalyzeVideoSegmentAsync threw: " + ex.Message);
+                }
             }
-
-            // Check if the entity is destroyed or marked as "dead"
-            Assert.IsTrue(ghostCatInstance == null || !ghostCatInstance.activeSelf,
-                "The Ghost_Cat was not destroyed or deactivated.");
         }
 
         /// <summary>

package/Samples~/Demos/MooseRunner.Demo.Support/MooseRunnerSampleVersionCheck.cs

@@ -0,0 +1,57 @@
+using System;
+using System.IO;
+using System.Linq;
+using UnityEngine;
+
+namespace MooseRunner.Internal.Tests
+{
+    /// <summary>
+    /// Detects duplicate MooseRunner sample-version folders in Assets/Samples/.
+    /// Unity's UPM Sample import creates a new <c>Assets/Samples/MooseRunner/&lt;version&gt;/...</c>
+    /// folder on every upgrade and never deletes the previous one. The duplicate .cs files
+    /// share class FQNs (e.g. <c>MooseRunner.Internal.Tests.Enemy</c>) and stable .meta GUIDs,
+    /// which produces a "is not derived from MonoBehaviour or ScriptableObject!" runtime
+    /// error when prefabs instantiate. Called from each sample test's OneTimeSetUp so the
+    /// check fires only when the customer actually uses the samples.
+    /// </summary>
+    public static class MooseRunnerSampleVersionCheck
+    {
+        private static bool _alreadyChecked;
+        private const string SamplesRoot = "Assets/Samples/MooseRunner";
+
+        /// <summary>
+        /// Throws <see cref="InvalidOperationException"/> if multiple MooseRunner sample-version
+        /// folders are present. First call performs the scan; subsequent calls within the same
+        /// domain are no-ops (the flag resets on domain reload, which is fine — the check is
+        /// idempotent and cheap).
+        /// </summary>
+        public static void EnsureSingleVersion()
+        {
+            if (_alreadyChecked) return;
+            _alreadyChecked = true;
+
+            if (!Directory.Exists(SamplesRoot)) return;
+
+            var versionDirs = Directory.GetDirectories(SamplesRoot);
+            if (versionDirs.Length <= 1) return;
+
+            var sortedFolders = versionDirs
+                .Select(Path.GetFileName)
+                .OrderBy(n => n)
+                .Select(n => "  " + SamplesRoot + "/" + n);
+
+            string msg =
+                "Multiple MooseRunner sample versions detected. Unity's UPM 'Reimport Sample' " +
+                "creates a new versioned folder on every package upgrade and never deletes the " +
+                "previous one. Duplicate .cs files with the same class FQN and stable .meta GUIDs " +
+                "produce the runtime error \"... is not derived from MonoBehaviour or ScriptableObject!\" " +
+                "when prefabs instantiate.\n" +
+                "\n" +
+                "Found:\n" + string.Join("\n", sortedFolders) + "\n" +
+                "\n" +
+                "Fix: delete all but the newest folder under Assets/Samples/MooseRunner/, then re-run.";
+            Debug.LogError(msg);
+            throw new InvalidOperationException(msg);
+        }
+    }
+}

package/Samples~/Demos/MooseRunner.Demo.Support/MooseRunnerSampleVersionCheck.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fb03d23dca7f786428fa1f8e5887bf4b

package/Samples~/Demos/MooseRunner.Demo.Tests/DummyTestBase1.cs

@@ -21,6 +21,7 @@ namespace MooseRunner.Internal.Tests
         [OneTimeSetUp]
         public async Task SetUpOnce()
         {
+            MooseRunnerSampleVersionCheck.EnsureSingleVersion();
             await MooseRunnerFacade.Instance.LoadSceneFromNameAsync("OneCameraScene");
         }
 

package/Samples~/Demos/MooseRunner.Demo.Tests/DummyTestClass1.cs

@@ -29,6 +29,7 @@ namespace MooseRunner.Internal.Tests
         [OneTimeSetUp]
         public new async Task SetUpOnce()
         {
+            MooseRunnerSampleVersionCheck.EnsureSingleVersion();
             await MooseRunnerFacade.Instance.LoadSceneFromNameAsync("OneCameraScene");
         }
 

package/Samples~/Demos/MooseRunner.Demo.Tests/DummyTestClass2.cs

@@ -22,6 +22,7 @@ namespace MooseRunner.Internal.Tests
         [OneTimeSetUp]
         public async Task SetUpOnce()
         {
+            MooseRunnerSampleVersionCheck.EnsureSingleVersion();
             await MooseRunnerFacade.Instance.LoadSceneFromNameAsync("OneCameraScene");
         }
 

package/Samples~/Demos/MooseRunner.Demo.Tests/InstanceHandlingVerificationTest.cs

@@ -27,6 +27,7 @@ namespace MooseRunner.Internal.Tests
         [OneTimeSetUp]
         public void OneTimeSetUpMethod()
         {
+            MooseRunnerSampleVersionCheck.EnsureSingleVersion();
             // OneTimeSetUp should get a fresh instance, so _instanceId should be 99 (default)
             Assert.AreEqual(99, _instanceId, "OneTimeSetUp should start with default _instanceId = 99 (fresh instance)");
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.valectric.mooserunner",
-  "version": "2.1.16",
+  "version": "2.1.18",
   "displayName": "MooseRunner",
   "description": "MooseRunner boosts PlayMode testing with Hot Reload, MCP for AIs, timescale control, and Task support. It enables rapid iteration, auto test reruns, full documentation and dedicated support.",
   "unity": "6000.2",