@mflrevan/ucp 0.4.5 → 0.4.6

package/README.md

@@ -1,6 +1,6 @@
 # @mflrevan/ucp
 
-Version `0.4.5` of the Unity Control Protocol CLI.
+Version `0.4.6` 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/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.4.5";
+        private const string ProtocolVersion = "0.4.6";
 
         private static TcpListener s_listener;
         private static CancellationTokenSource s_cts;

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

@@ -0,0 +1,18 @@
+using UnityEditor;
+using UnityEngine;
+
+namespace UCP.Bridge
+{
+    internal static class UnityObjectCompat
+    {
+        public static Object ResolveByInstanceId(int instanceId)
+        {
+            return EditorUtility.InstanceIDToObject(instanceId);
+        }
+
+        public static T ResolveByInstanceId<T>(int instanceId) where T : Object
+        {
+            return ResolveByInstanceId(instanceId) as T;
+        }
+    }
+}

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

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 26985214c906f3945a01cd11320484e4

package/bridge/com.ucp.bridge/Editor/Compatibility.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6e64b956356efe640939d405c9429117
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -295,7 +295,7 @@ namespace UCP.Bridge
 
         private static GameObject FindGameObject(int instanceId)
         {
-            var obj = EditorUtility.EntityIdToObject(instanceId) as GameObject;
+            var obj = UnityObjectCompat.ResolveByInstanceId<GameObject>(instanceId);
             if (obj != null) return obj;
 
             for (int i = 0; i < SceneManager.sceneCount; i++)

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

@@ -228,7 +228,7 @@ namespace UCP.Bridge
             if (p.TryGetValue("instanceId", out var idObj))
             {
                 int instanceId = Convert.ToInt32(idObj);
-                var obj = EditorUtility.EntityIdToObject(instanceId);
+                var obj = UnityObjectCompat.ResolveByInstanceId(instanceId);
 
                 if (obj is Material directMat)
                     return directMat;
@@ -330,7 +330,7 @@ namespace UCP.Bridge
                         }
                         else if (texDict.TryGetValue("instanceId", out var tid))
                         {
-                            var tex = EditorUtility.EntityIdToObject(Convert.ToInt32(tid)) as Texture;
+                            var tex = UnityObjectCompat.ResolveByInstanceId<Texture>(Convert.ToInt32(tid));
                             mat.SetTexture(propName, tex);
                         }
                     }

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

@@ -65,7 +65,7 @@ namespace UCP.Bridge
 
         private static UnityEngine.Object ResolveByInstanceId(int instanceId, string propertyName)
         {
-            var resolved = EditorUtility.EntityIdToObject(instanceId);
+            var resolved = UnityObjectCompat.ResolveByInstanceId(instanceId);
             if (resolved == null)
                 throw new ArgumentException($"Object reference for '{propertyName}' could not resolve instance id {instanceId}");
 

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 = EditorUtility.EntityIdToObject(Convert.ToInt32(idObj)) as GameObject;
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(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 = EditorUtility.EntityIdToObject(Convert.ToInt32(idObj)) as GameObject;
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(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 = EditorUtility.EntityIdToObject(Convert.ToInt32(idObj)) as GameObject;
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(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 = EditorUtility.EntityIdToObject(Convert.ToInt32(idObj)) as GameObject;
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(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 = EditorUtility.EntityIdToObject(Convert.ToInt32(idObj)) as GameObject;
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(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 = EditorUtility.EntityIdToObject(Convert.ToInt32(idObj)) as GameObject;
+            var go = UnityObjectCompat.ResolveByInstanceId<GameObject>(Convert.ToInt32(idObj));
             if (go == null)
                 throw new ArgumentException($"GameObject not found: {idObj}");
 

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

@@ -179,33 +179,40 @@ namespace UCP.Bridge
 
             // Use SerializedObject for reliable Unity property enumeration
             var so = new SerializedObject(comp);
-            var prop = so.GetIterator();
-            if (prop.NextVisible(true))
+            try
             {
-                do
+                so.Update();
+                var prop = so.GetIterator();
+                if (prop.NextVisible(true))
                 {
-                    var fieldDict = new Dictionary<string, object>
+                    do
                     {
-                        ["name"] = prop.name,
-                        ["displayName"] = prop.displayName,
-                        ["type"] = prop.propertyType.ToString(),
-                        ["editable"] = !prop.isReadOnly(true)
-                    };
-
-                    try
-                    {
-                        fieldDict["value"] = SerializedPropertyToValue(prop);
-                    }
-                    catch
-                    {
-                        fieldDict["value"] = "<unreadable>";
+                        var fieldDict = new Dictionary<string, object>
+                        {
+                            ["name"] = prop.name,
+                            ["displayName"] = prop.displayName,
+                            ["type"] = prop.propertyType.ToString(),
+                            ["editable"] = !prop.isReadOnly(true)
+                        };
+
+                        try
+                        {
+                            fieldDict["value"] = SerializedPropertyToValue(prop);
+                        }
+                        catch
+                        {
+                            fieldDict["value"] = "<unreadable>";
+                        }
+
+                        fields.Add(fieldDict);
                     }
-
-                    fields.Add(fieldDict);
+                    while (prop.NextVisible(false));
                 }
-                while (prop.NextVisible(false));
             }
-            so.Dispose();
+            finally
+            {
+                so.Dispose();
+            }
 
             return fields;
         }
@@ -273,14 +280,17 @@ namespace UCP.Bridge
         private static object GetPropertyValue(Component comp, string propertyName)
         {
             var so = new SerializedObject(comp);
-            var prop = so.FindProperty(propertyName);
-            if (prop != null)
+            try
+            {
+                so.Update();
+                var prop = so.FindProperty(propertyName);
+                if (prop != null)
+                    return SerializedPropertyToValue(prop);
+            }
+            finally
             {
-                var val = SerializedPropertyToValue(prop);
                 so.Dispose();
-                return val;
             }
-            so.Dispose();
 
             // Fallback to reflection
             var type = comp.GetType();
@@ -298,15 +308,21 @@ namespace UCP.Bridge
         private static void SetPropertyValue(Component comp, string propertyName, object jsonValue)
         {
             var so = new SerializedObject(comp);
-            var prop = so.FindProperty(propertyName);
-            if (prop != null)
+            try
+            {
+                so.Update();
+                var prop = so.FindProperty(propertyName);
+                if (prop != null)
+                {
+                    SetSerializedPropertyValue(prop, jsonValue);
+                    so.ApplyModifiedProperties();
+                    return;
+                }
+            }
+            finally
             {
-                SetSerializedPropertyValue(prop, jsonValue);
-                so.ApplyModifiedProperties();
                 so.Dispose();
-                return;
             }
-            so.Dispose();
 
             // Fallback to reflection
             var type = comp.GetType();
@@ -502,7 +518,7 @@ namespace UCP.Bridge
 
         private static GameObject FindGameObject(int instanceId)
         {
-            var obj = EditorUtility.EntityIdToObject(instanceId) as GameObject;
+            var obj = UnityObjectCompat.ResolveByInstanceId<GameObject>(instanceId);
             if (obj != null) return obj;
 
             // Search in loaded scenes

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

@@ -273,7 +273,7 @@ namespace UCP.Bridge
 
         private static GameObject FindGameObject(int instanceId)
         {
-            var direct = EditorUtility.EntityIdToObject(instanceId) as GameObject;
+            var direct = UnityObjectCompat.ResolveByInstanceId<GameObject>(instanceId);
             if (direct != null)
                 return direct;
 

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

@@ -202,7 +202,7 @@ namespace UCP.Bridge
 
         private static GameObject FindByInstanceId(int id)
         {
-            var obj = UnityEditor.EditorUtility.EntityIdToObject(id);
+            var obj = UnityObjectCompat.ResolveByInstanceId(id);
             return obj as GameObject;
         }
 

package/bridge/com.ucp.bridge/Editor/UCP.Bridge.Editor.asmdef

@@ -1,7 +1,9 @@
 {
   "name": "UCP.Bridge.Editor",
   "rootNamespace": "UCP.Bridge",
-  "references": [],
+  "references": [
+    "UnityEditor.TestRunner"
+  ],
   "includePlatforms": [
     "Editor"
   ],

package/bridge/com.ucp.bridge/Tests/Editor/ControllerSmokeTests.cs

@@ -371,7 +371,7 @@ namespace UCP.Bridge.Tests
             );
             Assert.That(getPosition.error, Is.Null);
 
-            var updated = EditorUtility.EntityIdToObject(instanceId) as GameObject;
+            var updated = EditorUtility.InstanceIDToObject(instanceId) as GameObject;
             Assert.That(updated, Is.Not.Null);
             var localPosition = updated.transform.localPosition;
             Assert.That(localPosition.x, Is.EqualTo(1f).Within(0.001f));
@@ -383,7 +383,7 @@ namespace UCP.Bridge.Tests
 
             var delete = _router.Dispatch("object/delete", 1, "{\"instanceId\":" + instanceId + "}");
             Assert.That(delete.error, Is.Null);
-            Assert.That(EditorUtility.EntityIdToObject(instanceId), Is.Null);
+            Assert.That(EditorUtility.InstanceIDToObject(instanceId), Is.Null);
         }
 
         [Test]

package/bridge/com.ucp.bridge/package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.ucp.bridge",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "displayName": "Unity Control Protocol Bridge",
   "description": "WebSocket bridge for programmatic Unity Editor control via CLI and AI agents.",
   "unity": "2021.3",
@@ -23,5 +23,7 @@
   "type": "tool",
   "documentationUrl": "https://github.com/mflRevan/unity-control-protocol/blob/main/README.md",
   "changelogUrl": "https://github.com/mflRevan/unity-control-protocol/blob/main/unity-package/com.ucp.bridge/CHANGELOG.md",
-  "dependencies": {}
+  "dependencies": {
+    "com.unity.test-framework": "1.1.31"
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mflrevan/ucp",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Unity Control Protocol - CLI for programmatic Unity Editor control",
   "license": "MIT",
   "repository": {