Harden manage_scriptable_object Tool

MCPForUnity/Editor/Helpers/VectorParsing.cs

@@ -96,6 +96,49 @@ public static Vector3 ParseVector3OrDefault(JToken token, Vector3 defaultValue =
             return null;
         }
 
+        /// <summary>
+        /// Parses a JToken (array or object) into a Vector4.
+        /// </summary>
+        /// <param name="token">The JSON token to parse</param>
+        /// <returns>The parsed Vector4 or null if parsing fails</returns>
+        public static Vector4? ParseVector4(JToken token)
+        {
+            if (token == null || token.Type == JTokenType.Null)
+                return null;
+
+            try
+            {
+                // Array format: [x, y, z, w]
+                if (token is JArray array && array.Count >= 4)
+                {
+                    return new Vector4(
+                        array[0].ToObject<float>(),
+                        array[1].ToObject<float>(),
+                        array[2].ToObject<float>(),
+                        array[3].ToObject<float>()
+                    );
+                }
+
+                // Object format: {x: 1, y: 2, z: 3, w: 4}
+                if (token is JObject obj && obj.ContainsKey("x") && obj.ContainsKey("y") && 
+                    obj.ContainsKey("z") && obj.ContainsKey("w"))
+                {
+                    return new Vector4(
+                        obj["x"].ToObject<float>(),
+                        obj["y"].ToObject<float>(),
+                        obj["z"].ToObject<float>(),
+                        obj["w"].ToObject<float>()
+                    );
+                }
+            }
+            catch (Exception ex)
+            {
+                Debug.LogWarning($"[VectorParsing] Failed to parse Vector4 from '{token}': {ex.Message}");
+            }
+
+            return null;
+        }
+
         /// <summary>
         /// Parses a JToken (array or object) into a Quaternion.
         /// Supports both euler angles [x, y, z] and quaternion components [x, y, z, w].

Server/src/services/tools/manage_scriptable_object.py

@@ -41,6 +41,8 @@ async def manage_scriptable_object(
     target: Annotated[dict[str, Any] | str | None, "Target asset reference {guid|path} (for modify)."] = None,
     # --- shared ---
     patches: Annotated[list[dict[str, Any]] | str | None, "Patch list (or JSON string) to apply."] = None,
+    # --- validation ---
+    dry_run: Annotated[bool | str | None, "If true, validate patches without applying (modify only)."] = None,
 ) -> dict[str, Any]:
     unity_instance = get_unity_instance_from_context(ctx)
 
@@ -62,6 +64,7 @@ async def manage_scriptable_object(
         "overwrite": coerce_bool(overwrite, default=None),
         "target": parsed_target,
         "patches": parsed_patches,
+        "dryRun": coerce_bool(dry_run, default=None),
     }
 
     # Remove None values to keep Unity handler simpler

Server/tests/integration/test_manage_scriptable_object_tool.py

@@ -69,4 +69,62 @@ async def fake_async_send(cmd, params, **kwargs):
     assert captured["params"]["patches"][0]["op"] == "array_resize"
 
 
+def test_manage_scriptable_object_forwards_dry_run_param(monkeypatch):
+    captured = {}
+
+    async def fake_async_send(cmd, params, **kwargs):
+        captured["cmd"] = cmd
+        captured["params"] = params
+        return {"success": True, "data": {"dryRun": True, "validationResults": []}}
+
+    monkeypatch.setattr(mod, "async_send_command_with_retry", fake_async_send)
+
+    ctx = DummyContext()
+    ctx.set_state("unity_instance", "UnityMCPTests@dummy")
+
+    result = asyncio.run(
+        mod.manage_scriptable_object(
+            ctx=ctx,
+            action="modify",
+            target='{"guid":"abc123"}',
+            patches=[{"propertyPath": "intValue", "op": "set", "value": 42}],
+            dry_run=True,
+        )
+    )
+
+    assert result["success"] is True
+    assert captured["cmd"] == "manage_scriptable_object"
+    assert captured["params"]["action"] == "modify"
+    assert captured["params"]["dryRun"] is True
+    assert captured["params"]["target"] == {"guid": "abc123"}
+
+
+def test_manage_scriptable_object_dry_run_string_coercion(monkeypatch):
+    """Test that dry_run accepts string 'true' and coerces to boolean."""
+    captured = {}
+
+    async def fake_async_send(cmd, params, **kwargs):
+        captured["cmd"] = cmd
+        captured["params"] = params
+        return {"success": True, "data": {"dryRun": True}}
+
+    monkeypatch.setattr(mod, "async_send_command_with_retry", fake_async_send)
+
+    ctx = DummyContext()
+    ctx.set_state("unity_instance", "UnityMCPTests@dummy")
+
+    result = asyncio.run(
+        mod.manage_scriptable_object(
+            ctx=ctx,
+            action="modify",
+            target={"guid": "xyz"},
+            patches=[],
+            dry_run="true",  # String instead of bool
+        )
+    )
+
+    assert result["success"] is True
+    assert captured["params"]["dryRun"] is True
+
+
 

TestProjects/UnityMCPTests/Assets/Tests/EditMode/TestUtilities.cs

@@ -0,0 +1,140 @@
+using System;
+using System.Collections;
+using System.IO;
+using Newtonsoft.Json.Linq;
+using NUnit.Framework;
+using UnityEditor;
+using UnityEngine;
+
+namespace MCPForUnityTests.Editor
+{
+    /// <summary>
+    /// Shared test utilities for EditMode tests across the MCP for Unity test suite.
+    /// Consolidates common patterns to avoid duplication across test files.
+    /// </summary>
+    public static class TestUtilities
+    {
+        /// <summary>
+        /// Safely converts a command result to JObject, handling both JSON objects and other types.
+        /// Returns an empty JObject if result is null.
+        /// </summary>
+        public static JObject ToJObject(object result)
+        {
+            if (result == null) return new JObject();
+            return result as JObject ?? JObject.FromObject(result);
+        }
+
+        /// <summary>
+        /// Creates all parent directories for the given asset path if they don't exist.
+        /// Handles normalization and validates against dangerous patterns.
+        /// </summary>
+        /// <param name="folderPath">An Assets-relative folder path (e.g., "Assets/Temp/MyFolder")</param>
+        public static void EnsureFolder(string folderPath)
+        {
+            if (AssetDatabase.IsValidFolder(folderPath))
+                return;
+
+            var sanitized = MCPForUnity.Editor.Helpers.AssetPathUtility.SanitizeAssetPath(folderPath);
+            if (string.Equals(sanitized, "Assets", StringComparison.OrdinalIgnoreCase))
+                return;
+
+            var parts = sanitized.Split('/');
+            string current = "Assets";
+            for (int i = 1; i < parts.Length; i++)
+            {
+                var next = current + "/" + parts[i];
+                if (!AssetDatabase.IsValidFolder(next))
+                {
+                    AssetDatabase.CreateFolder(current, parts[i]);
+                }
+                current = next;
+            }
+        }
+
+        /// <summary>
+        /// Waits for Unity to finish compiling and updating, with a configurable timeout.
+        /// Some EditMode tests trigger script compilation/domain reload. 
+        /// Tools intentionally return "compiling_or_reloading" during these windows.
+        /// </summary>
+        /// <param name="timeoutSeconds">Maximum time to wait before failing the test.</param>
+        public static IEnumerator WaitForUnityReady(double timeoutSeconds = 30.0)
+        {
+            double start = EditorApplication.timeSinceStartup;
+            while (EditorApplication.isCompiling || EditorApplication.isUpdating)
+            {
+                if (EditorApplication.timeSinceStartup - start > timeoutSeconds)
+                {
+                    Assert.Fail($"Timed out waiting for Unity to finish compiling/updating (>{timeoutSeconds:0.0}s).");
+                }
+                yield return null;
+            }
+        }
+
+        /// <summary>
+        /// Finds a fallback shader for creating materials in tests.
+        /// Tries modern pipelines first, then falls back to Standard/Unlit.
+        /// </summary>
+        /// <returns>A shader suitable for test materials, or null if none found.</returns>
+        public static Shader FindFallbackShader()
+        {
+            return Shader.Find("Universal Render Pipeline/Lit")
+                ?? Shader.Find("HDRP/Lit")
+                ?? Shader.Find("Standard")
+                ?? Shader.Find("Unlit/Color");
+        }
+
+        /// <summary>
+        /// Safely deletes an asset if it exists.
+        /// </summary>
+        /// <param name="path">The asset path to delete.</param>
+        public static void SafeDeleteAsset(string path)
+        {
+            if (!string.IsNullOrEmpty(path) && AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(path) != null)
+            {
+                AssetDatabase.DeleteAsset(path);
+            }
+        }
+
+        /// <summary>
+        /// Cleans up empty parent folders recursively up to but not including "Assets".
+        /// Useful in TearDown to avoid leaving folder debris.
+        /// </summary>
+        /// <param name="folderPath">The starting folder path to check.</param>
+        public static void CleanupEmptyParentFolders(string folderPath)
+        {
+            if (string.IsNullOrEmpty(folderPath))
+                return;
+
+            var parent = Path.GetDirectoryName(folderPath)?.Replace('\\', '/');
+            while (!string.IsNullOrEmpty(parent) && parent != "Assets")
+            {
+                if (AssetDatabase.IsValidFolder(parent))
+                {
+                    try
+                    {
+                        var dirs = Directory.GetDirectories(parent);
+                        var files = Directory.GetFiles(parent);
+                        if (dirs.Length == 0 && files.Length == 0)
+                        {
+                            AssetDatabase.DeleteAsset(parent);
+                            parent = Path.GetDirectoryName(parent)?.Replace('\\', '/');
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    catch
+                    {
+                        break;
+                    }
+                }
+                else
+                {
+                    break;
+                }
+            }
+        }
+    }
+}
+

TestProjects/UnityMCPTests/Assets/Tests/EditMode/Tools/Fixtures/StressTestSOs/ArrayStressSO.cs

@@ -0,0 +1,7 @@
+using UnityEngine;
+
+[CreateAssetMenu(fileName = "ArrayStressSO", menuName = "StressTests/ArrayStressSO")]
+public class ArrayStressSO : ScriptableObject
+{
+    public float[] floatArray = new float[3];
+}

TestProjects/UnityMCPTests/Assets/Tests/EditMode/Tools/Fixtures/StressTestSOs/ComplexStressSO.cs

@@ -0,0 +1,52 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+[System.Serializable]
+public struct NestedData
+{
+    public string id;
+    public float value;
+    public Vector3 position;
+}
+
+[System.Serializable]
+public class ComplexSubClass
+{
+    public string name;
+    public int level;
+    public List<float> scores;
+}
+
+public enum TestEnum
+{
+    Alpha,
+    Beta,
+    Gamma
+}
+
+[CreateAssetMenu(fileName = "ComplexStressSO", menuName = "StressTests/ComplexStressSO")]
+public class ComplexStressSO : ScriptableObject
+{
+    [Header("Basic Types")]
+    public int intValue;
+    public float floatValue;
+    public string stringValue;
+    public bool boolValue;
+    public Vector3 vectorValue;
+    public Color colorValue;
+    public TestEnum enumValue;
+
+    [Header("Arrays & Lists")]
+    public int[] intArray;
+    public List<string> stringList;
+    public Vector3[] vectorArray;
+
+    [Header("Complex Types")]
+    public NestedData nestedStruct;
+    public ComplexSubClass nestedClass;
+    public List<NestedData> nestedDataList;
+
+    [Header("Extended Types (Phase 6)")]
+    public AnimationCurve animCurve;
+    public Quaternion rotation;
+}