@mflrevan/ucp 0.5.1 → 0.6.0

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

@@ -435,6 +435,78 @@ namespace UCP.Bridge.Tests
             Assert.That(Convert.ToInt32(byLevel["error"]), Is.EqualTo(1));
         }
 
+        [Test]
+        public void LogsStatus_BackfillsConsoleEntriesWhenHistoryStartsEmpty()
+        {
+            LogsController.SetConsoleBackfillProviderForTests(() => new List<LogsController.ConsoleBackfillEntry>
+            {
+                new LogsController.ConsoleBackfillEntry { Level = "warning", Message = "Compiler warning" },
+                new LogsController.ConsoleBackfillEntry { Level = "error", Message = "Compiler error" }
+            });
+
+            var response = _router.Dispatch("logs/status", 1, "{}");
+
+            Assert.That(response.error, Is.Null);
+
+            var result = (Dictionary<string, object>)response.result;
+            Assert.That(Convert.ToInt32(result["total"]), Is.EqualTo(2));
+
+            var byLevel = (Dictionary<string, object>)result["byLevel"];
+            Assert.That(Convert.ToInt32(byLevel["warning"]), Is.EqualTo(1));
+            Assert.That(Convert.ToInt32(byLevel["error"]), Is.EqualTo(1));
+        }
+
+        [Test]
+        public void LogsTail_BackfillIgnoresUcpBridgeNoise()
+        {
+            LogsController.SetConsoleBackfillProviderForTests(() => new List<LogsController.ConsoleBackfillEntry>
+            {
+                new LogsController.ConsoleBackfillEntry { Level = "info", Message = "[UCP] Bridge server started on port 21342" },
+                new LogsController.ConsoleBackfillEntry { Level = "warning", Message = "User-facing warning" }
+            });
+
+            var response = _router.Dispatch("logs/tail", 1, "{\"count\":20}");
+
+            Assert.That(response.error, Is.Null);
+
+            var result = (Dictionary<string, object>)response.result;
+            Assert.That(Convert.ToInt32(result["total"]), Is.EqualTo(1));
+
+            var logs = (List<object>)result["logs"];
+            var only = (Dictionary<string, object>)logs[0];
+            Assert.That(only["messagePreview"], Is.EqualTo("User-facing warning"));
+        }
+
+        [Test]
+        public void LogsGet_CanReadBackfilledConsoleEntries()
+        {
+            LogsController.SetConsoleBackfillProviderForTests(() => new List<LogsController.ConsoleBackfillEntry>
+            {
+                new LogsController.ConsoleBackfillEntry
+                {
+                    Level = "exception",
+                    Message = "Backfilled exception",
+                    StackTrace = "stack line 1\nstack line 2"
+                }
+            });
+
+            var tail = _router.Dispatch("logs/tail", 1, "{\"count\":20}");
+            Assert.That(tail.error, Is.Null);
+
+            var tailResult = (Dictionary<string, object>)tail.result;
+            var logs = (List<object>)tailResult["logs"];
+            var first = (Dictionary<string, object>)logs[0];
+            var id = Convert.ToInt64(first["id"]);
+
+            var get = _router.Dispatch("logs/get", 1, "{\"id\":" + id + "}");
+            Assert.That(get.error, Is.Null);
+
+            var getResult = (Dictionary<string, object>)get.result;
+            Assert.That(getResult["level"], Is.EqualTo("exception"));
+            Assert.That(getResult["message"], Is.EqualTo("Backfilled exception"));
+            Assert.That(getResult["stackTrace"], Is.EqualTo("stack line 1\nstack line 2"));
+        }
+
         [Test]
         public void ObjectLifecycle_CreateMutateAndDelete_WorksEndToEnd()
         {
@@ -472,7 +544,7 @@ namespace UCP.Bridge.Tests
             );
             Assert.That(getPosition.error, Is.Null);
 
-            var updated = EditorUtility.InstanceIDToObject(instanceId) as GameObject;
+            var updated = UnityObjectCompat.ResolveByInstanceId(instanceId) as GameObject;
             Assert.That(updated, Is.Not.Null);
             var localPosition = updated.transform.localPosition;
             Assert.That(localPosition.x, Is.EqualTo(1f).Within(0.001f));
@@ -484,7 +556,7 @@ namespace UCP.Bridge.Tests
 
             var delete = _router.Dispatch("object/delete", 1, "{\"instanceId\":" + instanceId + "}");
             Assert.That(delete.error, Is.Null);
-            Assert.That(EditorUtility.InstanceIDToObject(instanceId), Is.Null);
+            Assert.That(UnityObjectCompat.ResolveByInstanceId(instanceId), Is.Null);
         }
 
         [Test]
@@ -501,7 +573,7 @@ namespace UCP.Bridge.Tests
             var response = _router.Dispatch(
                 "object/set-property",
                 1,
-                "{\"instanceId\":" + go.GetInstanceID() + ",\"component\":\"ReferenceComponent\",\"property\":\"referenceAsset\",\"value\":{\"path\":\"" + TempReferenceAssetPath + "\"}}"
+                "{\"instanceId\":" + go.GetId() + ",\"component\":\"ReferenceComponent\",\"property\":\"referenceAsset\",\"value\":{\"path\":\"" + TempReferenceAssetPath + "\"}}"
             );
 
             Assert.That(response.error, Is.Null);
@@ -526,7 +598,7 @@ namespace UCP.Bridge.Tests
             var response = _router.Dispatch(
                 "object/set-property",
                 1,
-                "{\"instanceId\":" + cube.GetInstanceID() + ",\"component\":\"MeshRenderer\",\"property\":\"m_Materials\",\"value\":[{\"path\":\"" + TempMaterialPath + "\"}]}"
+                "{\"instanceId\":" + cube.GetId() + ",\"component\":\"MeshRenderer\",\"property\":\"m_Materials\",\"value\":[{\"path\":\"" + TempMaterialPath + "\"}]}"
             );
 
             Assert.That(response.error, Is.Null);
@@ -544,7 +616,7 @@ namespace UCP.Bridge.Tests
             var response = _router.Dispatch(
                 "object/set-property",
                 1,
-                "{\"instanceId\":" + go.GetInstanceID() + ",\"component\":\"ReferenceComponent\",\"property\":\"referenceAsset\",\"value\":{\"path\":\"Assets/Missing.asset\"}}"
+                "{\"instanceId\":" + go.GetId() + ",\"component\":\"ReferenceComponent\",\"property\":\"referenceAsset\",\"value\":{\"path\":\"Assets/Missing.asset\"}}"
             );
 
             Assert.That(response.error, Is.Not.Null);
@@ -918,6 +990,62 @@ namespace UCP.Bridge.Tests
             Assert.That(UnityEngine.SceneManagement.SceneManager.GetSceneByPath(TempSceneBPath).isLoaded, Is.True);
         }
 
+        [Test]
+        public void ModalGuard_AutoSavesDirtyTitledScene_WithoutPrompting()
+        {
+            var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
+            Assert.That(EditorSceneManager.SaveScene(scene, TempScenePath), Is.True);
+            new GameObject("ModalGuardDirtyMaker");
+            EditorSceneManager.MarkSceneDirty(scene);
+            Assert.That(scene.isDirty, Is.True);
+
+            EditorModalGuard.SaveOpenDirtyScenes(true, true);
+
+            Assert.That(scene.isDirty, Is.False);
+            Assert.That(string.IsNullOrEmpty(scene.path), Is.False);
+        }
+
+        [Test]
+        public void ModalGuard_DiscardsDirtyUntitledScene_WhenDiscardAllowed()
+        {
+            var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
+            new GameObject("ModalGuardUntitledDirtyMaker");
+            EditorSceneManager.MarkSceneDirty(scene);
+            Assert.That(string.IsNullOrEmpty(scene.path), Is.True);
+            Assert.That(scene.isDirty, Is.True);
+
+            EditorModalGuard.SaveOpenDirtyScenes(true, true);
+
+            var active = UnityEngine.SceneManagement.SceneManager.GetActiveScene();
+            Assert.That(string.IsNullOrEmpty(active.path), Is.True);
+            Assert.That(active.isDirty, Is.False);
+            Assert.That(GameObject.Find("ModalGuardUntitledDirtyMaker"), Is.Null);
+        }
+
+        [Test]
+        public void ModalGuard_ThrowsOnDirtyUntitledScene_WhenDiscardDisallowed()
+        {
+            var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
+            new GameObject("ModalGuardUntitledDirtyMaker");
+            EditorSceneManager.MarkSceneDirty(scene);
+
+            Assert.That(
+                () => EditorModalGuard.SaveOpenDirtyScenes(true, false),
+                Throws.TypeOf<System.InvalidOperationException>());
+        }
+
+        [Test]
+        public void ModalGuard_LeavesSceneUntouched_WhenSavingDisabled()
+        {
+            var scene = EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
+            new GameObject("ModalGuardUntitledDirtyMaker");
+            EditorSceneManager.MarkSceneDirty(scene);
+            Assert.That(scene.isDirty, Is.True);
+
+            Assert.That(() => EditorModalGuard.SaveOpenDirtyScenes(false, false), Throws.Nothing);
+            Assert.That(UnityEngine.SceneManagement.SceneManager.GetActiveScene().isDirty, Is.True);
+        }
+
         [Test]
         public void PackagesController_DependencySetInfoAndRemove_LocalFilePackage()
         {
@@ -999,7 +1127,7 @@ namespace UCP.Bridge.Tests
             var response = _router.Dispatch(
                 "scene/focus",
                 1,
-                "{\"instanceId\":" + cube.GetInstanceID() + ",\"axis\":[1,0,1]}"
+                "{\"instanceId\":" + cube.GetId() + ",\"axis\":[1,0,1]}"
             );
 
             Assert.That(response.error, Is.Null);
@@ -1030,7 +1158,7 @@ namespace UCP.Bridge.Tests
             var response = _router.Dispatch(
                 "scene/focus",
                 1,
-                "{\"instanceId\":" + cube.GetInstanceID() + ",\"axis\":[0,0,0]}"
+                "{\"instanceId\":" + cube.GetId() + ",\"axis\":[0,0,0]}"
             );
 
             Assert.That(response.error, Is.Not.Null);

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

@@ -0,0 +1,252 @@
+using System;
+using System.Collections.Generic;
+using NUnit.Framework;
+using UnityEditor.SceneManagement;
+using UnityEngine;
+using UnityEngine.Rendering;
+using UnityEngine.SceneManagement;
+
+namespace UCP.Bridge.Tests
+{
+    /// <summary>
+    /// Edit-mode coverage for the spatial/visual controllers added for in-scene authoring:
+    /// TransformController, SpatialController, ViewController, and the shared ObjectLocator.
+    /// </summary>
+    public class SpatialVisualControllerTests
+    {
+        private CommandRouter _router;
+        private readonly List<GameObject> _spawned = new();
+
+        [SetUp]
+        public void SetUp()
+        {
+            EditorSceneManager.NewScene(NewSceneSetup.EmptyScene, NewSceneMode.Single);
+            _router = new CommandRouter();
+            HierarchyController.Register(_router);
+            TransformController.Register(_router);
+            SpatialController.Register(_router);
+            ViewController.Register(_router);
+            _spawned.Clear();
+        }
+
+        [TearDown]
+        public void TearDown()
+        {
+            foreach (var go in _spawned)
+                if (go != null) UnityEngine.Object.DestroyImmediate(go);
+            _spawned.Clear();
+        }
+
+        private GameObject Spawn(PrimitiveType type, string name, Vector3 pos)
+        {
+            var go = GameObject.CreatePrimitive(type);
+            go.name = name;
+            go.transform.position = pos;
+            _spawned.Add(go);
+            return go;
+        }
+
+        private static Dictionary<string, object> Result(JsonRpcResponse r)
+        {
+            Assert.That(r.error, Is.Null, "RPC returned an error");
+            return (Dictionary<string, object>)r.result;
+        }
+
+        private static float F(object o) => Convert.ToSingle(o);
+        private static List<object> Vec(Dictionary<string, object> d, string key) => (List<object>)d[key];
+
+        // --- Primitive builder ---------------------------------------------
+
+        [Test]
+        public void Object_CreatePrimitive_AddsMeshAndCollider()
+        {
+            var res = Result(_router.Dispatch("object/create", 1,
+                "{\"name\":\"Greybox\",\"primitive\":\"Cube\"}"));
+            var id = Convert.ToInt32(res["instanceId"]);
+            var go = ObjectLocator.FindByInstanceId(id);
+            _spawned.Add(go);
+
+            Assert.That(go, Is.Not.Null);
+            Assert.That(go.name, Is.EqualTo("Greybox"));
+            Assert.That(go.GetComponent<MeshFilter>(), Is.Not.Null, "primitive should have a mesh");
+            Assert.That(go.GetComponent<MeshFilter>().sharedMesh, Is.Not.Null);
+            Assert.That(go.GetComponent<Collider>(), Is.Not.Null, "primitive should have a collider");
+        }
+
+        [Test]
+        public void Object_CreatePrimitive_RejectsUnknownType()
+        {
+            var res = _router.Dispatch("object/create", 1,
+                "{\"name\":\"Bad\",\"primitive\":\"Dodecahedron\"}");
+            Assert.That(res.error, Is.Not.Null, "unknown primitive must be an InvalidParams error, not a crash");
+        }
+
+        [Test]
+        public void Object_Instantiate_PrimitiveName_RedirectsToPrimitiveFlag()
+        {
+            // The exact wrong path a weak agent took: treating "PrimitiveType.Cube" as a prefab.
+            var res = _router.Dispatch("object/instantiate", 1,
+                "{\"prefab\":\"PrimitiveType.Cube\"}");
+            Assert.That(res.error, Is.Not.Null);
+            Assert.That(res.error.message, Does.Contain("--primitive"),
+                "the not-found error should redirect to object create --primitive");
+        }
+
+        // --- Transform -----------------------------------------------------
+
+        [Test]
+        public void Transform_Move_WorldAbsoluteAndRelative()
+        {
+            var go = Spawn(PrimitiveType.Cube, "Mover", Vector3.zero);
+            var id = go.GetId();
+
+            var abs = Result(_router.Dispatch("transform/move", 1,
+                "{\"instanceId\":" + id + ",\"position\":[5,0,0],\"space\":\"world\"}"));
+            Assert.That(go.transform.position.x, Is.EqualTo(5f).Within(0.001f));
+            Assert.That(F(Vec(abs, "position")[0]), Is.EqualTo(5f).Within(0.001f));
+
+            _router.Dispatch("transform/move", 1,
+                "{\"instanceId\":" + id + ",\"position\":[1,0,0],\"relative\":true}");
+            Assert.That(go.transform.position.x, Is.EqualTo(6f).Within(0.001f));
+        }
+
+        [Test]
+        public void Transform_Rotate_AbsoluteEulerWorld()
+        {
+            var go = Spawn(PrimitiveType.Cube, "Rotor", Vector3.zero);
+            _router.Dispatch("transform/rotate", 1,
+                "{\"instanceId\":" + go.GetId() + ",\"euler\":[0,90,0]}");
+            Assert.That(go.transform.eulerAngles.y, Is.EqualTo(90f).Within(0.01f));
+        }
+
+        [Test]
+        public void Transform_Scale_UniformAndNonUniform()
+        {
+            var go = Spawn(PrimitiveType.Cube, "Scaler", Vector3.zero);
+            _router.Dispatch("transform/scale", 1, "{\"instanceId\":" + go.GetId() + ",\"uniform\":2}");
+            Assert.That(go.transform.localScale, Is.EqualTo(Vector3.one * 2f));
+
+            _router.Dispatch("transform/scale", 1, "{\"instanceId\":" + go.GetId() + ",\"scale\":[1,3,1],\"relative\":true}");
+            Assert.That(go.transform.localScale.y, Is.EqualTo(6f).Within(0.001f));
+        }
+
+        [Test]
+        public void Transform_LookAt_FacesWorldPoint()
+        {
+            var go = Spawn(PrimitiveType.Cube, "Looker", Vector3.zero);
+            _router.Dispatch("transform/look-at", 1,
+                "{\"instanceId\":" + go.GetId() + ",\"target\":[10,0,0]}");
+            // forward should point along +X
+            Assert.That(Vector3.Dot(go.transform.forward, Vector3.right), Is.GreaterThan(0.99f));
+        }
+
+        [Test]
+        public void Transform_Get_BulkReadByIds()
+        {
+            var a = Spawn(PrimitiveType.Cube, "A", new Vector3(1, 0, 0));
+            var b = Spawn(PrimitiveType.Cube, "B", new Vector3(2, 0, 0));
+            var res = Result(_router.Dispatch("transform/get", 1,
+                "{\"ids\":[" + a.GetId() + "," + b.GetId() + "]}"));
+            Assert.That(Convert.ToInt32(res["count"]), Is.EqualTo(2));
+        }
+
+        // --- ObjectLocator -------------------------------------------------
+
+        [Test]
+        public void Locator_ResolvesByNameAndPath()
+        {
+            var root = Spawn(PrimitiveType.Cube, "Root", Vector3.zero);
+            var child = GameObject.CreatePrimitive(PrimitiveType.Cube);
+            child.name = "Child";
+            child.transform.SetParent(root.transform, false);
+            _spawned.Add(child);
+
+            _router.Dispatch("transform/move", 1, "{\"name\":\"Child\",\"position\":[0,4,0]}");
+            Assert.That(child.transform.position.y, Is.EqualTo(4f).Within(0.001f));
+
+            _router.Dispatch("transform/move", 1, "{\"path\":\"Root/Child\",\"position\":[0,7,0]}");
+            Assert.That(child.transform.position.y, Is.EqualTo(7f).Within(0.001f));
+        }
+
+        // --- Spatial -------------------------------------------------------
+
+        [Test]
+        public void Spatial_Raycast_HitsColliderBelow()
+        {
+            var ground = Spawn(PrimitiveType.Cube, "Ground", Vector3.zero);
+            ground.transform.localScale = new Vector3(20, 1, 20);
+
+            var res = Result(_router.Dispatch("physics/raycast", 1,
+                "{\"origin\":[0,5,0],\"direction\":[0,-1,0]}"));
+            Assert.That(Convert.ToBoolean(res["hit"]), Is.True);
+            Assert.That(Convert.ToInt32(res["instanceId"]), Is.EqualTo(ground.GetId()));
+        }
+
+        [Test]
+        public void Spatial_Overlap_FindsSphereOverlap()
+        {
+            var box = Spawn(PrimitiveType.Cube, "Box", Vector3.zero);
+            var res = Result(_router.Dispatch("physics/overlap", 1,
+                "{\"shape\":\"sphere\",\"center\":[0,0,0],\"radius\":2}"));
+            Assert.That(Convert.ToInt32(res["count"]), Is.GreaterThanOrEqualTo(1));
+            _ = box;
+        }
+
+        [Test]
+        public void Spatial_Bounds_ReturnsWorldAabb()
+        {
+            var go = Spawn(PrimitiveType.Cube, "Bounded", new Vector3(3, 0, 0));
+            var res = Result(_router.Dispatch("object/bounds", 1, "{\"instanceId\":" + go.GetId() + "}"));
+            Assert.That(F(Vec(res, "center")[0]), Is.EqualTo(3f).Within(0.01f));
+            Assert.That(Convert.ToBoolean(res["empty"]), Is.False);
+        }
+
+        [Test]
+        public void Spatial_Ground_DropsObjectOntoSurface()
+        {
+            var ground = Spawn(PrimitiveType.Cube, "Floor", Vector3.zero);
+            ground.transform.localScale = new Vector3(20, 1, 20); // top surface at y=0.5
+            var cube = Spawn(PrimitiveType.Cube, "Falling", new Vector3(0, 8, 0));
+
+            var res = Result(_router.Dispatch("spatial/ground", 1,
+                "{\"instanceId\":" + cube.GetId() + ",\"apply\":true}"));
+            Assert.That(Convert.ToBoolean(res["hit"]), Is.True);
+            // Cube (half-height 0.5) should rest with its centre at surface(0.5) + 0.5 = 1.0
+            Assert.That(cube.transform.position.y, Is.EqualTo(1f).Within(0.05f));
+        }
+
+        [Test]
+        public void Spatial_Nearest_SortsByDistance()
+        {
+            Spawn(PrimitiveType.Cube, "Near", new Vector3(1, 0, 0));
+            Spawn(PrimitiveType.Cube, "Mid", new Vector3(5, 0, 0));
+            Spawn(PrimitiveType.Cube, "Far", new Vector3(20, 0, 0));
+
+            var res = Result(_router.Dispatch("spatial/nearest", 1,
+                "{\"point\":[0,0,0],\"max\":2}"));
+            var objects = (List<object>)res["objects"];
+            Assert.That(objects.Count, Is.EqualTo(2));
+            var first = (Dictionary<string, object>)objects[0];
+            Assert.That(first["name"].ToString(), Is.EqualTo("Near"));
+        }
+
+        // --- View ----------------------------------------------------------
+
+        [Test]
+        public void View_Isolate_ProducesPngForSingleView()
+        {
+            if (SystemInfo.graphicsDeviceType == GraphicsDeviceType.Null)
+                Assert.Ignore("No graphics device (headless -nographics); skipping render test.");
+
+            var go = Spawn(PrimitiveType.Cube, "Hero", Vector3.zero);
+            var res = Result(_router.Dispatch("view/isolate", 1,
+                "{\"instanceId\":" + go.GetId() + ",\"views\":[\"front\"],\"maxEdge\":128}"));
+
+            Assert.That(res["encoding"].ToString(), Is.EqualTo("base64"));
+            Assert.That(res["data"].ToString().Length, Is.GreaterThan(0));
+            Assert.That(Convert.ToInt32(res["width"]), Is.EqualTo(128));
+            // Isolation must restore the object's original layer.
+            Assert.That(go.layer, Is.EqualTo(0));
+        }
+    }
+}

package/bridge/com.ucp.bridge/Tests/Editor/SpatialVisualControllerTests.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7a8b9c0d1e2f3041a2b3c4d5e6f70819

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

@@ -1,6 +1,6 @@
 {
   "name": "com.ucp.bridge",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "displayName": "Unity Control Protocol Bridge",
   "description": "WebSocket bridge for programmatic Unity Editor control via CLI and AI agents.",
   "unity": "2021.3",

package/package.json

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