@mflrevan/ucp 0.5.2 → 0.6.1

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/ProfilerController.cs

@@ -15,6 +15,11 @@ namespace UCP.Bridge
     {
         private const int DefaultFrameListLimit = 20;
         private const int DefaultSummaryFrameWindow = 120;
+
+        // Summary aggregation walks every raw frame view on the main thread, so an unbounded
+        // range (e.g. --first-frame 0 on a long session) freezes the editor for seconds. Clamp it
+        // and say so in `warnings` rather than stalling.
+        private const int MaxSummaryFrameSpan = 600;
         private const int DefaultJsonExportFrameWindow = 120;
         private const int MaxThreadProbeCount = 128;
         private const long MinimumProfilerMemoryBytes = 16L * 1024L * 1024L;
@@ -296,6 +301,7 @@ namespace UCP.Bridge
             var limit = Math.Max(1, GetInt(parameters, "limit", 50));
             var sort = GetString(parameters, "sort") ?? "total-time";
             var maxDepth = GetNullableInt(parameters, "maxDepth");
+            var fields = GetFieldSet(parameters);
 
             using (var view = GetHierarchyFrameDataView(frameIndex, threadIndex))
             {
@@ -305,7 +311,8 @@ namespace UCP.Bridge
                 var items = CollectHierarchyItems(view, maxDepth);
                 items = SortHierarchyItems(items, sort);
 
-                var truncated = items.Count > limit;
+                var totalCount = items.Count;
+                var truncated = totalCount > limit;
                 if (truncated)
                     items = items.Take(limit).ToList();
 
@@ -315,8 +322,11 @@ namespace UCP.Bridge
                     ["thread"] = threadIndex,
                     ["sort"] = sort,
                     ["count"] = items.Count,
+                    // How many rows existed before truncation. Without it a caller cannot tell
+                    // "50 of 52" from "50 of 50,000", so it cannot decide whether to look further.
+                    ["totalCount"] = totalCount,
                     ["truncated"] = truncated,
-                    ["items"] = items.Select(item => (object)item.ToDictionary()).ToList(),
+                    ["items"] = items.Select(item => (object)ProjectFields(item.ToDictionary(), fields)).ToList(),
                     ["warnings"] = new List<object>()
                 };
             }
@@ -330,6 +340,7 @@ namespace UCP.Bridge
             var limit = Math.Max(1, GetInt(parameters, "limit", 200));
             var maxDepth = GetNullableInt(parameters, "maxDepth");
             var includeMetadata = GetBool(parameters, "includeMetadata", false);
+            var fields = GetFieldSet(parameters);
 
             using (var view = GetRawFrameDataView(frameIndex, threadIndex))
             {
@@ -337,7 +348,8 @@ namespace UCP.Bridge
                     throw new ArgumentException($"Raw profiler data is unavailable for frame {frameIndex}, thread {threadIndex}");
 
                 var samples = CollectTimelineSamples(view, maxDepth, includeMetadata);
-                var truncated = samples.Count > limit;
+                var totalCount = samples.Count;
+                var truncated = totalCount > limit;
                 if (truncated)
                     samples = samples.Take(limit).ToList();
 
@@ -346,8 +358,9 @@ namespace UCP.Bridge
                     ["frame"] = frameIndex,
                     ["thread"] = threadIndex,
                     ["count"] = samples.Count,
+                    ["totalCount"] = totalCount,
                     ["truncated"] = truncated,
-                    ["samples"] = samples.Cast<object>().ToList(),
+                    ["samples"] = samples.Select(sample => (object)ProjectFields(sample, fields)).ToList(),
                     ["warnings"] = new List<object>()
                 };
             }
@@ -427,10 +440,23 @@ namespace UCP.Bridge
             if (firstFrame > lastFrame)
                 throw new ArgumentException("Requested frame range is empty");
 
+            var warnings = new List<object>();
+            var span = lastFrame - firstFrame + 1;
+            if (span > MaxSummaryFrameSpan)
+            {
+                // Aggregation runs on the editor's main thread; a huge span stalls the whole
+                // editor. Keep the most recent frames, which is what callers almost always want.
+                firstFrame = lastFrame - MaxSummaryFrameSpan + 1;
+                warnings.Add(
+                    $"Requested {span} frames; aggregated the most recent {MaxSummaryFrameSpan} " +
+                    $"(frames {firstFrame}-{lastFrame}) to avoid stalling the editor. " +
+                    "Narrow the range with --first-frame/--last-frame for older windows.");
+            }
+
             return new Dictionary<string, object>
             {
                 ["summary"] = BuildSummaryData(limit, threadIndex, firstFrame, lastFrame),
-                ["warnings"] = new List<object>()
+                ["warnings"] = warnings
             };
         }
 
@@ -1365,6 +1391,55 @@ namespace UCP.Bridge
                 StringComparison.OrdinalIgnoreCase);
         }
 
+        /// <summary>
+        /// Optional caller-supplied field allow-list (`fields: ["name","selfMs"]`). Profiler rows
+        /// are wide and agents pay per token for columns they never read, so let them ask for the
+        /// two or three they actually want. Null means "every field".
+        /// </summary>
+        private static HashSet<string> GetFieldSet(Dictionary<string, object> parameters)
+        {
+            if (parameters == null || !parameters.TryGetValue("fields", out var raw) || raw == null)
+                return null;
+
+            var set = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
+            if (raw is List<object> list)
+            {
+                foreach (var entry in list)
+                {
+                    var name = entry?.ToString();
+                    if (!string.IsNullOrWhiteSpace(name)) set.Add(name.Trim());
+                }
+            }
+            else
+            {
+                foreach (var name in raw.ToString().Split(','))
+                {
+                    if (!string.IsNullOrWhiteSpace(name)) set.Add(name.Trim());
+                }
+            }
+
+            return set.Count == 0 ? null : set;
+        }
+
+        /// Narrow one row to the requested fields. Unknown names are ignored rather than erroring,
+        /// so a caller can ask for a superset across profiler surfaces without branching.
+        private static Dictionary<string, object> ProjectFields(
+            Dictionary<string, object> row,
+            HashSet<string> fields)
+        {
+            if (fields == null || row == null) return row;
+
+            var projected = new Dictionary<string, object>();
+            foreach (var pair in row)
+            {
+                if (fields.Contains(pair.Key)) projected[pair.Key] = pair.Value;
+            }
+
+            // Never hand back an empty row: a caller that misspelled every field would otherwise
+            // get a silent wall of `{}` instead of a usable result.
+            return projected.Count == 0 ? row : projected;
+        }
+
         private static Dictionary<string, object> BuildSummaryData(
             int limit,
             int threadIndex,

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}";

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

@@ -54,7 +54,7 @@ namespace UCP.Bridge
             }
             else
             {
-                SaveDirtyScenesIfRequested(saveDirtyScenes, discardUntitled);
+                EditorModalGuard.SaveOpenDirtyScenes(saveDirtyScenes, discardUntitled);
                 EditorSceneManager.OpenScene(path, additive ? OpenSceneMode.Additive : OpenSceneMode.Single);
             }
 
@@ -74,38 +74,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 HandleSaveActive(string paramsJson)
         {
             var scene = SceneManager.GetActiveScene();
@@ -200,19 +168,41 @@ namespace UCP.Bridge
             sceneView.Repaint();
             SceneView.RepaintAll();
 
+            ResolveSceneViewCamera(sceneView, out var cameraPosition, out var cameraRotation);
+
             return new Dictionary<string, object>
             {
                 ["status"] = "ok",
                 ["instanceId"] = instanceId,
                 ["name"] = target.name,
                 ["pivot"] = VectorToList(sceneView.pivot),
-                ["cameraPosition"] = VectorToList(sceneView.camera.transform.position),
-                ["cameraRotationEuler"] = VectorToList(sceneView.camera.transform.rotation.eulerAngles),
+                ["cameraPosition"] = VectorToList(cameraPosition),
+                ["cameraRotationEuler"] = VectorToList(cameraRotation.eulerAngles),
                 ["size"] = sceneView.size,
                 ["axis"] = axis.HasValue ? VectorToList(axis.Value.normalized) : null
             };
         }
 
+        /// <summary>
+        /// Derive the Scene view camera pose from the authoritative view state
+        /// (<c>pivot</c>/<c>rotation</c>/<c>cameraDistance</c>) rather than reading
+        /// <c>sceneView.camera.transform</c>.
+        ///
+        /// <c>LookAtDirect</c> updates the view state immediately, but the camera transform is only
+        /// synced when the Scene view actually repaints. <c>Repaint()</c> merely queues that, so in
+        /// batch mode - and for any caller reading the response in the same frame as the focus -
+        /// the camera transform still holds the *previous* pose and the reported values were simply
+        /// wrong.
+        /// </summary>
+        private static void ResolveSceneViewCamera(
+            SceneView sceneView,
+            out Vector3 position,
+            out Quaternion rotation)
+        {
+            rotation = sceneView.rotation;
+            position = sceneView.pivot - (rotation * Vector3.forward) * sceneView.cameraDistance;
+        }
+
         private static Vector3? TryReadAxis(Dictionary<string, object> parameters)
         {
             if (parameters == null || !parameters.TryGetValue("axis", out var axisObj) || axisObj == null)
@@ -302,7 +292,7 @@ namespace UCP.Bridge
 
         private static GameObject FindInHierarchy(GameObject gameObject, int instanceId)
         {
-            if (gameObject.GetInstanceID() == instanceId)
+            if (gameObject.GetId() == instanceId)
                 return gameObject;
 
             foreach (Transform child in gameObject.transform)