Merge pull request #1047 from CoplayDev/release/v9.6.6

chore: bump version to 9.6.6

Author: github-actions[bot]

.github/workflows/unity-tests.yml

@@ -76,6 +76,7 @@ jobs:
         if: steps.detect.outputs.unity_ok == 'true'
         uses: game-ci/unity-test-runner@v4
         id: tests
+        continue-on-error: true
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -86,6 +87,25 @@ jobs:
           unityVersion: ${{ matrix.unityVersion }}
           testMode: ${{ matrix.testMode }}
 
+      - name: Check test results
+        if: steps.detect.outputs.unity_ok == 'true'
+        run: |
+          RESULTS_XML=$(find ${{ steps.tests.outputs.artifactsPath }} -name '*.xml' 2>/dev/null | head -1)
+          if [ -z "$RESULTS_XML" ]; then
+            echo "::error::No test results XML found — Unity may have crashed"
+            exit 1
+          fi
+          FAILED=$(grep -oP 'failed="\K[0-9]+' "$RESULTS_XML" | head -1)
+          PASSED=$(grep -oP 'passed="\K[0-9]+' "$RESULTS_XML" | head -1)
+          TOTAL=$(grep -oP 'total="\K[0-9]+' "$RESULTS_XML" | head -1)
+          INCONCLUSIVE=$(grep -oP 'inconclusive="\K[0-9]+' "$RESULTS_XML" | head -1)
+          SKIPPED=$(grep -oP 'skipped="\K[0-9]+' "$RESULTS_XML" | head -1)
+          echo "Results: $PASSED passed, $FAILED failed, $INCONCLUSIVE inconclusive, $SKIPPED skipped (total: $TOTAL)"
+          if [ "$FAILED" != "0" ]; then
+            echo "::error::$FAILED test(s) failed"
+            exit 1
+          fi
+
       - uses: actions/upload-artifact@v4
         if: always() && steps.detect.outputs.unity_ok == 'true'
         with:

MCPForUnity/Editor/Helpers/ComponentOps.cs

@@ -748,6 +748,18 @@ internal static bool SetObjectReference(SerializedProperty prop, JToken value, o
                     return AssignObjectReference(prop, resolved, null, out error);
                 }
 
+                // Try as asset GUID (32-char hex string)
+                if (strVal.Length == 32 && IsHexString(strVal))
+                {
+                    string assetPath = AssetDatabase.GUIDToAssetPath(strVal);
+                    if (!string.IsNullOrEmpty(assetPath))
+                    {
+                        var resolved = AssetDatabase.LoadAssetAtPath<UnityEngine.Object>(assetPath);
+                        if (resolved != null)
+                            return AssignObjectReference(prop, resolved, null, out error);
+                    }
+                }
+
                 // Fall back to scene hierarchy lookup by name.
                 return ResolveSceneObjectByName(prop, strVal, null, out error);
             }
@@ -969,6 +981,16 @@ private static long GetSpriteFileId(Sprite sprite)
                 return 0;
             }
         }
+
+        private static bool IsHexString(string str)
+        {
+            foreach (char c in str)
+            {
+                if (!((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')))
+                    return false;
+            }
+            return true;
+        }
     }
 }
 

MCPForUnity/Editor/Tools/ManageComponents.cs

@@ -146,7 +146,26 @@ private static object RemoveComponent(JObject @params, JToken targetToken, strin
                 return new ErrorResponse($"Component type '{componentTypeName}' not found.");
             }
 
-            // Use ComponentOps for the actual operation
+            int? componentIndex = ParamCoercion.CoerceIntNullable(@params["componentIndex"] ?? @params["component_index"]);
+            if (componentIndex.HasValue)
+            {
+                var components = targetGo.GetComponents(type);
+                if (componentIndex.Value < 0 || componentIndex.Value >= components.Length)
+                    return new ErrorResponse($"component_index {componentIndex.Value} out of range. Found {components.Length} '{componentTypeName}' component(s).");
+                if (type == typeof(Transform) || type == typeof(RectTransform))
+                    return new ErrorResponse("Cannot remove Transform or RectTransform components.");
+                Undo.DestroyObjectImmediate(components[componentIndex.Value]);
+                EditorUtility.SetDirty(targetGo);
+                MarkOwningSceneDirty(targetGo);
+                return new
+                {
+                    success = true,
+                    message = $"Component '{componentTypeName}' (index {componentIndex.Value}) removed from '{targetGo.name}'.",
+                    data = new { instanceID = targetGo.GetInstanceID(), componentIndex = componentIndex.Value }
+                };
+            }
+
+            // Use ComponentOps for the actual operation (removes first instance)
             bool removed = ComponentOps.RemoveComponent(targetGo, type, out string error);
             if (!removed)
             {
@@ -188,7 +207,19 @@ private static object SetProperty(JObject @params, JToken targetToken, string se
                 return new ErrorResponse($"Component type '{componentType}' not found.");
             }
 
-            Component component = targetGo.GetComponent(type);
+            int? componentIndex = ParamCoercion.CoerceIntNullable(@params["componentIndex"] ?? @params["component_index"]);
+            Component component;
+            if (componentIndex.HasValue)
+            {
+                var components = targetGo.GetComponents(type);
+                if (componentIndex.Value < 0 || componentIndex.Value >= components.Length)
+                    return new ErrorResponse($"component_index {componentIndex.Value} out of range. Found {components.Length} '{componentType}' component(s).");
+                component = components[componentIndex.Value];
+            }
+            else
+            {
+                component = targetGo.GetComponent(type);
+            }
             if (component == null)
             {
                 return new ErrorResponse($"Component '{componentType}' not found on '{targetGo.name}'.");

MCPForUnity/Editor/Tools/ManageScript.cs

@@ -1910,6 +1910,10 @@ private static bool TryComputeMethodSpan(
             int probe = lineStart - 1;
             while (probe > searchStart)
             {
+                // Skip past line-ending chars so LastIndexOf finds the *previous* newline
+                while (probe > searchStart && (source[probe] == '\n' || source[probe] == '\r'))
+                    probe--;
+                if (probe <= searchStart) break;
                 int prevNl = source.LastIndexOf('\n', probe);
                 if (prevNl < 0 || prevNl < searchStart) break;
                 string prev = source.Substring(prevNl + 1, attrStart - (prevNl + 1));
@@ -2740,16 +2744,18 @@ private static void CheckDuplicateMethodSignatures(string contents, System.Colle
 
             // Step 3: Match method signatures on code-only text (includes => for expression-bodied)
             var methodSigPattern = new Regex(
-                @"(?:(?:public|private|protected|internal)\s+)?(?:(?:static|virtual|override|abstract|sealed|async|new)\s+)*\S+\s+(\w+)\s*\(([^)]*)\)\s*(?:where\s+\S+\s*:\s*\S+\s*)?(?:[{;]|=>)",
+                @"(?:(?:public|private|protected|internal)\s+)?(?:(?:static|virtual|override|abstract|sealed|async|new)\s+)*(\S+)\s+(\w+)\s*\(([^)]*)\)\s*(?:where\s+\S+\s*:\s*\S+\s*)?(?:[{;]|=>)",
                 RegexOptions.Multiline | RegexOptions.CultureInvariant, TimeSpan.FromSeconds(2));
             var sigMatches = methodSigPattern.Matches(codeOnly);
             var seen = new System.Collections.Generic.Dictionary<string, int>(System.StringComparer.Ordinal);
             foreach (Match sm in sigMatches)
             {
-                string methodName = sm.Groups[1].Value;
+                string returnType = sm.Groups[1].Value;
+                string methodName = sm.Groups[2].Value;
+                if (string.Equals(returnType, "new", StringComparison.Ordinal)) continue; // constructor invocation, not a method declaration
                 if (IsCSharpKeyword(methodName)) continue;
-                int paramCount = CountTopLevelParams(sm.Groups[2].Value);
-                string paramTypes = ExtractParamTypes(sm.Groups[2].Value);
+                int paramCount = CountTopLevelParams(sm.Groups[3].Value);
+                string paramTypes = ExtractParamTypes(sm.Groups[3].Value);
                 string containingType = containingTypeArr[sm.Index];
                 string key = $"{containingType}/{methodName}/{paramCount}/{paramTypes}";
                 if (seen.TryGetValue(key, out _))

MCPForUnity/Editor/Tools/Physics/JointOps.cs

@@ -161,9 +161,17 @@ public static object ConfigureJoint(JObject @params)
                 return new ErrorResponse($"Target GameObject '{targetStr}' not found.");
 
             string jointTypeStr = p.Get("joint_type");
-            Component joint = ResolveJoint(go, jointTypeStr);
+            int? componentIndex = ParamCoercion.CoerceIntNullable(@params["componentIndex"] ?? @params["component_index"]);
+
+            if (componentIndex.HasValue && string.IsNullOrEmpty(jointTypeStr))
+                return new ErrorResponse("component_index requires joint_type to be specified.");
+
+            Component joint = ResolveJoint(go, jointTypeStr, componentIndex, out int foundCount);
             if (joint == null)
             {
+                if (componentIndex.HasValue && foundCount >= 0)
+                    return new ErrorResponse($"component_index {componentIndex.Value} out of range. Found {foundCount} joint(s) on '{go.name}'.");
+
                 if (!string.IsNullOrEmpty(jointTypeStr))
                     return new ErrorResponse($"No joint of type '{jointTypeStr}' found on '{go.name}'.");
 
@@ -324,6 +332,10 @@ public static object RemoveJoint(JObject @params)
                 return new ErrorResponse($"Target GameObject '{targetStr}' not found.");
 
             string jointTypeStr = p.Get("joint_type");
+            int? componentIndex = ParamCoercion.CoerceIntNullable(@params["componentIndex"] ?? @params["component_index"]);
+
+            if (componentIndex.HasValue && string.IsNullOrEmpty(jointTypeStr))
+                return new ErrorResponse("component_index requires joint_type to be specified.");
 
             var jointsToRemove = new List<Component>();
 
@@ -342,7 +354,17 @@ public static object RemoveJoint(JObject @params)
                 }
 
                 var components = go.GetComponents(jointComponentType);
-                jointsToRemove.AddRange(components);
+
+                if (componentIndex.HasValue)
+                {
+                    if (componentIndex.Value < 0 || componentIndex.Value >= components.Length)
+                        return new ErrorResponse($"component_index {componentIndex.Value} out of range. Found {components.Length} '{jointComponentType.Name}' joint(s) on '{go.name}'.");
+                    jointsToRemove.Add(components[componentIndex.Value]);
+                }
+                else
+                {
+                    jointsToRemove.AddRange(components);
+                }
             }
             else
             {
@@ -403,16 +425,27 @@ private static GameObject FindTarget(JToken targetToken, string searchMethod)
             return GameObjectLookup.FindByTarget(targetToken, searchMethod ?? "by_name", true);
         }
 
-        private static Component ResolveJoint(GameObject go, string jointTypeStr)
+        private static Component ResolveJoint(GameObject go, string jointTypeStr, int? index, out int foundCount)
         {
+            foundCount = -1;
             if (!string.IsNullOrEmpty(jointTypeStr))
             {
                 bool is2D = go.GetComponent<Rigidbody2D>() != null;
                 var typeMap = is2D ? JointTypes2D : JointTypes3D;
                 string key = jointTypeStr.ToLowerInvariant();
 
                 if (typeMap.TryGetValue(key, out Type jointType))
+                {
+                    if (index.HasValue)
+                    {
+                        var components = go.GetComponents(jointType);
+                        foundCount = components.Length;
+                        if (index.Value < 0 || index.Value >= components.Length)
+                            return null;
+                        return components[index.Value];
+                    }
                     return go.GetComponent(jointType);
+                }
 
                 return null;
             }

MCPForUnity/Editor/Tools/Physics/PhysicsMaterialOps.cs

@@ -79,6 +79,7 @@ public static object Assign(JObject @params)
 
             string searchMethod = p.Get("search_method") ?? "by_name";
             string colliderType = p.Get("collider_type");
+            int? componentIndex = ParamCoercion.CoerceIntNullable(p.GetRaw("componentIndex") ?? p.GetRaw("component_index"));
 
             var go = GameObjectLookup.FindByTarget(targetToken, searchMethod);
             if (go == null)
@@ -98,7 +99,7 @@ public static object Assign(JObject @params)
             // Try 3D colliders first
             if (mat3D != null)
             {
-                var collider3D = FindCollider3D(go, colliderType);
+                var collider3D = FindCollider3D(go, colliderType, componentIndex);
                 if (collider3D != null)
                 {
                     Undo.RecordObject(collider3D, "Assign Physics Material");
@@ -116,12 +117,25 @@ public static object Assign(JObject @params)
                         }
                     };
                 }
+                if (componentIndex.HasValue)
+                {
+                    var type3D = !string.IsNullOrEmpty(colliderType) ? UnityTypeResolver.ResolveComponent(colliderType) : typeof(Collider);
+                    if (type3D != null && typeof(Collider).IsAssignableFrom(type3D))
+                    {
+                        int count3D = go.GetComponents(type3D).Length;
+                        return new ErrorResponse($"component_index {componentIndex.Value} out of range. Found {count3D} '{type3D.Name}' collider(s) on '{go.name}'.");
+                    }
+                    else if (!string.IsNullOrEmpty(colliderType))
+                    {
+                        return new ErrorResponse($"Unknown or invalid 3D collider type: '{colliderType}'.");
+                    }
+                }
             }
 
             // Try 2D colliders
             if (mat2D != null)
             {
-                var collider2D = FindCollider2D(go, colliderType);
+                var collider2D = FindCollider2D(go, colliderType, componentIndex);
                 if (collider2D != null)
                 {
                     Undo.RecordObject(collider2D, "Assign Physics Material 2D");
@@ -139,6 +153,19 @@ public static object Assign(JObject @params)
                         }
                     };
                 }
+                if (componentIndex.HasValue)
+                {
+                    var type2D = !string.IsNullOrEmpty(colliderType) ? UnityTypeResolver.ResolveComponent(colliderType) : typeof(Collider2D);
+                    if (type2D != null && typeof(Collider2D).IsAssignableFrom(type2D))
+                    {
+                        int count2D = go.GetComponents(type2D).Length;
+                        return new ErrorResponse($"component_index {componentIndex.Value} out of range. Found {count2D} '{type2D.Name}' collider(s) on '{go.name}'.");
+                    }
+                    else if (!string.IsNullOrEmpty(colliderType))
+                    {
+                        return new ErrorResponse($"Unknown or invalid 2D collider type: '{colliderType}'.");
+                    }
+                }
             }
 
             return new ErrorResponse($"No suitable collider found on '{go.name}'.");
@@ -398,29 +425,63 @@ private static object Configure2D(string path, JObject properties)
         // Assign helpers
         // =====================================================================
 
-        private static Collider FindCollider3D(GameObject go, string colliderType)
+        private static Collider FindCollider3D(GameObject go, string colliderType, int? index = null)
         {
             if (!string.IsNullOrEmpty(colliderType))
             {
                 var type = UnityTypeResolver.ResolveComponent(colliderType);
                 if (type != null && typeof(Collider).IsAssignableFrom(type))
+                {
+                    if (index.HasValue)
+                    {
+                        var components = go.GetComponents(type);
+                        if (index.Value < 0 || index.Value >= components.Length)
+                            return null;
+                        return components[index.Value] as Collider;
+                    }
                     return go.GetComponent(type) as Collider;
+                }
                 return null;
             }
 
+            if (index.HasValue)
+            {
+                var colliders = go.GetComponents<Collider>();
+                if (index.Value < 0 || index.Value >= colliders.Length)
+                    return null;
+                return colliders[index.Value];
+            }
+
             return go.GetComponent<Collider>();
         }
 
-        private static Collider2D FindCollider2D(GameObject go, string colliderType)
+        private static Collider2D FindCollider2D(GameObject go, string colliderType, int? index = null)
         {
             if (!string.IsNullOrEmpty(colliderType))
             {
                 var type = UnityTypeResolver.ResolveComponent(colliderType);
                 if (type != null && typeof(Collider2D).IsAssignableFrom(type))
+                {
+                    if (index.HasValue)
+                    {
+                        var components = go.GetComponents(type);
+                        if (index.Value < 0 || index.Value >= components.Length)
+                            return null;
+                        return components[index.Value] as Collider2D;
+                    }
                     return go.GetComponent(type) as Collider2D;
+                }
                 return null;
             }
 
+            if (index.HasValue)
+            {
+                var colliders = go.GetComponents<Collider2D>();
+                if (index.Value < 0 || index.Value >= colliders.Length)
+                    return null;
+                return colliders[index.Value];
+            }
+
             return go.GetComponent<Collider2D>();
         }
 

MCPForUnity/Editor/Tools/Profiler/Operations/CounterOps.cs

@@ -111,7 +111,11 @@ void Tick()
 
         private static readonly string[] ValidCategories = new[]
         {
-            "Render", "Scripts", "Memory", "Physics", "Physics2D", "Animation",
+            "Render", "Scripts", "Memory", "Physics",
+#if UNITY_2022_2_OR_NEWER
+            "Physics2D",
+#endif
+            "Animation",
             "Audio", "Lighting", "Network", "Gui", "UI", "Ai", "Video",
             "Loading", "Input", "Vr", "Internal", "Particles", "FileIO", "VirtualTexturing"
         };
@@ -125,7 +129,9 @@ void Tick()
                 case "scripts": return ProfilerCategory.Scripts;
                 case "memory": return ProfilerCategory.Memory;
                 case "physics": return ProfilerCategory.Physics;
+#if UNITY_2022_2_OR_NEWER
                 case "physics2d": return ProfilerCategory.Physics2D;
+#endif
                 case "animation": return ProfilerCategory.Animation;
                 case "audio": return ProfilerCategory.Audio;
                 case "lighting": return ProfilerCategory.Lighting;