Merge branch 'main' of https://github.com/CoderGamester/mcp-unity

# Conflicts:
#	Editor/Tools/UpdateComponentTool.cs

Author: CoderGamester

Editor/Tools/SelectGameObjectTool.cs

@@ -29,6 +29,7 @@ public override JObject Execute(JObject parameters)
             string objectPath = parameters["objectPath"]?.ToObject<string>();
             string objectName = parameters["objectName"]?.ToObject<string>();
             int? instanceId = parameters["instanceId"]?.ToObject<int?>();
+            GameObject selectedGameObject = null;
 
             // Validate parameters - require either objectPath or instanceId
             if (string.IsNullOrEmpty(objectPath) && string.IsNullOrEmpty(objectName) && !instanceId.HasValue)
@@ -42,32 +43,32 @@ public override JObject Execute(JObject parameters)
             // First try to find by instance ID if provided
             if (instanceId.HasValue)
             {
-                Selection.activeGameObject = EditorUtility.InstanceIDToObject(instanceId.Value) as GameObject;
+                selectedGameObject = EditorUtility.InstanceIDToObject(instanceId.Value) as GameObject;
             }
-            // Otherwise, try to find by object path/name if provided
             else if (!string.IsNullOrEmpty(objectPath))
             {
                 // Try to find the object by path in the hierarchy
-                Selection.activeGameObject = GameObject.Find(objectPath);
+                selectedGameObject = GameObject.Find(objectPath);
             }
-            else if (!string.IsNullOrEmpty(objectName))
+            else
             {
                 // Try to find the object by name in the hierarchy
-                Selection.activeGameObject = GameObject.Find(objectName);
+                selectedGameObject = GameObject.Find(objectName);
             }
+            
+            Selection.activeGameObject = selectedGameObject;
 
             // Ping the selected object
-            EditorGUIUtility.PingObject(Selection.activeGameObject);
+            EditorGUIUtility.PingObject(selectedGameObject);
 
-            // Log the selection
-            McpLogger.LogInfo($"[MCP Unity] Selected GameObject: {Selection.activeGameObject.name}"));
+            McpLogger.LogInfo($"[MCP Unity] Selected GameObject: {selectedGameObject?.name}");
 
             // Create the response
             return new JObject
             {
                 ["success"] = true,
                 ["type"] = "text",
-                ["message"] = $"Successfully selected GameObject {Selection.activeGameObject.name}"
+                ["message"] = $"Successfully selected GameObject {selectedGameObject?.name}"
             };
         }
     }

Editor/Tools/UpdateComponentTool.cs

@@ -82,7 +82,6 @@ public override JObject Execute(JObject parameters)
 
             // Try to find the component by name
             Component component = gameObject.GetComponent(componentName);
-            bool wasAdded = false;
 
             // If component not found, try to add it
             if (component == null)
@@ -97,31 +96,41 @@ public override JObject Execute(JObject parameters)
                 }
 
                 component = Undo.AddComponent(gameObject, componentType);
-                wasAdded = true;
+
+                // Ensure changes are saved
+                EditorUtility.SetDirty(gameObject);
+                if (PrefabUtility.IsPartOfAnyPrefab(gameObject))
+                {
+                    PrefabUtility.RecordPrefabInstancePropertyModifications(component);
+                }
+                
                 McpLogger.LogInfo($"[MCP Unity] Added component '{componentName}' to GameObject '{gameObject.name}'");
             }
-            
             // Update component fields
             if (componentData != null && componentData.Count > 0)
             {
-                UpdateComponentData(component, componentData);
-            }
-            
-            // Ensure changes are saved
-            EditorUtility.SetDirty(gameObject);
-            if (PrefabUtility.IsPartOfAnyPrefab(gameObject))
-            {
-                PrefabUtility.RecordPrefabInstancePropertyModifications(component);
+                bool success = UpdateComponentData(component, componentData, out string errorMessage);
+                // If update failed, return error
+                if (!success)
+                {
+                    return McpUnitySocketHandler.CreateErrorResponse(errorMessage, "update_error");
+                }
+
+                // Ensure field changes are saved
+                EditorUtility.SetDirty(gameObject);
+                if (PrefabUtility.IsPartOfAnyPrefab(gameObject))
+                {
+                    PrefabUtility.RecordPrefabInstancePropertyModifications(component);
+                }
+
             }
-            
+
             // Create the response
             return new JObject
             {
                 ["success"] = true,
                 ["type"] = "text",
-                ["message"] = wasAdded
-                    ? $"Successfully added component '{componentName}' to GameObject '{gameObject.name}' and updated its data"
-                    : $"Successfully updated component '{componentName}' on GameObject '{gameObject.name}'"
+                ["message"] = $"Successfully updated component '{componentName}' on GameObject '{gameObject.name}'"
             };
         }
 
@@ -236,16 +245,19 @@ private Type FindComponentType(string componentName)
         /// <param name="component">The component to update</param>
         /// <param name="componentData">The data to apply to the component</param>
         /// <returns>True if the component was updated successfully</returns>
-        private bool UpdateComponentData(Component component, JObject componentData)
+        private bool UpdateComponentData(Component component, JObject componentData, out string errorMessage)
         {
+            errorMessage = "";
+            
             if (component == null || componentData == null)
             {
+                errorMessage = "Component or component data is null";
                 return false;
             }
-            
+
             Type componentType = component.GetType();
-            bool anySuccess = false;
-            
+            bool fullSuccess = true;
+
             // Record object for undo
             Undo.RecordObject(component, $"Update {componentType.Name} fields");
 
@@ -256,7 +268,7 @@ private bool UpdateComponentData(Component component, JObject componentData)
                 JToken fieldValue = property.Value;
 
                 // Skip null values
-                if (fieldValue.Type == JTokenType.Null)
+                if (string.IsNullOrEmpty(fieldName) || fieldValue.Type == JTokenType.Null)
                 {
                     continue;
                 }
@@ -269,7 +281,6 @@ private bool UpdateComponentData(Component component, JObject componentData)
                 {
                     object value = ConvertJTokenToValue(fieldValue, fieldInfo.FieldType);
                     fieldInfo.SetValue(component, value);
-                    anySuccess = true;
                     continue;
                 }
 
@@ -281,17 +292,16 @@ private bool UpdateComponentData(Component component, JObject componentData)
                 {
                     object value = ConvertJTokenToValue(fieldValue, propertyInfo.PropertyType);
                     propertyInfo.SetValue(component, value);
-                    anySuccess = true;
                     continue;
                 }
 
-                // Try to update field
-                McpLogger.LogWarning($"Field or Property  with name '{fieldName}' not found on component '{componentType.Name}'");
+                fullSuccess = false;
+                errorMessage = $"Field or Property  with name '{fieldName}' not found on component '{componentType.Name}'";
             }
-            
-            return anySuccess;
+
+            return fullSuccess;
         }
-        
+
         /// <summary>
         /// Convert a JToken to a value of the specified type
         /// </summary>