@mflrevan/ucp 0.6.2 → 0.6.3

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

@@ -39,7 +39,7 @@ namespace UCP.Bridge
             if (value is Dictionary<string, object> reference)
             {
                 if (reference.TryGetValue("instanceId", out var instanceId) && instanceId != null)
-                    return ResolveByInstanceId(Convert.ToInt32(instanceId), propertyName);
+                    return ResolveByInstanceId(Convert.ToInt64(instanceId), propertyName);
 
                 if (reference.TryGetValue("path", out var path) && path != null)
                     return ResolveByPath(path.ToString(), propertyName);
@@ -58,12 +58,12 @@ namespace UCP.Bridge
             }
 
             if (value is sbyte || value is byte || value is short || value is ushort || value is int || value is uint || value is long || value is ulong)
-                return ResolveByInstanceId(Convert.ToInt32(value), propertyName);
+                return ResolveByInstanceId(Convert.ToInt64(value), propertyName);
 
             throw new ArgumentException($"Unsupported object reference value for '{propertyName}'");
         }
 
-        private static UnityEngine.Object ResolveByInstanceId(int instanceId, string propertyName)
+        private static UnityEngine.Object ResolveByInstanceId(long instanceId, string propertyName)
         {
             var resolved = UnityObjectCompat.ResolveByInstanceId(instanceId);
             if (resolved == null)

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

@@ -26,7 +26,7 @@ namespace UCP.Bridge
             if (p == null || !p.TryGetValue("instanceId", out var idObj))
                 throw new ArgumentException("Missing 'instanceId' parameter");
 
-            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(idObj));
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt64(idObj));
             if (go == null)
                 throw new ArgumentException($"GameObject not found: {idObj}");
 
@@ -63,7 +63,7 @@ namespace UCP.Bridge
             if (p == null || !p.TryGetValue("instanceId", out var idObj))
                 throw new ArgumentException("Missing 'instanceId' parameter");
 
-            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(idObj));
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt64(idObj));
             if (go == null)
                 throw new ArgumentException($"GameObject not found: {idObj}");
 
@@ -88,7 +88,7 @@ namespace UCP.Bridge
             if (p == null || !p.TryGetValue("instanceId", out var idObj))
                 throw new ArgumentException("Missing 'instanceId' parameter");
 
-            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(idObj));
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt64(idObj));
             if (go == null)
                 throw new ArgumentException($"GameObject not found: {idObj}");
 
@@ -116,7 +116,7 @@ namespace UCP.Bridge
             if (p.TryGetValue("completely", out var compObj))
                 completely = Convert.ToBoolean(compObj);
 
-            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(idObj));
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt64(idObj));
             if (go == null)
                 throw new ArgumentException($"GameObject not found: {idObj}");
 
@@ -147,7 +147,7 @@ namespace UCP.Bridge
             if (!p.TryGetValue("path", out var pathObj))
                 throw new ArgumentException("Missing 'path' parameter");
 
-            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(idObj));
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt64(idObj));
             if (go == null)
                 throw new ArgumentException($"GameObject not found: {idObj}");
 
@@ -191,7 +191,7 @@ namespace UCP.Bridge
             if (p == null || !p.TryGetValue("instanceId", out var idObj))
                 throw new ArgumentException("Missing 'instanceId' parameter");
 
-            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(idObj));
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt64(idObj));
             if (go == null)
                 throw new ArgumentException($"GameObject not found: {idObj}");
 

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

@@ -27,7 +27,7 @@ namespace UCP.Bridge
                 throw new ArgumentException("Missing 'instanceId' parameter");
 
             var componentType = p.TryGetValue("component", out var cObj) ? cObj?.ToString() : null;
-            int instanceId = Convert.ToInt32(idObj);
+            long instanceId = Convert.ToInt64(idObj);
             var go = FindGameObject(instanceId);
 
             if (componentType != null)
@@ -72,7 +72,7 @@ namespace UCP.Bridge
             if (!p.TryGetValue("property", out var propObj) || propObj == null)
                 throw new ArgumentException("Missing 'property' parameter");
 
-            int instanceId = Convert.ToInt32(idObj);
+            long instanceId = Convert.ToInt64(idObj);
             var go = FindGameObject(instanceId);
             var comp = FindComponent(go, cObj.ToString());
             string propName = propObj.ToString();
@@ -100,7 +100,7 @@ namespace UCP.Bridge
             if (!p.ContainsKey("value"))
                 throw new ArgumentException("Missing 'value' parameter");
 
-            int instanceId = Convert.ToInt32(idObj);
+            long instanceId = Convert.ToInt64(idObj);
             var go = FindGameObject(instanceId);
             var comp = FindComponent(go, cObj.ToString());
             string propName = propObj.ToString();
@@ -128,7 +128,7 @@ namespace UCP.Bridge
             if (!p.TryGetValue("active", out var activeObj))
                 throw new ArgumentException("Missing 'active' parameter");
 
-            int instanceId = Convert.ToInt32(idObj);
+            long instanceId = Convert.ToInt64(idObj);
             var go = FindGameObject(instanceId);
 
             Undo.RecordObject(go, "UCP Set Active");
@@ -153,7 +153,7 @@ namespace UCP.Bridge
             if (!p.TryGetValue("name", out var nameObj) || nameObj == null)
                 throw new ArgumentException("Missing 'name' parameter");
 
-            int instanceId = Convert.ToInt32(idObj);
+            long instanceId = Convert.ToInt64(idObj);
             var go = FindGameObject(instanceId);
 
             Undo.RecordObject(go, "UCP Rename");
@@ -532,7 +532,7 @@ namespace UCP.Bridge
             return Convert.ChangeType(jsonValue, targetType);
         }
 
-        private static GameObject FindGameObject(int instanceId)
+        private static GameObject FindGameObject(long instanceId)
         {
             var obj = UnityObjectCompat.ResolveByInstanceId<GameObject>(instanceId);
             if (obj != null) return obj;
@@ -552,7 +552,7 @@ namespace UCP.Bridge
             throw new ArgumentException($"GameObject not found: {instanceId}");
         }
 
-        private static GameObject FindInHierarchy(GameObject go, int instanceId)
+        private static GameObject FindInHierarchy(GameObject go, long instanceId)
         {
             if (go.GetId() == instanceId) return go;
             for (int i = 0; i < go.transform.childCount; i++)

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

@@ -69,6 +69,14 @@ namespace UCP.Bridge
             }
         }
 
+        /// <summary>"recording", "armed", or null when idle -- for the per-response editor summary.</summary>
+        internal static string StateForSummary()
+        {
+            if (s_encoder != null) return "recording";
+            if (s_armed != null) return "armed";
+            return null;
+        }
+
         public static void Shutdown()
         {
             if (s_encoder == null) return;

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

@@ -12,7 +12,7 @@ namespace UCP.Bridge
     {
         private sealed class TrackedSceneChange
         {
-            public int? InstanceId;
+            public long? InstanceId;
             public string Name;
             public HashSet<string> Components = new();
         }
@@ -36,7 +36,7 @@ namespace UCP.Bridge
             RecordSceneChange(gameObject.scene, gameObject.GetId(), gameObject.name, componentName);
         }
 
-        public static void RecordDeletedObject(Scene scene, int instanceId, string name, string componentName)
+        public static void RecordDeletedObject(Scene scene, long instanceId, string name, string componentName)
         {
             RecordSceneChange(scene, instanceId, name, componentName);
         }
@@ -135,7 +135,7 @@ namespace UCP.Bridge
             }
         }
 
-        private static void RecordSceneChange(Scene scene, int? instanceId, string name, string componentName)
+        private static void RecordSceneChange(Scene scene, long? instanceId, string name, string componentName)
         {
             if (!scene.IsValid() || !scene.isLoaded)
                 return;

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

@@ -138,7 +138,7 @@ namespace UCP.Bridge
             if (parameters == null || !parameters.TryGetValue("instanceId", out var idObj))
                 throw new System.ArgumentException("Missing 'instanceId' parameter");
 
-            var instanceId = System.Convert.ToInt32(idObj);
+            var instanceId = System.Convert.ToInt64(idObj);
             var target = FindGameObject(instanceId);
             var bounds = CalculateFocusBounds(target);
             var sceneView = SceneView.lastActiveSceneView ?? EditorWindow.GetWindow<SceneView>();
@@ -267,7 +267,7 @@ namespace UCP.Bridge
             return bounds;
         }
 
-        private static GameObject FindGameObject(int instanceId)
+        private static GameObject FindGameObject(long instanceId)
         {
             var direct = UnityObjectCompat.ResolveByInstanceId<GameObject>(instanceId);
             if (direct != null)
@@ -290,7 +290,7 @@ namespace UCP.Bridge
             throw new System.ArgumentException($"GameObject not found: {instanceId}");
         }
 
-        private static GameObject FindInHierarchy(GameObject gameObject, int instanceId)
+        private static GameObject FindInHierarchy(GameObject gameObject, long instanceId)
         {
             if (gameObject.GetId() == instanceId)
                 return gameObject;

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

@@ -156,7 +156,7 @@ namespace UCP.Bridge
             if (p == null || !p.TryGetValue("instanceId", out var idObj))
                 throw new ArgumentException("Missing 'instanceId' parameter");
 
-            int instanceId = Convert.ToInt32(idObj);
+            long instanceId = Convert.ToInt64(idObj);
             int maxDepth = 1;
             if (p.TryGetValue("depth", out var depthObj))
                 maxDepth = Math.Max(1, Convert.ToInt32(depthObj));
@@ -349,7 +349,7 @@ namespace UCP.Bridge
             if (p == null || !p.TryGetValue("instanceId", out var idObj))
                 throw new System.ArgumentException("Missing 'instanceId' parameter");
 
-            int instanceId = System.Convert.ToInt32(idObj);
+            long instanceId = System.Convert.ToInt64(idObj);
             var go = FindByInstanceId(instanceId);
             if (go == null)
                 throw new System.Exception($"GameObject not found: {instanceId}");
@@ -383,7 +383,7 @@ namespace UCP.Bridge
             if (p == null || !p.TryGetValue("instanceId", out var idObj))
                 throw new System.ArgumentException("Missing 'instanceId' parameter");
 
-            int instanceId = System.Convert.ToInt32(idObj);
+            long instanceId = System.Convert.ToInt64(idObj);
             var go = FindByInstanceId(instanceId);
             if (go == null)
                 throw new System.Exception($"GameObject not found: {instanceId}");
@@ -401,7 +401,7 @@ namespace UCP.Bridge
             };
         }
 
-        private static GameObject FindByInstanceId(int id)
+        private static GameObject FindByInstanceId(long id)
         {
             var direct = UnityObjectCompat.ResolveByInstanceId<GameObject>(id);
             if (direct != null)
@@ -424,7 +424,7 @@ namespace UCP.Bridge
             return null;
         }
 
-        private static GameObject FindInHierarchy(GameObject go, int instanceId)
+        private static GameObject FindInHierarchy(GameObject go, long instanceId)
         {
             if (go.GetId() == instanceId)
                 return go;

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

@@ -154,7 +154,7 @@ namespace UCP.Bridge
                 _failed = 0;
                 _skipped = 0;
                 CollectLeafResults(result);
-                var logSummary = LogsController.BuildStatusSummary(_logCursor);
+                var logSummary = LogsController.BuildTestGuardSummary(_logCursor);
                 var consoleWarnings = GetLevelCount(logSummary, "warning");
                 var consoleErrors = GetLevelCount(logSummary, "error") + GetLevelCount(logSummary, "exception");
 

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

@@ -148,7 +148,7 @@ namespace UCP.Bridge
                 var list = new List<object>();
                 foreach (var idObj in ids)
                 {
-                    var go = ObjectLocator.FindByInstanceId(Convert.ToInt32(idObj));
+                    var go = ObjectLocator.FindByInstanceId(Convert.ToInt64(idObj));
                     if (go == null) continue;
                     list.Add(DescribeTransform(go));
                 }

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

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+
+namespace UCP.Bridge
+{
+    /// <summary>Registers the UI Toolkit discovery, lint, and asynchronous harness methods.</summary>
+    public static class UiController
+    {
+        public static void Register(CommandRouter router)
+        {
+#if UNITY_6000_0_OR_NEWER
+            router.Register("ui/list", HandleList);
+            router.Register("ui/lint", HandleLint);
+            router.Register("ui/inspect", parameters => Start("inspect", parameters));
+            router.Register("ui/screenshot", parameters => Start("screenshot", parameters));
+            router.Register("ui/check", parameters => Start("check", parameters));
+            router.Register("ui/status", HandleStatus);
+#else
+            router.Register("ui/list", Unsupported);
+            router.Register("ui/lint", Unsupported);
+            router.Register("ui/inspect", Unsupported);
+            router.Register("ui/screenshot", Unsupported);
+            router.Register("ui/check", Unsupported);
+            router.Register("ui/status", Unsupported);
+#endif
+        }
+
+#if UNITY_6000_0_OR_NEWER
+        private static object HandleList(string paramsJson)
+        {
+            return UiScenarioLoader.List(ParseParameters(paramsJson));
+        }
+
+        private static object HandleLint(string paramsJson)
+        {
+            return UiLintService.Run(ParseParameters(paramsJson));
+        }
+
+        private static object Start(string operation, string paramsJson)
+        {
+            return UiOperationManager.Start(operation, ParseParameters(paramsJson));
+        }
+
+        private static object HandleStatus(string paramsJson)
+        {
+            var parameters = ParseParameters(paramsJson);
+            var operationId = parameters.TryGetValue("operationId", out var value)
+                ? value?.ToString()
+                : null;
+            return UiOperationManager.Status(operationId);
+        }
+
+        private static Dictionary<string, object> ParseParameters(string paramsJson)
+        {
+            if (string.IsNullOrWhiteSpace(paramsJson))
+                return new Dictionary<string, object>(StringComparer.Ordinal);
+            var value = MiniJson.Deserialize(paramsJson);
+            if (value is not Dictionary<string, object> parameters)
+                throw new ArgumentException("UI command parameters must be a JSON object");
+            return parameters;
+        }
+#else
+        private static object Unsupported(string paramsJson)
+        {
+            throw new ArgumentException(
+                "The ucp ui command family requires Unity 6.0 or newer; this project uses an older Unity Editor");
+        }
+#endif
+    }
+}

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

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

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

@@ -51,7 +51,7 @@ namespace UCP.Bridge
             Camera cam = null;
             if (p != null && (p.TryGetValue("camera", out var camObj)) && camObj != null)
             {
-                var go = ObjectLocator.FindByInstanceId(Convert.ToInt32(camObj));
+                var go = ObjectLocator.FindByInstanceId(Convert.ToInt64(camObj));
                 if (go != null) cam = go.GetComponent<Camera>();
                 if (cam == null) throw new ArgumentException($"No Camera component on object {camObj}");
             }

package/bridge/com.ucp.bridge/Editor/Protocol/MiniJson.cs

@@ -516,7 +516,7 @@ namespace UCP.Bridge
                 }
 
                 string name;
-                int id;
+                long id;
                 try
                 {
                     name = uo.name;