@mflrevan/ucp 0.6.1 → 0.6.3

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

@@ -109,6 +109,30 @@ namespace UCP.Bridge
             }
         }
 
+        /// <summary>
+        /// Error/exception and warning counts in the bridge history after <paramref name="afterId"/>.
+        /// Walks back from the newest entry and stops at the cursor, so the cost is proportional to
+        /// what the current request logged, not to the history size.
+        /// </summary>
+        public static void CountLevels(long afterId, out int errors, out int warnings)
+        {
+            errors = 0;
+            warnings = 0;
+            lock (s_historyLock)
+            {
+                for (var index = s_history.Count - 1; index >= 0; index--)
+                {
+                    var entry = s_history[index];
+                    if (entry.Id <= afterId)
+                        break;
+                    if (entry.Level == "error" || entry.Level == "exception")
+                        errors++;
+                    else if (entry.Level == "warning")
+                        warnings++;
+                }
+            }
+        }
+
         public static long GetLatestId()
         {
             SeedHistoryFromConsole();
@@ -132,6 +156,53 @@ namespace UCP.Bridge
             }
         }
 
+        /// <summary>
+        /// Status summary for the test-run console guard. Unity's test runner writes
+        /// "IgnoreFailingMessages:true" / "IgnoreFailingMessages:false" log lines whenever a test
+        /// toggles <c>LogAssert.ignoreFailingMessages</c>; everything logged inside such a window is
+        /// noise the test declared as expected, so it must not fail the guard. The markers
+        /// themselves are dropped as well.
+        /// </summary>
+        public static Dictionary<string, object> BuildTestGuardSummary(long afterId)
+        {
+            SeedHistoryFromConsole();
+            lock (s_historyLock)
+            {
+                var ordered = s_history
+                    .Where(entry => entry.Id > afterId)
+                    .OrderBy(entry => entry.Id)
+                    .ToList();
+
+                return BuildStatusResult(ExcludeExpectedNoise(ordered, entry => entry.Message), afterId);
+            }
+        }
+
+        internal const string IgnoreFailingMessagesOnMarker = "IgnoreFailingMessages:true";
+        internal const string IgnoreFailingMessagesOffMarker = "IgnoreFailingMessages:false";
+
+        internal static List<T> ExcludeExpectedNoise<T>(IEnumerable<T> entries, Func<T, string> message)
+        {
+            var result = new List<T>();
+            var ignoring = false;
+            foreach (var entry in entries)
+            {
+                var text = (message(entry) ?? string.Empty).Trim();
+                if (text == IgnoreFailingMessagesOnMarker)
+                {
+                    ignoring = true;
+                    continue;
+                }
+                if (text == IgnoreFailingMessagesOffMarker)
+                {
+                    ignoring = false;
+                    continue;
+                }
+                if (!ignoring)
+                    result.Add(entry);
+            }
+            return result;
+        }
+
         private static object HandleTail(string paramsJson)
         {
             var query = ParseQuery(paramsJson, includePattern: false);

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

@@ -227,7 +227,7 @@ namespace UCP.Bridge
             // Resolve by instanceId (scene object's renderer material)
             if (p.TryGetValue("instanceId", out var idObj))
             {
-                int instanceId = Convert.ToInt32(idObj);
+                long instanceId = Convert.ToInt64(idObj);
                 var obj = UnityObjectCompat.ResolveByInstanceId(instanceId);
 
                 if (obj is Material directMat)
@@ -330,7 +330,7 @@ namespace UCP.Bridge
                         }
                         else if (texDict.TryGetValue("instanceId", out var tid))
                         {
-                            var tex = UnityObjectCompat.ResolveByInstanceId<Texture>(Convert.ToInt32(tid));
+                            var tex = UnityObjectCompat.ResolveByInstanceId<Texture>(Convert.ToInt64(tid));
                             mat.SetTexture(propName, tex);
                         }
                     }

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

@@ -9,7 +9,7 @@ namespace UCP.Bridge
     /// 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.
+    ///   1. instanceId (64-bit integer)   — 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
@@ -32,7 +32,7 @@ namespace UCP.Bridge
 
             if ((p.TryGetValue("instanceId", out var idObj) || p.TryGetValue("id", out idObj)) && idObj != null)
             {
-                var id = Convert.ToInt32(idObj);
+                var id = Convert.ToInt64(idObj);
                 var byId = FindByInstanceId(id);
                 if (byId != null)
                     return byId;
@@ -60,7 +60,7 @@ namespace UCP.Bridge
             throw new ArgumentException("Missing target: provide 'instanceId', 'path', or 'name'");
         }
 
-        internal static GameObject FindByInstanceId(int instanceId)
+        internal static GameObject FindByInstanceId(long instanceId)
         {
             var direct = UnityObjectCompat.ResolveByInstanceId<GameObject>(instanceId);
             if (direct != null)
@@ -82,7 +82,7 @@ namespace UCP.Bridge
             return null;
         }
 
-        private static GameObject FindInHierarchyById(GameObject go, int instanceId)
+        private static GameObject FindInHierarchyById(GameObject go, long instanceId)
         {
             if (go.GetId() == instanceId)
                 return go;

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,19 +72,19 @@ 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();
 
-            var value = GetPropertyValue(comp, propName);
+            var value = GetPropertyValue(comp, propName, out var typeName);
             return new Dictionary<string, object>
             {
                 ["instanceId"] = instanceId,
                 ["component"] = cObj.ToString(),
                 ["property"] = propName,
-                ["value"] = ConvertToJson(value),
-                ["type"] = value != null ? value.GetType().Name : "null"
+                ["value"] = value,
+                ["type"] = typeName
             };
         }
 
@@ -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");
@@ -277,7 +277,7 @@ namespace UCP.Bridge
             }
         }
 
-        private static object GetPropertyValue(Component comp, string propertyName)
+        private static object GetPropertyValue(Component comp, string propertyName, out string typeName)
         {
             var so = new SerializedObject(comp);
             try
@@ -285,22 +285,35 @@ namespace UCP.Bridge
                 so.Update();
                 var prop = so.FindProperty(propertyName);
                 if (prop != null)
+                {
+                    // Already JSON-shaped -- reporting its type from the SerializedProperty keeps
+                    // `get-property` and `get-fields` describing the same field the same way.
+                    typeName = prop.propertyType.ToString();
                     return SerializedPropertyToValue(prop);
+                }
             }
             finally
             {
                 so.Dispose();
             }
 
-            // Fallback to reflection
+            // Fallback to reflection for names Unity does not serialize (e.g. Transform.position).
             var type = comp.GetType();
             var fi = type.GetField(propertyName, BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance);
             if (fi != null)
-                return fi.GetValue(comp);
+            {
+                var raw = fi.GetValue(comp);
+                typeName = raw != null ? raw.GetType().Name : fi.FieldType.Name;
+                return ConvertToJson(raw);
+            }
 
             var pi = type.GetProperty(propertyName, BindingFlags.Public | BindingFlags.Instance);
             if (pi != null && pi.CanRead)
-                return pi.GetValue(comp);
+            {
+                var raw = pi.GetValue(comp);
+                typeName = raw != null ? raw.GetType().Name : pi.PropertyType.Name;
+                return ConvertToJson(raw);
+            }
 
             throw new ArgumentException($"Property '{propertyName}' not found on {type.Name}");
         }
@@ -488,6 +501,9 @@ namespace UCP.Bridge
                 return new List<object> { (double)c.r, (double)c.g, (double)c.b, (double)c.a };
             if (value is UnityEngine.Object uObj)
                 return ObjectReferenceResolver.Serialize(uObj);
+            // Values that are already JSON-shaped pass through untouched.
+            if (value is IList || value is IDictionary)
+                return value;
             return value.ToString();
         }
 
@@ -516,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;
@@ -536,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++)