@mflrevan/ucp 0.5.2 → 0.6.0

package/README.md

@@ -1,6 +1,6 @@
 # @mflrevan/ucp
 
-Version `0.5.2` of the Unity Control Protocol CLI.
+Version `0.6.0` of the Unity Control Protocol CLI.
 
 This package installs the `ucp` command, downloads the matching published binary for your platform during `postinstall`, and ships the matching Unity bridge payload inside the npm package.
 

package/bridge/com.ucp.bridge/Editor/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("UCP.Bridge.Editor.Tests")]

package/bridge/com.ucp.bridge/Editor/AssemblyInfo.cs.meta

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

package/bridge/com.ucp.bridge/Editor/Bridge/BridgeServer.cs

@@ -26,7 +26,7 @@ namespace UCP.Bridge
         private const int DefaultPort = 21342;
         private const int MaxPort = 21352;
         private const int MaxConnections = 4;
-        private const string ProtocolVersion = "0.5.2";
+        private const string ProtocolVersion = "0.6.0";
 
         private static TcpListener s_listener;
         private static CancellationTokenSource s_cts;
@@ -145,6 +145,15 @@ namespace UCP.Bridge
             // Hierarchy Operations
             HierarchyController.Register(s_router);
 
+            // Transform authoring (move/rotate/scale/look-at, bulk read)
+            TransformController.Register(s_router);
+
+            // Spatial queries (raycast/overlap/bounds/ground/nearest)
+            SpatialController.Register(s_router);
+
+            // Composed visual perception (capture/isolate/orbit)
+            ViewController.Register(s_router);
+
             // Asset Management
             AssetController.Register(s_router);
             ImporterController.Register(s_router);

package/bridge/com.ucp.bridge/Editor/Compatibility/UnityObjectCompat.cs

@@ -1,13 +1,39 @@
 using UnityEditor;
 using UnityEngine;
+using UnityEngine.SceneManagement;
 
 namespace UCP.Bridge
 {
     internal static class UnityObjectCompat
     {
+        public static int GetId(this Object obj)
+        {
+#if UNITY_6000_5_OR_NEWER
+            return unchecked((int)EntityId.ToULong(obj.GetEntityId()));
+#else
+            return obj.GetInstanceID();
+#endif
+        }
+
+        public static long GetSceneHandle(Scene scene)
+        {
+#if UNITY_6000_5_OR_NEWER
+            return unchecked((long)scene.handle.GetRawData());
+#else
+            // On 6000.0–6000.4, Scene.handle is a SceneHandle with implicit int and
+            // uint operators; widening straight to long is ambiguous (CS0457). Pin the
+            // int conversion explicitly — handles are 32-bit on these versions.
+            return (int)scene.handle;
+#endif
+        }
+
         public static Object ResolveByInstanceId(int instanceId)
         {
+#if UNITY_6000_5_OR_NEWER
+            return EditorUtility.EntityIdToObject(EntityId.FromULong(unchecked((ulong)instanceId)));
+#else
             return EditorUtility.InstanceIDToObject(instanceId);
+#endif
         }
 
         public static T ResolveByInstanceId<T>(int instanceId) where T : Object

package/bridge/com.ucp.bridge/Editor/Controllers/AssetController.cs

@@ -125,7 +125,7 @@ namespace UCP.Bridge
                 ["name"] = asset.name,
                 ["type"] = asset.GetType().Name,
                 ["fullType"] = asset.GetType().FullName,
-                ["instanceId"] = asset.GetInstanceID(),
+                ["instanceId"] = asset.GetId(),
                 ["guid"] = AssetDatabase.AssetPathToGUID(assetPath)
             };
 
@@ -496,7 +496,7 @@ namespace UCP.Bridge
                 ["status"] = "ok",
                 ["path"] = assetPath,
                 ["type"] = soType.Name,
-                ["instanceId"] = instance.GetInstanceID()
+                ["instanceId"] = instance.GetId()
             };
         }
 

package/bridge/com.ucp.bridge/Editor/Controllers/EditorModalGuard.cs

@@ -0,0 +1,60 @@
+using UnityEditor;
+using UnityEditor.SceneManagement;
+using UnityEngine.SceneManagement;
+
+namespace UCP.Bridge
+{
+    /// <summary>
+    /// Centralizes editor operations that must stay non-blocking when the bridge drives
+    /// the editor headlessly.
+    ///
+    /// Bridge commands run on the main thread via EditorApplication.update. Any modal
+    /// dialog (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo,
+    /// EditorUtility.DisplayDialog, file/folder panels, ...) blocks that loop with no user
+    /// present to dismiss it, hanging every queued command and timing out the CLI. Bridge
+    /// code must therefore never call a modal API. Scene saving is the most common trap, so
+    /// it lives here behind a single audited, modal-free implementation shared by every
+    /// controller instead of being copy-pasted per controller.
+    /// </summary>
+    internal static class EditorModalGuard
+    {
+        /// <summary>
+        /// Saves every loaded dirty scene without prompting. Dirty untitled scenes have no
+        /// path to save to; they are discarded (replaced with a fresh empty scene) when
+        /// <paramref name="discardUntitled"/> is true, otherwise an exception is thrown so
+        /// the caller surfaces a clear error instead of silently losing work or blocking on
+        /// a save dialog.
+        /// </summary>
+        public static void SaveOpenDirtyScenes(bool saveDirtyScenes, bool discardUntitled)
+        {
+            if (!saveDirtyScenes)
+                return;
+
+            var requiresUntitledDiscard = false;
+
+            for (var index = 0; index < SceneManager.sceneCount; index++)
+            {
+                var scene = SceneManager.GetSceneAt(index);
+                if (!scene.isLoaded || !scene.isDirty)
+                    continue;
+
+                if (string.IsNullOrEmpty(scene.path))
+                {
+                    if (!discardUntitled)
+                        throw new System.InvalidOperationException("Dirty untitled scene cannot be auto-saved. Retry with discardUntitled=true.");
+
+                    requiresUntitledDiscard = true;
+                    continue;
+                }
+
+                if (!EditorSceneManager.SaveScene(scene))
+                    throw new System.InvalidOperationException($"Failed to auto-save dirty scene: {scene.path}");
+
+                SceneChangeTracker.ClearScene(scene);
+            }
+
+            if (requiresUntitledDiscard)
+                EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
+        }
+    }
+}

package/bridge/com.ucp.bridge/Editor/Controllers/EditorModalGuard.cs.meta

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

package/bridge/com.ucp.bridge/Editor/Controllers/HierarchyController.cs

@@ -26,7 +26,19 @@ namespace UCP.Bridge
             if (p != null && p.TryGetValue("name", out var nameObj) && nameObj != null)
                 name = nameObj.ToString();
 
-            var go = new GameObject(name);
+            // Optional primitive: build a Cube/Sphere/etc. with mesh + collider in one step.
+            // Without this an agent has to hand-assemble MeshFilter + MeshRenderer and somehow
+            // reference the built-in mesh, which is not practical over the CLI.
+            GameObject go;
+            if (p != null && p.TryGetValue("primitive", out var primObj) && primObj != null)
+            {
+                go = GameObject.CreatePrimitive(ParsePrimitive(primObj.ToString()));
+                go.name = name;
+            }
+            else
+            {
+                go = new GameObject(name);
+            }
             Undo.RegisterCreatedObjectUndo(go, "UCP Create GameObject");
 
             // Optional parent
@@ -61,7 +73,7 @@ namespace UCP.Bridge
             return new Dictionary<string, object>
             {
                 ["status"] = "ok",
-                ["instanceId"] = go.GetInstanceID(),
+                ["instanceId"] = go.GetId(),
                 ["name"] = go.name
             };
         }
@@ -140,7 +152,12 @@ namespace UCP.Bridge
                 string prefabPath = prefabObj.ToString();
                 var prefab = AssetDatabase.LoadAssetAtPath<GameObject>(prefabPath);
                 if (prefab == null)
-                    throw new ArgumentException($"Prefab not found: {prefabPath}");
+                {
+                    var hint = LooksLikePrimitive(prefabPath)
+                        ? " To create a built-in primitive, use object create with a primitive instead (e.g. `ucp object create MyCube --primitive Cube`); instantiate is only for prefab assets under Assets/."
+                        : string.Empty;
+                    throw new ArgumentException($"Prefab not found: {prefabPath}.{hint}");
+                }
                 source = prefab;
             }
             // Instantiate from existing scene object (clone)
@@ -192,7 +209,7 @@ namespace UCP.Bridge
             return new Dictionary<string, object>
             {
                 ["status"] = "ok",
-                ["instanceId"] = instance.GetInstanceID(),
+                ["instanceId"] = instance.GetId(),
                 ["name"] = instance.name
             };
         }
@@ -267,6 +284,40 @@ namespace UCP.Bridge
             };
         }
 
+        private static bool LooksLikePrimitive(string path)
+        {
+            if (string.IsNullOrEmpty(path)) return false;
+            var token = path.Replace("PrimitiveType.", "").Trim();
+            switch (token.ToLowerInvariant())
+            {
+                case "cube":
+                case "sphere":
+                case "capsule":
+                case "cylinder":
+                case "plane":
+                case "quad":
+                    return true;
+                default:
+                    return path.IndexOf("PrimitiveType", System.StringComparison.OrdinalIgnoreCase) >= 0;
+            }
+        }
+
+        private static PrimitiveType ParsePrimitive(string value)
+        {
+            switch (value.Trim().ToLowerInvariant())
+            {
+                case "cube": return PrimitiveType.Cube;
+                case "sphere": return PrimitiveType.Sphere;
+                case "capsule": return PrimitiveType.Capsule;
+                case "cylinder": return PrimitiveType.Cylinder;
+                case "plane": return PrimitiveType.Plane;
+                case "quad": return PrimitiveType.Quad;
+                default:
+                    throw new ArgumentException(
+                        $"Unknown primitive '{value}'. Use one of: Cube, Sphere, Capsule, Cylinder, Plane, Quad.");
+            }
+        }
+
         private static Type ResolveComponentType(string typeName)
         {
             // Try exact match first
@@ -314,7 +365,7 @@ namespace UCP.Bridge
 
         private static GameObject FindInHierarchy(GameObject go, int instanceId)
         {
-            if (go.GetInstanceID() == instanceId) return go;
+            if (go.GetId() == instanceId) return go;
             for (int i = 0; i < go.transform.childCount; i++)
             {
                 var found = FindInHierarchy(go.transform.GetChild(i).gameObject, instanceId);

package/bridge/com.ucp.bridge/Editor/Controllers/MaterialController.cs

@@ -50,7 +50,7 @@ namespace UCP.Bridge
                 ["path"] = path,
                 ["name"] = material.name,
                 ["shader"] = shader.name,
-                ["instanceId"] = material.GetInstanceID()
+                ["instanceId"] = material.GetId()
             };
         }
 
@@ -278,7 +278,7 @@ namespace UCP.Bridge
                         {
                             ["name"] = tex.name,
                             ["path"] = texPath,
-                            ["instanceId"] = tex.GetInstanceID()
+                            ["instanceId"] = tex.GetId()
                         };
                     }
                     return null;

package/bridge/com.ucp.bridge/Editor/Controllers/ObjectLocator.cs

@@ -0,0 +1,207 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace UCP.Bridge
+{
+    /// <summary>
+    /// Shared GameObject resolution for the spatial/visual controllers.
+    ///
+    /// A target may be addressed three ways, tried in priority order:
+    ///   1. instanceId (int)   — canonical, survives nothing but a domain reload; preferred.
+    ///   2. path (string)      — hierarchy path "Root/Child/Leaf" (leading '/' optional),
+    ///                           resolved across all loaded scenes; survives reloads.
+    ///   3. name (string)      — first GameObject whose name matches; ambiguous under
+    ///                           duplicates, so it is the last resort.
+    ///
+    /// instanceId stays the deterministic handle. path/name are convenience fallbacks so an
+    /// agent does not have to re-snapshot after every reload just to re-acquire an id.
+    /// </summary>
+    internal static class ObjectLocator
+    {
+        /// <summary>
+        /// Resolve a GameObject from a params dictionary using whichever of
+        /// instanceId / id / path / name is present (in that priority order).
+        /// Throws ArgumentException if none are present or nothing resolves.
+        /// </summary>
+        internal static GameObject Resolve(Dictionary<string, object> p)
+        {
+            if (p == null)
+                throw new ArgumentException("Missing target: provide 'instanceId', 'path', or 'name'");
+
+            if ((p.TryGetValue("instanceId", out var idObj) || p.TryGetValue("id", out idObj)) && idObj != null)
+            {
+                var id = Convert.ToInt32(idObj);
+                var byId = FindByInstanceId(id);
+                if (byId != null)
+                    return byId;
+                throw new ArgumentException($"GameObject not found for instanceId {id}");
+            }
+
+            if (p.TryGetValue("path", out var pathObj) && pathObj != null)
+            {
+                var path = pathObj.ToString();
+                var byPath = FindByPath(path);
+                if (byPath != null)
+                    return byPath;
+                throw new ArgumentException($"GameObject not found for path '{path}'");
+            }
+
+            if (p.TryGetValue("name", out var nameObj) && nameObj != null)
+            {
+                var name = nameObj.ToString();
+                var byName = FindByName(name);
+                if (byName != null)
+                    return byName;
+                throw new ArgumentException($"GameObject not found for name '{name}'");
+            }
+
+            throw new ArgumentException("Missing target: provide 'instanceId', 'path', or 'name'");
+        }
+
+        internal static GameObject FindByInstanceId(int instanceId)
+        {
+            var direct = UnityObjectCompat.ResolveByInstanceId<GameObject>(instanceId);
+            if (direct != null)
+                return direct;
+
+            for (var i = 0; i < SceneManager.sceneCount; i++)
+            {
+                var scene = SceneManager.GetSceneAt(i);
+                if (!scene.isLoaded)
+                    continue;
+                foreach (var root in scene.GetRootGameObjects())
+                {
+                    var found = FindInHierarchyById(root, instanceId);
+                    if (found != null)
+                        return found;
+                }
+            }
+
+            return null;
+        }
+
+        private static GameObject FindInHierarchyById(GameObject go, int instanceId)
+        {
+            if (go.GetId() == instanceId)
+                return go;
+            foreach (Transform child in go.transform)
+            {
+                var found = FindInHierarchyById(child.gameObject, instanceId);
+                if (found != null)
+                    return found;
+            }
+            return null;
+        }
+
+        internal static GameObject FindByPath(string path)
+        {
+            if (string.IsNullOrEmpty(path))
+                return null;
+
+            var trimmed = path.Trim('/');
+            var segments = trimmed.Split('/');
+            if (segments.Length == 0)
+                return null;
+
+            for (var i = 0; i < SceneManager.sceneCount; i++)
+            {
+                var scene = SceneManager.GetSceneAt(i);
+                if (!scene.isLoaded)
+                    continue;
+                foreach (var root in scene.GetRootGameObjects())
+                {
+                    if (root.name != segments[0])
+                        continue;
+                    var resolved = WalkPath(root.transform, segments, 1);
+                    if (resolved != null)
+                        return resolved;
+                }
+            }
+
+            return null;
+        }
+
+        private static GameObject WalkPath(Transform current, string[] segments, int index)
+        {
+            if (index >= segments.Length)
+                return current.gameObject;
+
+            foreach (Transform child in current)
+            {
+                if (child.name == segments[index])
+                {
+                    var resolved = WalkPath(child, segments, index + 1);
+                    if (resolved != null)
+                        return resolved;
+                }
+            }
+
+            return null;
+        }
+
+        internal static GameObject FindByName(string name)
+        {
+            if (string.IsNullOrEmpty(name))
+                return null;
+
+            for (var i = 0; i < SceneManager.sceneCount; i++)
+            {
+                var scene = SceneManager.GetSceneAt(i);
+                if (!scene.isLoaded)
+                    continue;
+                foreach (var root in scene.GetRootGameObjects())
+                {
+                    var found = FindInHierarchyByName(root, name);
+                    if (found != null)
+                        return found;
+                }
+            }
+
+            return null;
+        }
+
+        private static GameObject FindInHierarchyByName(GameObject go, string name)
+        {
+            if (go.name == name)
+                return go;
+            foreach (Transform child in go.transform)
+            {
+                var found = FindInHierarchyByName(child.gameObject, name);
+                if (found != null)
+                    return found;
+            }
+            return null;
+        }
+
+        /// <summary>Compute a world-space AABB encapsulating the object's renderers and colliders.</summary>
+        internal static bool TryComputeWorldBounds(GameObject target, bool includeChildren, out Bounds bounds)
+        {
+            var hasBounds = false;
+            bounds = new Bounds(target.transform.position, Vector3.zero);
+
+            var renderers = includeChildren
+                ? target.GetComponentsInChildren<Renderer>()
+                : target.GetComponents<Renderer>();
+            foreach (var renderer in renderers)
+            {
+                if (!hasBounds) { bounds = renderer.bounds; hasBounds = true; }
+                else bounds.Encapsulate(renderer.bounds);
+            }
+
+            var colliders = includeChildren
+                ? target.GetComponentsInChildren<Collider>()
+                : target.GetComponents<Collider>();
+            foreach (var collider in colliders)
+            {
+                if (!hasBounds) { bounds = collider.bounds; hasBounds = true; }
+                else bounds.Encapsulate(collider.bounds);
+            }
+
+            return hasBounds;
+        }
+
+        internal static List<object> Vec3(Vector3 v) => new List<object> { v.x, v.y, v.z };
+    }
+}

package/bridge/com.ucp.bridge/Editor/Controllers/ObjectLocator.cs.meta

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

package/bridge/com.ucp.bridge/Editor/Controllers/ObjectReferenceResolver.cs

@@ -14,7 +14,7 @@ namespace UCP.Bridge
 
             var result = new Dictionary<string, object>
             {
-                ["instanceId"] = obj.GetInstanceID(),
+                ["instanceId"] = obj.GetId(),
                 ["name"] = obj.name,
                 ["type"] = obj.GetType().Name
             };

package/bridge/com.ucp.bridge/Editor/Controllers/PlayModeController.cs

@@ -1,6 +1,4 @@
 using UnityEditor;
-using UnityEditor.SceneManagement;
-using UnityEngine.SceneManagement;
 using System.Collections.Generic;
 using System;
 
@@ -65,7 +63,7 @@ namespace UCP.Bridge
             var saveDirtyScenes = GetBoolParam(paramsJson, "saveDirtyScenes", true);
             var discardUntitled = GetBoolParam(paramsJson, "discardUntitled", true);
             var logFile = GetStringParam(paramsJson, "logFile");
-            SaveDirtyScenesIfRequested(saveDirtyScenes, discardUntitled);
+            EditorModalGuard.SaveOpenDirtyScenes(saveDirtyScenes, discardUntitled);
             if (!string.IsNullOrEmpty(logFile))
                 LogsController.StartFileCapture(logFile);
 
@@ -91,38 +89,6 @@ namespace UCP.Bridge
             return defaultValue;
         }
 
-        private static void SaveDirtyScenesIfRequested(bool saveDirtyScenes, bool discardUntitled)
-        {
-            if (!saveDirtyScenes)
-                return;
-
-            var requiresUntitledDiscard = false;
-
-            for (var index = 0; index < SceneManager.sceneCount; index++)
-            {
-                var scene = SceneManager.GetSceneAt(index);
-                if (!scene.isLoaded || !scene.isDirty)
-                    continue;
-
-                if (string.IsNullOrEmpty(scene.path))
-                {
-                    if (!discardUntitled)
-                        throw new System.InvalidOperationException("Dirty untitled scene cannot be auto-saved. Retry with discardUntitled=true.");
-
-                    requiresUntitledDiscard = true;
-                    continue;
-                }
-
-                if (!EditorSceneManager.SaveScene(scene))
-                    throw new System.InvalidOperationException($"Failed to auto-save dirty scene: {scene.path}");
-
-                SceneChangeTracker.ClearScene(scene);
-            }
-
-            if (requiresUntitledDiscard)
-                EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
-        }
-
         private static object HandleStop(string paramsJson)
         {
             if (!EditorApplication.isPlaying)

package/bridge/com.ucp.bridge/Editor/Controllers/PrefabController.cs

@@ -179,8 +179,8 @@ namespace UCP.Bridge
                 ["status"] = "ok",
                 ["path"] = savePath,
                 ["name"] = prefab.name,
-                ["instanceId"] = prefab.GetInstanceID(),
-                ["sceneInstanceId"] = go.GetInstanceID(),
+                ["instanceId"] = prefab.GetId(),
+                ["sceneInstanceId"] = go.GetId(),
                 ["isPrefabInstance"] = PrefabUtility.IsPartOfPrefabInstance(go)
             };
         }
@@ -221,7 +221,7 @@ namespace UCP.Bridge
                 added.Add(new Dictionary<string, object>
                 {
                     ["component"] = ac.instanceComponent.GetType().Name,
-                    ["instanceId"] = ac.instanceComponent.GetInstanceID()
+                    ["instanceId"] = ac.instanceComponent.GetId()
                 });
             }
 

package/bridge/com.ucp.bridge/Editor/Controllers/PropertyController.cs

@@ -538,7 +538,7 @@ namespace UCP.Bridge
 
         private static GameObject FindInHierarchy(GameObject go, int instanceId)
         {
-            if (go.GetInstanceID() == instanceId) return go;
+            if (go.GetId() == instanceId) return go;
             for (int i = 0; i < go.transform.childCount; i++)
             {
                 var found = FindInHierarchy(go.transform.GetChild(i).gameObject, instanceId);

package/bridge/com.ucp.bridge/Editor/Controllers/ReferenceController.cs

@@ -31,7 +31,7 @@ namespace UCP.Bridge
                 {
                     { "serializationMode", mode },
                     { "forceText", mode == 2 },
-                    { "visibleMetaFiles", EditorSettings.externalVersionControl == "Visible Meta Files" }
+                    { "visibleMetaFiles", VersionControlSettings.mode == "Visible Meta Files" }
                 };
             }
             finally

package/bridge/com.ucp.bridge/Editor/Controllers/SceneChangeTracker.cs

@@ -17,7 +17,7 @@ namespace UCP.Bridge
             public HashSet<string> Components = new();
         }
 
-        private static readonly Dictionary<int, Dictionary<string, TrackedSceneChange>> s_changesByScene = new();
+        private static readonly Dictionary<long, Dictionary<string, TrackedSceneChange>> s_changesByScene = new();
 
         static SceneChangeTracker()
         {
@@ -33,7 +33,7 @@ namespace UCP.Bridge
             if (gameObject == null)
                 return;
 
-            RecordSceneChange(gameObject.scene, gameObject.GetInstanceID(), gameObject.name, componentName);
+            RecordSceneChange(gameObject.scene, gameObject.GetId(), gameObject.name, componentName);
         }
 
         public static void RecordDeletedObject(Scene scene, int instanceId, string name, string componentName)
@@ -56,7 +56,7 @@ namespace UCP.Bridge
             var modifications = new List<object>();
             var omittedCount = 0;
 
-            if (scene.IsValid() && s_changesByScene.TryGetValue(scene.handle, out var trackedChanges))
+            if (scene.IsValid() && s_changesByScene.TryGetValue(UnityObjectCompat.GetSceneHandle(scene), out var trackedChanges))
             {
                 var ordered = trackedChanges.Values
                     .OrderBy(change => change.InstanceId.HasValue ? 0 : 1)
@@ -101,7 +101,7 @@ namespace UCP.Bridge
             if (!scene.IsValid())
                 return;
 
-            s_changesByScene.Remove(scene.handle);
+            s_changesByScene.Remove(UnityObjectCompat.GetSceneHandle(scene));
         }
 
         private static UndoPropertyModification[] OnPostprocessModifications(UndoPropertyModification[] modifications)
@@ -140,10 +140,10 @@ namespace UCP.Bridge
             if (!scene.IsValid() || !scene.isLoaded)
                 return;
 
-            if (!s_changesByScene.TryGetValue(scene.handle, out var sceneChanges))
+            if (!s_changesByScene.TryGetValue(UnityObjectCompat.GetSceneHandle(scene), out var sceneChanges))
             {
                 sceneChanges = new Dictionary<string, TrackedSceneChange>();
-                s_changesByScene[scene.handle] = sceneChanges;
+                s_changesByScene[UnityObjectCompat.GetSceneHandle(scene)] = sceneChanges;
             }
 
             var key = instanceId.HasValue ? instanceId.Value.ToString() : $"scene::{name}";