flockbay 0.10.49 → 0.10.52

package/tools/unreal-mcp/upstream/MCPGameProject/Plugins/FlockbayMCP/Source/FlockbayMCP/Private/Commands/UnrealMCPBlueprintCommands.cpp

@@ -1,1364 +1,1364 @@
-#include "Commands/UnrealMCPBlueprintCommands.h"
-#include "Commands/UnrealMCPCommonUtils.h"
-#include "Engine/Blueprint.h"
-#include "Engine/BlueprintGeneratedClass.h"
-#include "Factories/BlueprintFactory.h"
-#include "EdGraphSchema_K2.h"
-#include "K2Node_Event.h"
-#include "K2Node_VariableGet.h"
-#include "K2Node_VariableSet.h"
-#include "Components/StaticMeshComponent.h"
-#include "Components/BoxComponent.h"
-#include "Components/SphereComponent.h"
-#include "Kismet2/BlueprintEditorUtils.h"
-#include "Kismet2/KismetEditorUtilities.h"
-#include "Engine/SimpleConstructionScript.h"
-#include "Engine/SCS_Node.h"
-#include "UObject/Field.h"
-#include "UObject/FieldPath.h"
-#include "UObject/UObjectGlobals.h"
-#include "EditorAssetLibrary.h"
-#include "AssetRegistry/AssetRegistryModule.h"
-#include "MessageLogModule.h"
-#include "IMessageLogListing.h"
-#include "GameFramework/Actor.h"
-#include "GameFramework/Pawn.h"
-
-static UClass* FindMcpClassByName(const TCHAR* ClassName)
-{
-#if defined(ANY_PACKAGE)
-    return FindObject<UClass>(ANY_PACKAGE, ClassName);
-#else
-    return FindFirstObject<UClass>(ClassName);
-#endif
-}
-
-static UClass* FindMcpClassByName(const FString& ClassName)
-{
-    return FindMcpClassByName(*ClassName);
-}
-
-FUnrealMCPBlueprintCommands::FUnrealMCPBlueprintCommands()
-{
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCommand(const FString& CommandType, const TSharedPtr<FJsonObject>& Params)
-{
-    if (CommandType == TEXT("create_blueprint"))
-    {
-        return HandleCreateBlueprint(Params);
-    }
-    else if (CommandType == TEXT("add_component_to_blueprint"))
-    {
-        return HandleAddComponentToBlueprint(Params);
-    }
-    else if (CommandType == TEXT("set_component_property"))
-    {
-        return HandleSetComponentProperty(Params);
-    }
-    else if (CommandType == TEXT("set_physics_properties"))
-    {
-        return HandleSetPhysicsProperties(Params);
-    }
-    else if (CommandType == TEXT("compile_blueprint"))
-    {
-        return HandleCompileBlueprint(Params);
-    }
-    else if (CommandType == TEXT("compile_blueprints_all"))
-    {
-        return HandleCompileBlueprintsAll(Params);
-    }
-    else if (CommandType == TEXT("spawn_blueprint_actor"))
-    {
-        return HandleSpawnBlueprintActor(Params);
-    }
-    else if (CommandType == TEXT("set_blueprint_property"))
-    {
-        return HandleSetBlueprintProperty(Params);
-    }
-    else if (CommandType == TEXT("set_static_mesh_properties"))
-    {
-        return HandleSetStaticMeshProperties(Params);
-    }
-    else if (CommandType == TEXT("set_pawn_properties"))
-    {
-        return HandleSetPawnProperties(Params);
-    }
-    
-    return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown blueprint command: %s"), *CommandType));
-}
-
-static bool IsSafeToCompileBlueprints(FString& OutError)
-{
-    if (!GEditor)
-    {
-        OutError = TEXT("Editor is not available (GEditor is null).");
-        return false;
-    }
-    if (GEditor->PlayWorld)
-    {
-        OutError = TEXT("Cannot compile Blueprints while Play-In-Editor is running. Stop PIE and retry.");
-        return false;
-    }
-    return true;
-}
-
-static FString MessageSeverityToString(EMessageSeverity::Type Severity)
-{
-    switch (Severity)
-    {
-        case EMessageSeverity::CriticalError:
-        case EMessageSeverity::Error:
-            return TEXT("error");
-        case EMessageSeverity::Warning:
-        case EMessageSeverity::PerformanceWarning:
-            return TEXT("warning");
-        case EMessageSeverity::Info:
-            return TEXT("info");
-        default:
-            return TEXT("info");
-    }
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCreateBlueprint(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("name"), BlueprintName) && !Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-
-    // Check if blueprint already exists
-    FString PackagePath = TEXT("/Game/Blueprints/");
-    Params->TryGetStringField(TEXT("path"), PackagePath);
-    Params->TryGetStringField(TEXT("blueprint_path"), PackagePath);
-    Params->TryGetStringField(TEXT("packagePath"), PackagePath);
-    Params->TryGetStringField(TEXT("package_path"), PackagePath);
-
-    PackagePath = PackagePath.TrimStartAndEnd();
-    if (PackagePath.IsEmpty()) PackagePath = TEXT("/Game/Blueprints/");
-    if (!PackagePath.StartsWith(TEXT("/Game/")))
-    {
-        // Keep it safe + predictable: only allow /Game paths.
-        PackagePath = TEXT("/Game/Blueprints/");
-    }
-    if (!PackagePath.EndsWith(TEXT("/")))
-    {
-        PackagePath += TEXT("/");
-    }
-
-    FString AssetName = BlueprintName;
-    if (UEditorAssetLibrary::DoesAssetExist(PackagePath + AssetName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint already exists: %s"), *BlueprintName));
-    }
-
-    // Create the blueprint factory
-    UBlueprintFactory* Factory = NewObject<UBlueprintFactory>();
-    
-    // Handle parent class
-    FString ParentClass;
-    Params->TryGetStringField(TEXT("parent_class"), ParentClass);
-    
-    // Default to Actor if no parent class specified
-    UClass* SelectedParentClass = AActor::StaticClass();
-    
-    // Try to find the specified parent class
-    if (!ParentClass.IsEmpty())
-    {
-        FString ClassName = ParentClass;
-        if (!ClassName.StartsWith(TEXT("A")))
-        {
-            ClassName = TEXT("A") + ClassName;
-        }
-        
-        // First try direct StaticClass lookup for common classes
-        UClass* FoundClass = nullptr;
-        if (ClassName == TEXT("APawn"))
-        {
-            FoundClass = APawn::StaticClass();
-        }
-        else if (ClassName == TEXT("AActor"))
-        {
-            FoundClass = AActor::StaticClass();
-        }
-        else
-        {
-            // Try loading the class using LoadClass which is more reliable than FindObject
-            const FString ClassPath = FString::Printf(TEXT("/Script/Engine.%s"), *ClassName);
-            FoundClass = LoadClass<AActor>(nullptr, *ClassPath);
-            
-            if (!FoundClass)
-            {
-                // Try alternate paths if not found
-                const FString GameClassPath = FString::Printf(TEXT("/Script/Game.%s"), *ClassName);
-                FoundClass = LoadClass<AActor>(nullptr, *GameClassPath);
-            }
-        }
-
-        if (FoundClass)
-        {
-            SelectedParentClass = FoundClass;
-            UE_LOG(LogTemp, Log, TEXT("Successfully set parent class to '%s'"), *ClassName);
-        }
-        else
-        {
-            UE_LOG(LogTemp, Warning, TEXT("Could not find specified parent class '%s' at paths: /Script/Engine.%s or /Script/Game.%s, defaulting to AActor"), 
-                *ClassName, *ClassName, *ClassName);
-        }
-    }
-    
-    Factory->ParentClass = SelectedParentClass;
-
-    // Create the blueprint
-    UPackage* Package = CreatePackage(*(PackagePath + AssetName));
-    UBlueprint* NewBlueprint = Cast<UBlueprint>(Factory->FactoryCreateNew(UBlueprint::StaticClass(), Package, *AssetName, RF_Standalone | RF_Public, nullptr, GWarn));
-
-    if (NewBlueprint)
-    {
-        // Notify the asset registry
-        FAssetRegistryModule::AssetCreated(NewBlueprint);
-
-        // Mark the package dirty
-        Package->MarkPackageDirty();
-
-        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-        ResultObj->SetStringField(TEXT("name"), AssetName);
-        ResultObj->SetStringField(TEXT("path"), PackagePath + AssetName);
-        return ResultObj;
-    }
-
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create blueprint"));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleAddComponentToBlueprint(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    FString ComponentType;
-    if (!Params->TryGetStringField(TEXT("component_type"), ComponentType) && !Params->TryGetStringField(TEXT("type"), ComponentType))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_type' parameter"));
-    }
-
-    FString ComponentName;
-    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName) && !Params->TryGetStringField(TEXT("name"), ComponentName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-
-    // Create the component - dynamically find the component class by name
-    UClass* ComponentClass = nullptr;
-
-    // Try to find the class with exact name first
-    ComponentClass = FindMcpClassByName(ComponentType);
-    
-    // If not found, try with "Component" suffix
-    if (!ComponentClass && !ComponentType.EndsWith(TEXT("Component")))
-    {
-        FString ComponentTypeWithSuffix = ComponentType + TEXT("Component");
-        ComponentClass = FindMcpClassByName(ComponentTypeWithSuffix);
-    }
-    
-    // If still not found, try with "U" prefix
-    if (!ComponentClass && !ComponentType.StartsWith(TEXT("U")))
-    {
-        FString ComponentTypeWithPrefix = TEXT("U") + ComponentType;
-        ComponentClass = FindMcpClassByName(ComponentTypeWithPrefix);
-        
-        // Try with both prefix and suffix
-        if (!ComponentClass && !ComponentType.EndsWith(TEXT("Component")))
-        {
-            FString ComponentTypeWithBoth = TEXT("U") + ComponentType + TEXT("Component");
-            ComponentClass = FindMcpClassByName(ComponentTypeWithBoth);
-        }
-    }
-    
-    // Verify that the class is a valid component type
-    if (!ComponentClass || !ComponentClass->IsChildOf(UActorComponent::StaticClass()))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown component type: %s"), *ComponentType));
-    }
-
-    // Add the component to the blueprint
-    USCS_Node* NewNode = Blueprint->SimpleConstructionScript->CreateNode(ComponentClass, *ComponentName);
-    if (NewNode)
-    {
-        // Set transform if provided
-        USceneComponent* SceneComponent = Cast<USceneComponent>(NewNode->ComponentTemplate);
-        if (SceneComponent)
-        {
-            if (Params->HasField(TEXT("location")))
-            {
-                SceneComponent->SetRelativeLocation(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location")));
-            }
-            if (Params->HasField(TEXT("rotation")))
-            {
-                SceneComponent->SetRelativeRotation(FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation")));
-            }
-            if (Params->HasField(TEXT("scale")))
-            {
-                SceneComponent->SetRelativeScale3D(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale")));
-            }
-        }
-
-        // Add to root if no parent specified
-        Blueprint->SimpleConstructionScript->AddNode(NewNode);
-
-        // Compile the blueprint
-        FKismetEditorUtilities::CompileBlueprint(Blueprint);
-
-        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-        ResultObj->SetStringField(TEXT("component_name"), ComponentName);
-        ResultObj->SetStringField(TEXT("component_type"), ComponentType);
-        return ResultObj;
-    }
-
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to add component to blueprint"));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetComponentProperty(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    FString ComponentName;
-    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
-    }
-
-    FString PropertyName;
-    if (!Params->TryGetStringField(TEXT("property_name"), PropertyName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_name' parameter"));
-    }
-
-    // Log all input parameters for debugging
-    UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Blueprint: %s, Component: %s, Property: %s"), 
-        *BlueprintName, *ComponentName, *PropertyName);
-    
-    // Log property_value if available
-    if (Params->HasField(TEXT("property_value")))
-    {
-        TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
-        FString ValueType;
-        
-        switch(JsonValue->Type)
-        {
-            case EJson::Boolean: ValueType = FString::Printf(TEXT("Boolean: %s"), JsonValue->AsBool() ? TEXT("true") : TEXT("false")); break;
-            case EJson::Number: ValueType = FString::Printf(TEXT("Number: %f"), JsonValue->AsNumber()); break;
-            case EJson::String: ValueType = FString::Printf(TEXT("String: %s"), *JsonValue->AsString()); break;
-            case EJson::Array: ValueType = TEXT("Array"); break;
-            case EJson::Object: ValueType = TEXT("Object"); break;
-            default: ValueType = TEXT("Unknown"); break;
-        }
-        
-        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Value Type: %s"), *ValueType);
-    }
-    else
-    {
-        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - No property_value provided"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Blueprint not found: %s"), *BlueprintName);
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-    else
-    {
-        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Blueprint found: %s (Class: %s)"), 
-            *BlueprintName, 
-            Blueprint->GeneratedClass ? *Blueprint->GeneratedClass->GetName() : TEXT("NULL"));
-    }
-
-    // Find the component
-    USCS_Node* ComponentNode = nullptr;
-    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Searching for component %s in blueprint nodes"), *ComponentName);
-    
-    if (!Blueprint->SimpleConstructionScript)
-    {
-        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - SimpleConstructionScript is NULL for blueprint %s"), *BlueprintName);
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Invalid blueprint construction script"));
-    }
-    
-    for (USCS_Node* Node : Blueprint->SimpleConstructionScript->GetAllNodes())
-    {
-        if (Node)
-        {
-            UE_LOG(LogTemp, Verbose, TEXT("SetComponentProperty - Found node: %s"), *Node->GetVariableName().ToString());
-            if (Node->GetVariableName().ToString() == ComponentName)
-            {
-                ComponentNode = Node;
-                break;
-            }
-        }
-        else
-        {
-            UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Found NULL node in blueprint"));
-        }
-    }
-
-    if (!ComponentNode)
-    {
-        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Component not found: %s"), *ComponentName);
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Component not found: %s"), *ComponentName));
-    }
-    else
-    {
-        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Component found: %s (Class: %s)"), 
-            *ComponentName, 
-            ComponentNode->ComponentTemplate ? *ComponentNode->ComponentTemplate->GetClass()->GetName() : TEXT("NULL"));
-    }
-
-    // Get the component template
-    UObject* ComponentTemplate = ComponentNode->ComponentTemplate;
-    if (!ComponentTemplate)
-    {
-        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Component template is NULL for %s"), *ComponentName);
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Invalid component template"));
-    }
-
-    // Check if this is a Spring Arm component and log special debug info
-    if (ComponentTemplate->GetClass()->GetName().Contains(TEXT("SpringArm")))
-    {
-        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - SpringArm component detected! Class: %s"), 
-            *ComponentTemplate->GetClass()->GetPathName());
-            
-        // Log all properties of the SpringArm component class
-        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - SpringArm properties:"));
-        for (TFieldIterator<FProperty> PropIt(ComponentTemplate->GetClass()); PropIt; ++PropIt)
-        {
-            FProperty* Prop = *PropIt;
-            UE_LOG(LogTemp, Warning, TEXT("  - %s (%s)"), *Prop->GetName(), *Prop->GetCPPType());
-        }
-
-        // Special handling for Spring Arm properties
-        if (Params->HasField(TEXT("property_value")))
-        {
-            TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
-            
-            // Get the property using the new FField system
-            FProperty* Property = FindFProperty<FProperty>(ComponentTemplate->GetClass(), *PropertyName);
-            if (!Property)
-            {
-                UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Property %s not found on SpringArm component"), *PropertyName);
-                return FUnrealMCPCommonUtils::CreateErrorResponse(
-                    FString::Printf(TEXT("Property %s not found on SpringArm component"), *PropertyName));
-            }
-
-            // Create a scope guard to ensure property cleanup
-            struct FScopeGuard
-            {
-                UObject* Object;
-                FScopeGuard(UObject* InObject) : Object(InObject) 
-                {
-                    if (Object)
-                    {
-                        Object->Modify();
-                    }
-                }
-                ~FScopeGuard()
-                {
-                    if (Object)
-                    {
-                        Object->PostEditChange();
-                    }
-                }
-            } ScopeGuard(ComponentTemplate);
-
-            bool bSuccess = false;
-            FString ErrorMessage;
-
-            // Handle specific Spring Arm property types
-            if (FFloatProperty* FloatProp = CastField<FFloatProperty>(Property))
-            {
-                if (JsonValue->Type == EJson::Number)
-                {
-                    const float Value = JsonValue->AsNumber();
-                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting float property %s to %f"), *PropertyName, Value);
-                    FloatProp->SetPropertyValue_InContainer(ComponentTemplate, Value);
-                    bSuccess = true;
-                }
-            }
-            else if (FBoolProperty* BoolProp = CastField<FBoolProperty>(Property))
-            {
-                if (JsonValue->Type == EJson::Boolean)
-                {
-                    const bool Value = JsonValue->AsBool();
-                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting bool property %s to %d"), *PropertyName, Value);
-                    BoolProp->SetPropertyValue_InContainer(ComponentTemplate, Value);
-                    bSuccess = true;
-                }
-            }
-            else if (FStructProperty* StructProp = CastField<FStructProperty>(Property))
-            {
-                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Handling struct property %s of type %s"), 
-                    *PropertyName, *StructProp->Struct->GetName());
-                
-                // Special handling for common Spring Arm struct properties
-                if (StructProp->Struct == TBaseStructure<FVector>::Get())
-                {
-                    if (JsonValue->Type == EJson::Array)
-                    {
-                        const TArray<TSharedPtr<FJsonValue>>& Arr = JsonValue->AsArray();
-                        if (Arr.Num() == 3)
-                        {
-                            FVector Vec(
-                                Arr[0]->AsNumber(),
-                                Arr[1]->AsNumber(),
-                                Arr[2]->AsNumber()
-                            );
-                            void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
-                            StructProp->CopySingleValue(PropertyAddr, &Vec);
-                            bSuccess = true;
-                        }
-                    }
-                }
-                else if (StructProp->Struct == TBaseStructure<FRotator>::Get())
-                {
-                    if (JsonValue->Type == EJson::Array)
-                    {
-                        const TArray<TSharedPtr<FJsonValue>>& Arr = JsonValue->AsArray();
-                        if (Arr.Num() == 3)
-                        {
-                            FRotator Rot(
-                                Arr[0]->AsNumber(),
-                                Arr[1]->AsNumber(),
-                                Arr[2]->AsNumber()
-                            );
-                            void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
-                            StructProp->CopySingleValue(PropertyAddr, &Rot);
-                            bSuccess = true;
-                        }
-                    }
-                }
-            }
-
-            if (bSuccess)
-            {
-                // Mark the blueprint as modified
-                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Successfully set SpringArm property %s"), *PropertyName);
-                FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
-
-                TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-                ResultObj->SetStringField(TEXT("component"), ComponentName);
-                ResultObj->SetStringField(TEXT("property"), PropertyName);
-                ResultObj->SetBoolField(TEXT("success"), true);
-                return ResultObj;
-            }
-            else
-            {
-                UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set SpringArm property %s"), *PropertyName);
-                return FUnrealMCPCommonUtils::CreateErrorResponse(
-                    FString::Printf(TEXT("Failed to set SpringArm property %s"), *PropertyName));
-            }
-        }
-    }
-
-    // Regular property handling for non-Spring Arm components continues...
-
-    // Set the property value
-    if (Params->HasField(TEXT("property_value")))
-    {
-        TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
-        
-        // Get the property
-        FProperty* Property = FindFProperty<FProperty>(ComponentTemplate->GetClass(), *PropertyName);
-        if (!Property)
-        {
-            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Property %s not found on component %s"), 
-                *PropertyName, *ComponentName);
-            
-            // List all available properties for this component
-            UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Available properties for %s:"), *ComponentName);
-            for (TFieldIterator<FProperty> PropIt(ComponentTemplate->GetClass()); PropIt; ++PropIt)
-            {
-                FProperty* Prop = *PropIt;
-                UE_LOG(LogTemp, Warning, TEXT("  - %s (%s)"), *Prop->GetName(), *Prop->GetCPPType());
-            }
-            
-            return FUnrealMCPCommonUtils::CreateErrorResponse(
-                FString::Printf(TEXT("Property %s not found on component %s"), *PropertyName, *ComponentName));
-        }
-        else
-        {
-            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property found: %s (Type: %s)"), 
-                *PropertyName, *Property->GetCPPType());
-        }
-
-        bool bSuccess = false;
-        FString ErrorMessage;
-
-        // Handle different property types
-        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Attempting to set property %s"), *PropertyName);
-        
-        // Add try-catch block to catch and log any crashes
-        try
-        {
-            if (FStructProperty* StructProp = CastField<FStructProperty>(Property))
-            {
-                // Handle vector properties
-                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property is a struct: %s"), 
-                    StructProp->Struct ? *StructProp->Struct->GetName() : TEXT("NULL"));
-                    
-                if (StructProp->Struct == TBaseStructure<FVector>::Get())
-                {
-                    if (JsonValue->Type == EJson::Array)
-                    {
-                        // Handle array input [x, y, z]
-                        const TArray<TSharedPtr<FJsonValue>>& Arr = JsonValue->AsArray();
-                        if (Arr.Num() == 3)
-                        {
-                            FVector Vec(
-                                Arr[0]->AsNumber(),
-                                Arr[1]->AsNumber(),
-                                Arr[2]->AsNumber()
-                            );
-                            void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
-                            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting Vector(%f, %f, %f)"), 
-                                Vec.X, Vec.Y, Vec.Z);
-                            StructProp->CopySingleValue(PropertyAddr, &Vec);
-                            bSuccess = true;
-                        }
-                        else
-                        {
-                            ErrorMessage = FString::Printf(TEXT("Vector property requires 3 values, got %d"), Arr.Num());
-                            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
-                        }
-                    }
-                    else if (JsonValue->Type == EJson::Number)
-                    {
-                        // Handle scalar input (sets all components to same value)
-                        float Value = JsonValue->AsNumber();
-                        FVector Vec(Value, Value, Value);
-                        void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
-                        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting Vector(%f, %f, %f) from scalar"), 
-                            Vec.X, Vec.Y, Vec.Z);
-                        StructProp->CopySingleValue(PropertyAddr, &Vec);
-                        bSuccess = true;
-                    }
-                    else
-                    {
-                        ErrorMessage = TEXT("Vector property requires either a single number or array of 3 numbers");
-                        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
-                    }
-                }
-                else
-                {
-                    // Handle other struct properties using default handler
-                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Using generic struct handler for %s"), 
-                        *PropertyName);
-                    bSuccess = FUnrealMCPCommonUtils::SetObjectProperty(ComponentTemplate, PropertyName, JsonValue, ErrorMessage);
-                    if (!bSuccess)
-                    {
-                        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set struct property: %s"), *ErrorMessage);
-                    }
-                }
-            }
-            else if (FEnumProperty* EnumProp = CastField<FEnumProperty>(Property))
-            {
-                // Handle enum properties
-                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property is an enum"));
-                if (JsonValue->Type == EJson::String)
-                {
-                    FString EnumValueName = JsonValue->AsString();
-                    UEnum* Enum = EnumProp->GetEnum();
-                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting enum from string: %s"), *EnumValueName);
-                    
-                    if (Enum)
-                    {
-                        int64 EnumValue = Enum->GetValueByNameString(EnumValueName);
-                        
-                        if (EnumValue != INDEX_NONE)
-                        {
-                            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Found enum value: %lld"), EnumValue);
-                            EnumProp->GetUnderlyingProperty()->SetIntPropertyValue(
-                                ComponentTemplate, 
-                                EnumValue
-                            );
-                            bSuccess = true;
-                        }
-                        else
-                        {
-                            // List all possible enum values
-                            UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Available enum values for %s:"), 
-                                *Enum->GetName());
-                            for (int32 i = 0; i < Enum->NumEnums(); i++)
-                            {
-                                UE_LOG(LogTemp, Warning, TEXT("  - %s (%lld)"), 
-                                    *Enum->GetNameStringByIndex(i),
-                                    Enum->GetValueByIndex(i));
-                            }
-                            
-                            ErrorMessage = FString::Printf(TEXT("Invalid enum value '%s' for property %s"), 
-                                *EnumValueName, *PropertyName);
-                            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
-                        }
-                    }
-                    else
-                    {
-                        ErrorMessage = TEXT("Enum object is NULL");
-                        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
-                    }
-                }
-                else if (JsonValue->Type == EJson::Number)
-                {
-                    // Allow setting enum by integer value
-                    int64 EnumValue = JsonValue->AsNumber();
-                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting enum from number: %lld"), EnumValue);
-                    EnumProp->GetUnderlyingProperty()->SetIntPropertyValue(
-                        ComponentTemplate, 
-                        EnumValue
-                    );
-                    bSuccess = true;
-                }
-                else
-                {
-                    ErrorMessage = TEXT("Enum property requires either a string name or integer value");
-                    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
-                }
-            }
-            else if (FNumericProperty* NumericProp = CastField<FNumericProperty>(Property))
-            {
-                // Handle numeric properties
-                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property is numeric: IsInteger=%d, IsFloat=%d"), 
-                    NumericProp->IsInteger(), NumericProp->IsFloatingPoint());
-                    
-                if (JsonValue->Type == EJson::Number)
-                {
-                    double Value = JsonValue->AsNumber();
-                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting numeric value: %f"), Value);
-                    
-                    if (NumericProp->IsInteger())
-                    {
-                        NumericProp->SetIntPropertyValue(ComponentTemplate, (int64)Value);
-                        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Set integer value: %lld"), (int64)Value);
-                        bSuccess = true;
-                    }
-                    else if (NumericProp->IsFloatingPoint())
-                    {
-                        NumericProp->SetFloatingPointPropertyValue(ComponentTemplate, Value);
-                        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Set float value: %f"), Value);
-                        bSuccess = true;
-                    }
-                }
-                else
-                {
-                    ErrorMessage = TEXT("Numeric property requires a number value");
-                    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
-                }
-            }
-            else
-            {
-                // Handle all other property types using default handler
-                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Using generic property handler for %s (Type: %s)"), 
-                    *PropertyName, *Property->GetCPPType());
-                bSuccess = FUnrealMCPCommonUtils::SetObjectProperty(ComponentTemplate, PropertyName, JsonValue, ErrorMessage);
-                if (!bSuccess)
-                {
-                    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set property: %s"), *ErrorMessage);
-                }
-            }
-        }
-        catch (const std::exception& Ex)
-        {
-            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - EXCEPTION: %s"), ANSI_TO_TCHAR(Ex.what()));
-            return FUnrealMCPCommonUtils::CreateErrorResponse(
-                FString::Printf(TEXT("Exception while setting property %s: %s"), *PropertyName, ANSI_TO_TCHAR(Ex.what())));
-        }
-        catch (...)
-        {
-            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - UNKNOWN EXCEPTION occurred while setting property %s"), *PropertyName);
-            return FUnrealMCPCommonUtils::CreateErrorResponse(
-                FString::Printf(TEXT("Unknown exception while setting property %s"), *PropertyName));
-        }
-
-        if (bSuccess)
-        {
-            // Mark the blueprint as modified
-            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Successfully set property %s on component %s"), 
-                *PropertyName, *ComponentName);
-            FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
-
-            TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-            ResultObj->SetStringField(TEXT("component"), ComponentName);
-            ResultObj->SetStringField(TEXT("property"), PropertyName);
-            ResultObj->SetBoolField(TEXT("success"), true);
-            return ResultObj;
-        }
-        else
-        {
-            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set property %s: %s"), 
-                *PropertyName, *ErrorMessage);
-            return FUnrealMCPCommonUtils::CreateErrorResponse(ErrorMessage);
-        }
-    }
-
-    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Missing 'property_value' parameter"));
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_value' parameter"));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetPhysicsProperties(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    FString ComponentName;
-    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-
-    // Find the component
-    USCS_Node* ComponentNode = nullptr;
-    for (USCS_Node* Node : Blueprint->SimpleConstructionScript->GetAllNodes())
-    {
-        if (Node && Node->GetVariableName().ToString() == ComponentName)
-        {
-            ComponentNode = Node;
-            break;
-        }
-    }
-
-    if (!ComponentNode)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Component not found: %s"), *ComponentName));
-    }
-
-    UPrimitiveComponent* PrimComponent = Cast<UPrimitiveComponent>(ComponentNode->ComponentTemplate);
-    if (!PrimComponent)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Component is not a primitive component"));
-    }
-
-    // Set physics properties
-    if (Params->HasField(TEXT("simulate_physics")))
-    {
-        PrimComponent->SetSimulatePhysics(Params->GetBoolField(TEXT("simulate_physics")));
-    }
-
-    if (Params->HasField(TEXT("mass")))
-    {
-        float Mass = Params->GetNumberField(TEXT("mass"));
-        // In UE5.5, use proper overrideMass instead of just scaling
-        PrimComponent->SetMassOverrideInKg(NAME_None, Mass);
-        UE_LOG(LogTemp, Display, TEXT("Set mass for component %s to %f kg"), *ComponentName, Mass);
-    }
-
-    if (Params->HasField(TEXT("linear_damping")))
-    {
-        PrimComponent->SetLinearDamping(Params->GetNumberField(TEXT("linear_damping")));
-    }
-
-    if (Params->HasField(TEXT("angular_damping")))
-    {
-        PrimComponent->SetAngularDamping(Params->GetNumberField(TEXT("angular_damping")));
-    }
-
-    // Mark the blueprint as modified
-    FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetStringField(TEXT("component"), ComponentName);
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCompileBlueprint(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-
-    // Compile the blueprint
-    FKismetEditorUtilities::CompileBlueprint(Blueprint);
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetStringField(TEXT("name"), BlueprintName);
-    ResultObj->SetBoolField(TEXT("compiled"), true);
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCompileBlueprintsAll(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToCompileBlueprints(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    int32 Limit = 500;
-    if (Params->HasField(TEXT("limit")))
-    {
-        Limit = (int32)Params->GetNumberField(TEXT("limit"));
-    }
-    Limit = FMath::Clamp(Limit, 1, 10000);
-
-    bool bIncludeWarnings = true;
-    if (Params->HasField(TEXT("includeWarnings")))
-    {
-        bIncludeWarnings = Params->GetBoolField(TEXT("includeWarnings"));
-    }
-
-    TArray<FString> RootPaths;
-    if (Params->HasField(TEXT("paths")))
-    {
-        const TArray<TSharedPtr<FJsonValue>> PathsJson = Params->GetArrayField(TEXT("paths"));
-        for (const TSharedPtr<FJsonValue>& PathVal : PathsJson)
-        {
-            if (!PathVal.IsValid() || PathVal->Type != EJson::String) continue;
-            const FString P = PathVal->AsString().TrimStartAndEnd();
-            if (!P.IsEmpty())
-            {
-                RootPaths.Add(P);
-            }
-        }
-    }
-    if (RootPaths.Num() == 0)
-    {
-        RootPaths.Add(TEXT("/Game"));
-    }
-
-    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
-    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
-
-    FARFilter Filter;
-    Filter.bRecursivePaths = true;
-#if ENGINE_MAJOR_VERSION >= 5
-    Filter.ClassPaths.Add(UBlueprint::StaticClass()->GetClassPathName());
-#else
-    Filter.ClassNames.Add(UBlueprint::StaticClass()->GetFName());
-#endif
-    for (const FString& RootPath : RootPaths)
-    {
-        const FString Normalized = RootPath.StartsWith(TEXT("/")) ? RootPath : FString(TEXT("/")) + RootPath;
-        Filter.PackagePaths.Add(FName(*Normalized));
-    }
-
-    TArray<FAssetData> Assets;
-    AssetRegistry.GetAssets(Filter, Assets);
-
-    int32 TotalBlueprints = 0;
-    int32 Compiled = 0;
-    int32 Failed = 0;
-    int32 ErrorMessages = 0;
-    int32 WarningMessages = 0;
-
-    FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>(TEXT("MessageLog"));
-    const TSharedRef<IMessageLogListing> Listing = MessageLogModule.GetLogListing(TEXT("BlueprintLog"));
-
-    TArray<TSharedPtr<FJsonValue>> Results;
-
-    for (const FAssetData& Asset : Assets)
-    {
-        if (TotalBlueprints >= Limit) break;
-
-        UBlueprint* Blueprint = Cast<UBlueprint>(Asset.GetAsset());
-        if (!Blueprint) continue;
-
-        TotalBlueprints++;
-
-        Listing->ClearMessages();
-        FKismetEditorUtilities::CompileBlueprint(Blueprint);
-
-        const TArray<TSharedRef<FTokenizedMessage>>& Messages = Listing->GetFilteredMessages();
-        int32 BlueprintErrors = 0;
-        int32 BlueprintWarnings = 0;
-        TArray<TSharedPtr<FJsonValue>> MessageArray;
-
-        for (const TSharedRef<FTokenizedMessage>& Message : Messages)
-        {
-            const EMessageSeverity::Type Severity = Message->GetSeverity();
-            const bool bIsWarning =
-                Severity == EMessageSeverity::Warning || Severity == EMessageSeverity::PerformanceWarning;
-            const bool bIsError = Severity == EMessageSeverity::Error || Severity == EMessageSeverity::CriticalError;
-
-            if (bIsError) BlueprintErrors++;
-            if (bIsWarning) BlueprintWarnings++;
-
-            if (!bIncludeWarnings && bIsWarning) continue;
-
-            TSharedPtr<FJsonObject> Msg = MakeShared<FJsonObject>();
-            Msg->SetStringField(TEXT("severity"), MessageSeverityToString(Severity));
-            Msg->SetStringField(TEXT("message"), Message->ToText().ToString());
-            MessageArray.Add(MakeShared<FJsonValueObject>(Msg));
-        }
-
-        ErrorMessages += BlueprintErrors;
-        WarningMessages += BlueprintWarnings;
-
-        const bool bHadErrors = Blueprint->Status == BS_Error;
-        if (bHadErrors) Failed++; else Compiled++;
-
-        TSharedPtr<FJsonObject> Entry = MakeShared<FJsonObject>();
-        Entry->SetStringField(TEXT("name"), Blueprint->GetName());
-        Entry->SetStringField(TEXT("objectPath"), Asset.GetObjectPathString());
-        Entry->SetBoolField(TEXT("ok"), !bHadErrors);
-        Entry->SetNumberField(TEXT("errors"), BlueprintErrors);
-        Entry->SetNumberField(TEXT("warnings"), BlueprintWarnings);
-        Entry->SetArrayField(TEXT("messages"), MessageArray);
-        Results.Add(MakeShared<FJsonValueObject>(Entry));
-    }
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetNumberField(TEXT("found"), Assets.Num());
-    ResultObj->SetNumberField(TEXT("compiled"), Compiled);
-    ResultObj->SetNumberField(TEXT("failed"), Failed);
-    ResultObj->SetNumberField(TEXT("errors"), ErrorMessages);
-    ResultObj->SetNumberField(TEXT("warnings"), WarningMessages);
-    ResultObj->SetArrayField(TEXT("results"), Results);
-    ResultObj->SetBoolField(TEXT("truncated"), TotalBlueprints < Assets.Num() && TotalBlueprints >= Limit);
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSpawnBlueprintActor(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    FString ActorName;
-    if (!Params->TryGetStringField(TEXT("actor_name"), ActorName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'actor_name' parameter"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-
-    // Get transform parameters
-    FVector Location(0.0f, 0.0f, 0.0f);
-    FRotator Rotation(0.0f, 0.0f, 0.0f);
-
-    if (Params->HasField(TEXT("location")))
-    {
-        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
-    }
-    if (Params->HasField(TEXT("rotation")))
-    {
-        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
-    }
-
-    // Spawn the actor
-    UWorld* World = GEditor->GetEditorWorldContext().World();
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
-    }
-
-    FTransform SpawnTransform;
-    SpawnTransform.SetLocation(Location);
-    SpawnTransform.SetRotation(FQuat(Rotation));
-
-    AActor* NewActor = World->SpawnActor<AActor>(Blueprint->GeneratedClass, SpawnTransform);
-    if (NewActor)
-    {
-        NewActor->SetActorLabel(*ActorName);
-        return FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, true);
-    }
-
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn blueprint actor"));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetBlueprintProperty(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    FString PropertyName;
-    if (!Params->TryGetStringField(TEXT("property_name"), PropertyName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_name' parameter"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-
-    // Get the default object
-    UObject* DefaultObject = Blueprint->GeneratedClass->GetDefaultObject();
-    if (!DefaultObject)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get default object"));
-    }
-
-    // Set the property value
-    if (Params->HasField(TEXT("property_value")))
-    {
-        TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
-        
-        FString ErrorMessage;
-        if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, PropertyName, JsonValue, ErrorMessage))
-        {
-            // Mark the blueprint as modified
-            FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
-
-            TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-            ResultObj->SetStringField(TEXT("property"), PropertyName);
-            ResultObj->SetBoolField(TEXT("success"), true);
-            return ResultObj;
-        }
-        else
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(ErrorMessage);
-        }
-    }
-
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_value' parameter"));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetStaticMeshProperties(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    FString ComponentName;
-    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-
-    // Find the component
-    USCS_Node* ComponentNode = nullptr;
-    for (USCS_Node* Node : Blueprint->SimpleConstructionScript->GetAllNodes())
-    {
-        if (Node && Node->GetVariableName().ToString() == ComponentName)
-        {
-            ComponentNode = Node;
-            break;
-        }
-    }
-
-    if (!ComponentNode)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Component not found: %s"), *ComponentName));
-    }
-
-    UStaticMeshComponent* MeshComponent = Cast<UStaticMeshComponent>(ComponentNode->ComponentTemplate);
-    if (!MeshComponent)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Component is not a static mesh component"));
-    }
-
-    // Set static mesh properties
-    if (Params->HasField(TEXT("static_mesh")))
-    {
-        FString MeshPath = Params->GetStringField(TEXT("static_mesh"));
-        UStaticMesh* Mesh = Cast<UStaticMesh>(UEditorAssetLibrary::LoadAsset(MeshPath));
-        if (Mesh)
-        {
-            MeshComponent->SetStaticMesh(Mesh);
-        }
-    }
-
-    if (Params->HasField(TEXT("material")))
-    {
-        FString MaterialPath = Params->GetStringField(TEXT("material"));
-        UMaterialInterface* Material = Cast<UMaterialInterface>(UEditorAssetLibrary::LoadAsset(MaterialPath));
-        if (Material)
-        {
-            MeshComponent->SetMaterial(0, Material);
-        }
-    }
-
-    // Mark the blueprint as modified
-    FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetStringField(TEXT("component"), ComponentName);
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetPawnProperties(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    // Find the blueprint
-    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
-    if (!Blueprint)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
-    }
-
-    // Get the default object
-    UObject* DefaultObject = Blueprint->GeneratedClass->GetDefaultObject();
-    if (!DefaultObject)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get default object"));
-    }
-
-    // Track if any properties were set successfully
-    bool bAnyPropertiesSet = false;
-    TSharedPtr<FJsonObject> ResultsObj = MakeShared<FJsonObject>();
-    
-    // Set auto possess player if specified
-    if (Params->HasField(TEXT("auto_possess_player")))
-    {
-        TSharedPtr<FJsonValue> AutoPossessValue = Params->Values.FindRef(TEXT("auto_possess_player"));
-        
-        FString ErrorMessage;
-        if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, TEXT("AutoPossessPlayer"), AutoPossessValue, ErrorMessage))
-        {
-            bAnyPropertiesSet = true;
-            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
-            PropResultObj->SetBoolField(TEXT("success"), true);
-            ResultsObj->SetObjectField(TEXT("AutoPossessPlayer"), PropResultObj);
-        }
-        else
-        {
-            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
-            PropResultObj->SetBoolField(TEXT("success"), false);
-            PropResultObj->SetStringField(TEXT("error"), ErrorMessage);
-            ResultsObj->SetObjectField(TEXT("AutoPossessPlayer"), PropResultObj);
-        }
-    }
-    
-    // Set controller rotation properties
-    const TCHAR* RotationProps[] = {
-        TEXT("bUseControllerRotationYaw"),
-        TEXT("bUseControllerRotationPitch"),
-        TEXT("bUseControllerRotationRoll")
-    };
-    
-    const TCHAR* ParamNames[] = {
-        TEXT("use_controller_rotation_yaw"),
-        TEXT("use_controller_rotation_pitch"),
-        TEXT("use_controller_rotation_roll")
-    };
-    
-    for (int32 i = 0; i < 3; i++)
-    {
-        if (Params->HasField(ParamNames[i]))
-        {
-            TSharedPtr<FJsonValue> Value = Params->Values.FindRef(ParamNames[i]);
-            
-            FString ErrorMessage;
-            if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, RotationProps[i], Value, ErrorMessage))
-            {
-                bAnyPropertiesSet = true;
-                TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
-                PropResultObj->SetBoolField(TEXT("success"), true);
-                ResultsObj->SetObjectField(RotationProps[i], PropResultObj);
-            }
-            else
-            {
-                TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
-                PropResultObj->SetBoolField(TEXT("success"), false);
-                PropResultObj->SetStringField(TEXT("error"), ErrorMessage);
-                ResultsObj->SetObjectField(RotationProps[i], PropResultObj);
-            }
-        }
-    }
-    
-    // Set can be damaged property
-    if (Params->HasField(TEXT("can_be_damaged")))
-    {
-        TSharedPtr<FJsonValue> Value = Params->Values.FindRef(TEXT("can_be_damaged"));
-        
-        FString ErrorMessage;
-        if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, TEXT("bCanBeDamaged"), Value, ErrorMessage))
-        {
-            bAnyPropertiesSet = true;
-            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
-            PropResultObj->SetBoolField(TEXT("success"), true);
-            ResultsObj->SetObjectField(TEXT("bCanBeDamaged"), PropResultObj);
-        }
-        else
-        {
-            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
-            PropResultObj->SetBoolField(TEXT("success"), false);
-            PropResultObj->SetStringField(TEXT("error"), ErrorMessage);
-            ResultsObj->SetObjectField(TEXT("bCanBeDamaged"), PropResultObj);
-        }
-    }
-
-    // Mark the blueprint as modified if any properties were set
-    if (bAnyPropertiesSet)
-    {
-        FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
-    }
-    else if (ResultsObj->Values.Num() == 0)
-    {
-        // No properties were specified
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No properties specified to set"));
-    }
-
-    TSharedPtr<FJsonObject> ResponseObj = MakeShared<FJsonObject>();
-    ResponseObj->SetStringField(TEXT("blueprint"), BlueprintName);
-    ResponseObj->SetBoolField(TEXT("success"), bAnyPropertiesSet);
-    ResponseObj->SetObjectField(TEXT("results"), ResultsObj);
-    return ResponseObj;
-} 
+#include "Commands/UnrealMCPBlueprintCommands.h"
+#include "Commands/UnrealMCPCommonUtils.h"
+#include "Engine/Blueprint.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "Factories/BlueprintFactory.h"
+#include "EdGraphSchema_K2.h"
+#include "K2Node_Event.h"
+#include "K2Node_VariableGet.h"
+#include "K2Node_VariableSet.h"
+#include "Components/StaticMeshComponent.h"
+#include "Components/BoxComponent.h"
+#include "Components/SphereComponent.h"
+#include "Kismet2/BlueprintEditorUtils.h"
+#include "Kismet2/KismetEditorUtilities.h"
+#include "Engine/SimpleConstructionScript.h"
+#include "Engine/SCS_Node.h"
+#include "UObject/Field.h"
+#include "UObject/FieldPath.h"
+#include "UObject/UObjectGlobals.h"
+#include "EditorAssetLibrary.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "MessageLogModule.h"
+#include "IMessageLogListing.h"
+#include "GameFramework/Actor.h"
+#include "GameFramework/Pawn.h"
+
+static UClass* FindMcpClassByName(const TCHAR* ClassName)
+{
+#if defined(ANY_PACKAGE)
+    return FindObject<UClass>(ANY_PACKAGE, ClassName);
+#else
+    return FindFirstObject<UClass>(ClassName);
+#endif
+}
+
+static UClass* FindMcpClassByName(const FString& ClassName)
+{
+    return FindMcpClassByName(*ClassName);
+}
+
+FUnrealMCPBlueprintCommands::FUnrealMCPBlueprintCommands()
+{
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCommand(const FString& CommandType, const TSharedPtr<FJsonObject>& Params)
+{
+    if (CommandType == TEXT("create_blueprint"))
+    {
+        return HandleCreateBlueprint(Params);
+    }
+    else if (CommandType == TEXT("add_component_to_blueprint"))
+    {
+        return HandleAddComponentToBlueprint(Params);
+    }
+    else if (CommandType == TEXT("set_component_property"))
+    {
+        return HandleSetComponentProperty(Params);
+    }
+    else if (CommandType == TEXT("set_physics_properties"))
+    {
+        return HandleSetPhysicsProperties(Params);
+    }
+    else if (CommandType == TEXT("compile_blueprint"))
+    {
+        return HandleCompileBlueprint(Params);
+    }
+    else if (CommandType == TEXT("compile_blueprints_all"))
+    {
+        return HandleCompileBlueprintsAll(Params);
+    }
+    else if (CommandType == TEXT("spawn_blueprint_actor"))
+    {
+        return HandleSpawnBlueprintActor(Params);
+    }
+    else if (CommandType == TEXT("set_blueprint_property"))
+    {
+        return HandleSetBlueprintProperty(Params);
+    }
+    else if (CommandType == TEXT("set_static_mesh_properties"))
+    {
+        return HandleSetStaticMeshProperties(Params);
+    }
+    else if (CommandType == TEXT("set_pawn_properties"))
+    {
+        return HandleSetPawnProperties(Params);
+    }
+    
+    return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown blueprint command: %s"), *CommandType));
+}
+
+static bool IsSafeToCompileBlueprints(FString& OutError)
+{
+    if (!GEditor)
+    {
+        OutError = TEXT("Editor is not available (GEditor is null).");
+        return false;
+    }
+    if (GEditor->PlayWorld)
+    {
+        OutError = TEXT("Cannot compile Blueprints while Play-In-Editor is running. Stop PIE and retry.");
+        return false;
+    }
+    return true;
+}
+
+static FString MessageSeverityToString(EMessageSeverity::Type Severity)
+{
+    switch (Severity)
+    {
+        case EMessageSeverity::CriticalError:
+        case EMessageSeverity::Error:
+            return TEXT("error");
+        case EMessageSeverity::Warning:
+        case EMessageSeverity::PerformanceWarning:
+            return TEXT("warning");
+        case EMessageSeverity::Info:
+            return TEXT("info");
+        default:
+            return TEXT("info");
+    }
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCreateBlueprint(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("name"), BlueprintName) && !Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+
+    // Check if blueprint already exists
+    FString PackagePath = TEXT("/Game/Blueprints/");
+    Params->TryGetStringField(TEXT("path"), PackagePath);
+    Params->TryGetStringField(TEXT("blueprint_path"), PackagePath);
+    Params->TryGetStringField(TEXT("packagePath"), PackagePath);
+    Params->TryGetStringField(TEXT("package_path"), PackagePath);
+
+    PackagePath = PackagePath.TrimStartAndEnd();
+    if (PackagePath.IsEmpty()) PackagePath = TEXT("/Game/Blueprints/");
+    if (!PackagePath.StartsWith(TEXT("/Game/")))
+    {
+        // Keep it safe + predictable: only allow /Game paths.
+        PackagePath = TEXT("/Game/Blueprints/");
+    }
+    if (!PackagePath.EndsWith(TEXT("/")))
+    {
+        PackagePath += TEXT("/");
+    }
+
+    FString AssetName = BlueprintName;
+    if (UEditorAssetLibrary::DoesAssetExist(PackagePath + AssetName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint already exists: %s"), *BlueprintName));
+    }
+
+    // Create the blueprint factory
+    UBlueprintFactory* Factory = NewObject<UBlueprintFactory>();
+    
+    // Handle parent class
+    FString ParentClass;
+    Params->TryGetStringField(TEXT("parent_class"), ParentClass);
+    
+    // Default to Actor if no parent class specified
+    UClass* SelectedParentClass = AActor::StaticClass();
+    
+    // Try to find the specified parent class
+    if (!ParentClass.IsEmpty())
+    {
+        FString ClassName = ParentClass;
+        if (!ClassName.StartsWith(TEXT("A")))
+        {
+            ClassName = TEXT("A") + ClassName;
+        }
+        
+        // First try direct StaticClass lookup for common classes
+        UClass* FoundClass = nullptr;
+        if (ClassName == TEXT("APawn"))
+        {
+            FoundClass = APawn::StaticClass();
+        }
+        else if (ClassName == TEXT("AActor"))
+        {
+            FoundClass = AActor::StaticClass();
+        }
+        else
+        {
+            // Try loading the class using LoadClass which is more reliable than FindObject
+            const FString ClassPath = FString::Printf(TEXT("/Script/Engine.%s"), *ClassName);
+            FoundClass = LoadClass<AActor>(nullptr, *ClassPath);
+            
+            if (!FoundClass)
+            {
+                // Try alternate paths if not found
+                const FString GameClassPath = FString::Printf(TEXT("/Script/Game.%s"), *ClassName);
+                FoundClass = LoadClass<AActor>(nullptr, *GameClassPath);
+            }
+        }
+
+        if (FoundClass)
+        {
+            SelectedParentClass = FoundClass;
+            UE_LOG(LogTemp, Log, TEXT("Successfully set parent class to '%s'"), *ClassName);
+        }
+        else
+        {
+            UE_LOG(LogTemp, Warning, TEXT("Could not find specified parent class '%s' at paths: /Script/Engine.%s or /Script/Game.%s, defaulting to AActor"), 
+                *ClassName, *ClassName, *ClassName);
+        }
+    }
+    
+    Factory->ParentClass = SelectedParentClass;
+
+    // Create the blueprint
+    UPackage* Package = CreatePackage(*(PackagePath + AssetName));
+    UBlueprint* NewBlueprint = Cast<UBlueprint>(Factory->FactoryCreateNew(UBlueprint::StaticClass(), Package, *AssetName, RF_Standalone | RF_Public, nullptr, GWarn));
+
+    if (NewBlueprint)
+    {
+        // Notify the asset registry
+        FAssetRegistryModule::AssetCreated(NewBlueprint);
+
+        // Mark the package dirty
+        Package->MarkPackageDirty();
+
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetStringField(TEXT("name"), AssetName);
+        ResultObj->SetStringField(TEXT("path"), PackagePath + AssetName);
+        return ResultObj;
+    }
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create blueprint"));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleAddComponentToBlueprint(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    FString ComponentType;
+    if (!Params->TryGetStringField(TEXT("component_type"), ComponentType) && !Params->TryGetStringField(TEXT("type"), ComponentType))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_type' parameter"));
+    }
+
+    FString ComponentName;
+    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName) && !Params->TryGetStringField(TEXT("name"), ComponentName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+
+    // Create the component - dynamically find the component class by name
+    UClass* ComponentClass = nullptr;
+
+    // Try to find the class with exact name first
+    ComponentClass = FindMcpClassByName(ComponentType);
+    
+    // If not found, try with "Component" suffix
+    if (!ComponentClass && !ComponentType.EndsWith(TEXT("Component")))
+    {
+        FString ComponentTypeWithSuffix = ComponentType + TEXT("Component");
+        ComponentClass = FindMcpClassByName(ComponentTypeWithSuffix);
+    }
+    
+    // If still not found, try with "U" prefix
+    if (!ComponentClass && !ComponentType.StartsWith(TEXT("U")))
+    {
+        FString ComponentTypeWithPrefix = TEXT("U") + ComponentType;
+        ComponentClass = FindMcpClassByName(ComponentTypeWithPrefix);
+        
+        // Try with both prefix and suffix
+        if (!ComponentClass && !ComponentType.EndsWith(TEXT("Component")))
+        {
+            FString ComponentTypeWithBoth = TEXT("U") + ComponentType + TEXT("Component");
+            ComponentClass = FindMcpClassByName(ComponentTypeWithBoth);
+        }
+    }
+    
+    // Verify that the class is a valid component type
+    if (!ComponentClass || !ComponentClass->IsChildOf(UActorComponent::StaticClass()))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown component type: %s"), *ComponentType));
+    }
+
+    // Add the component to the blueprint
+    USCS_Node* NewNode = Blueprint->SimpleConstructionScript->CreateNode(ComponentClass, *ComponentName);
+    if (NewNode)
+    {
+        // Set transform if provided
+        USceneComponent* SceneComponent = Cast<USceneComponent>(NewNode->ComponentTemplate);
+        if (SceneComponent)
+        {
+            if (Params->HasField(TEXT("location")))
+            {
+                SceneComponent->SetRelativeLocation(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location")));
+            }
+            if (Params->HasField(TEXT("rotation")))
+            {
+                SceneComponent->SetRelativeRotation(FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation")));
+            }
+            if (Params->HasField(TEXT("scale")))
+            {
+                SceneComponent->SetRelativeScale3D(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale")));
+            }
+        }
+
+        // Add to root if no parent specified
+        Blueprint->SimpleConstructionScript->AddNode(NewNode);
+
+        // Compile the blueprint
+        FKismetEditorUtilities::CompileBlueprint(Blueprint);
+
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetStringField(TEXT("component_name"), ComponentName);
+        ResultObj->SetStringField(TEXT("component_type"), ComponentType);
+        return ResultObj;
+    }
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to add component to blueprint"));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetComponentProperty(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    FString ComponentName;
+    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
+    }
+
+    FString PropertyName;
+    if (!Params->TryGetStringField(TEXT("property_name"), PropertyName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_name' parameter"));
+    }
+
+    // Log all input parameters for debugging
+    UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Blueprint: %s, Component: %s, Property: %s"), 
+        *BlueprintName, *ComponentName, *PropertyName);
+    
+    // Log property_value if available
+    if (Params->HasField(TEXT("property_value")))
+    {
+        TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
+        FString ValueType;
+        
+        switch(JsonValue->Type)
+        {
+            case EJson::Boolean: ValueType = FString::Printf(TEXT("Boolean: %s"), JsonValue->AsBool() ? TEXT("true") : TEXT("false")); break;
+            case EJson::Number: ValueType = FString::Printf(TEXT("Number: %f"), JsonValue->AsNumber()); break;
+            case EJson::String: ValueType = FString::Printf(TEXT("String: %s"), *JsonValue->AsString()); break;
+            case EJson::Array: ValueType = TEXT("Array"); break;
+            case EJson::Object: ValueType = TEXT("Object"); break;
+            default: ValueType = TEXT("Unknown"); break;
+        }
+        
+        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Value Type: %s"), *ValueType);
+    }
+    else
+    {
+        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - No property_value provided"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Blueprint not found: %s"), *BlueprintName);
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+    else
+    {
+        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Blueprint found: %s (Class: %s)"), 
+            *BlueprintName, 
+            Blueprint->GeneratedClass ? *Blueprint->GeneratedClass->GetName() : TEXT("NULL"));
+    }
+
+    // Find the component
+    USCS_Node* ComponentNode = nullptr;
+    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Searching for component %s in blueprint nodes"), *ComponentName);
+    
+    if (!Blueprint->SimpleConstructionScript)
+    {
+        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - SimpleConstructionScript is NULL for blueprint %s"), *BlueprintName);
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Invalid blueprint construction script"));
+    }
+    
+    for (USCS_Node* Node : Blueprint->SimpleConstructionScript->GetAllNodes())
+    {
+        if (Node)
+        {
+            UE_LOG(LogTemp, Verbose, TEXT("SetComponentProperty - Found node: %s"), *Node->GetVariableName().ToString());
+            if (Node->GetVariableName().ToString() == ComponentName)
+            {
+                ComponentNode = Node;
+                break;
+            }
+        }
+        else
+        {
+            UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Found NULL node in blueprint"));
+        }
+    }
+
+    if (!ComponentNode)
+    {
+        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Component not found: %s"), *ComponentName);
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Component not found: %s"), *ComponentName));
+    }
+    else
+    {
+        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Component found: %s (Class: %s)"), 
+            *ComponentName, 
+            ComponentNode->ComponentTemplate ? *ComponentNode->ComponentTemplate->GetClass()->GetName() : TEXT("NULL"));
+    }
+
+    // Get the component template
+    UObject* ComponentTemplate = ComponentNode->ComponentTemplate;
+    if (!ComponentTemplate)
+    {
+        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Component template is NULL for %s"), *ComponentName);
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Invalid component template"));
+    }
+
+    // Check if this is a Spring Arm component and log special debug info
+    if (ComponentTemplate->GetClass()->GetName().Contains(TEXT("SpringArm")))
+    {
+        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - SpringArm component detected! Class: %s"), 
+            *ComponentTemplate->GetClass()->GetPathName());
+            
+        // Log all properties of the SpringArm component class
+        UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - SpringArm properties:"));
+        for (TFieldIterator<FProperty> PropIt(ComponentTemplate->GetClass()); PropIt; ++PropIt)
+        {
+            FProperty* Prop = *PropIt;
+            UE_LOG(LogTemp, Warning, TEXT("  - %s (%s)"), *Prop->GetName(), *Prop->GetCPPType());
+        }
+
+        // Special handling for Spring Arm properties
+        if (Params->HasField(TEXT("property_value")))
+        {
+            TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
+            
+            // Get the property using the new FField system
+            FProperty* Property = FindFProperty<FProperty>(ComponentTemplate->GetClass(), *PropertyName);
+            if (!Property)
+            {
+                UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Property %s not found on SpringArm component"), *PropertyName);
+                return FUnrealMCPCommonUtils::CreateErrorResponse(
+                    FString::Printf(TEXT("Property %s not found on SpringArm component"), *PropertyName));
+            }
+
+            // Create a scope guard to ensure property cleanup
+            struct FScopeGuard
+            {
+                UObject* Object;
+                FScopeGuard(UObject* InObject) : Object(InObject) 
+                {
+                    if (Object)
+                    {
+                        Object->Modify();
+                    }
+                }
+                ~FScopeGuard()
+                {
+                    if (Object)
+                    {
+                        Object->PostEditChange();
+                    }
+                }
+            } ScopeGuard(ComponentTemplate);
+
+            bool bSuccess = false;
+            FString ErrorMessage;
+
+            // Handle specific Spring Arm property types
+            if (FFloatProperty* FloatProp = CastField<FFloatProperty>(Property))
+            {
+                if (JsonValue->Type == EJson::Number)
+                {
+                    const float Value = JsonValue->AsNumber();
+                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting float property %s to %f"), *PropertyName, Value);
+                    FloatProp->SetPropertyValue_InContainer(ComponentTemplate, Value);
+                    bSuccess = true;
+                }
+            }
+            else if (FBoolProperty* BoolProp = CastField<FBoolProperty>(Property))
+            {
+                if (JsonValue->Type == EJson::Boolean)
+                {
+                    const bool Value = JsonValue->AsBool();
+                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting bool property %s to %d"), *PropertyName, Value);
+                    BoolProp->SetPropertyValue_InContainer(ComponentTemplate, Value);
+                    bSuccess = true;
+                }
+            }
+            else if (FStructProperty* StructProp = CastField<FStructProperty>(Property))
+            {
+                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Handling struct property %s of type %s"), 
+                    *PropertyName, *StructProp->Struct->GetName());
+                
+                // Special handling for common Spring Arm struct properties
+                if (StructProp->Struct == TBaseStructure<FVector>::Get())
+                {
+                    if (JsonValue->Type == EJson::Array)
+                    {
+                        const TArray<TSharedPtr<FJsonValue>>& Arr = JsonValue->AsArray();
+                        if (Arr.Num() == 3)
+                        {
+                            FVector Vec(
+                                Arr[0]->AsNumber(),
+                                Arr[1]->AsNumber(),
+                                Arr[2]->AsNumber()
+                            );
+                            void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
+                            StructProp->CopySingleValue(PropertyAddr, &Vec);
+                            bSuccess = true;
+                        }
+                    }
+                }
+                else if (StructProp->Struct == TBaseStructure<FRotator>::Get())
+                {
+                    if (JsonValue->Type == EJson::Array)
+                    {
+                        const TArray<TSharedPtr<FJsonValue>>& Arr = JsonValue->AsArray();
+                        if (Arr.Num() == 3)
+                        {
+                            FRotator Rot(
+                                Arr[0]->AsNumber(),
+                                Arr[1]->AsNumber(),
+                                Arr[2]->AsNumber()
+                            );
+                            void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
+                            StructProp->CopySingleValue(PropertyAddr, &Rot);
+                            bSuccess = true;
+                        }
+                    }
+                }
+            }
+
+            if (bSuccess)
+            {
+                // Mark the blueprint as modified
+                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Successfully set SpringArm property %s"), *PropertyName);
+                FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
+
+                TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+                ResultObj->SetStringField(TEXT("component"), ComponentName);
+                ResultObj->SetStringField(TEXT("property"), PropertyName);
+                ResultObj->SetBoolField(TEXT("success"), true);
+                return ResultObj;
+            }
+            else
+            {
+                UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set SpringArm property %s"), *PropertyName);
+                return FUnrealMCPCommonUtils::CreateErrorResponse(
+                    FString::Printf(TEXT("Failed to set SpringArm property %s"), *PropertyName));
+            }
+        }
+    }
+
+    // Regular property handling for non-Spring Arm components continues...
+
+    // Set the property value
+    if (Params->HasField(TEXT("property_value")))
+    {
+        TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
+        
+        // Get the property
+        FProperty* Property = FindFProperty<FProperty>(ComponentTemplate->GetClass(), *PropertyName);
+        if (!Property)
+        {
+            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Property %s not found on component %s"), 
+                *PropertyName, *ComponentName);
+            
+            // List all available properties for this component
+            UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Available properties for %s:"), *ComponentName);
+            for (TFieldIterator<FProperty> PropIt(ComponentTemplate->GetClass()); PropIt; ++PropIt)
+            {
+                FProperty* Prop = *PropIt;
+                UE_LOG(LogTemp, Warning, TEXT("  - %s (%s)"), *Prop->GetName(), *Prop->GetCPPType());
+            }
+            
+            return FUnrealMCPCommonUtils::CreateErrorResponse(
+                FString::Printf(TEXT("Property %s not found on component %s"), *PropertyName, *ComponentName));
+        }
+        else
+        {
+            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property found: %s (Type: %s)"), 
+                *PropertyName, *Property->GetCPPType());
+        }
+
+        bool bSuccess = false;
+        FString ErrorMessage;
+
+        // Handle different property types
+        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Attempting to set property %s"), *PropertyName);
+        
+        // Add try-catch block to catch and log any crashes
+        try
+        {
+            if (FStructProperty* StructProp = CastField<FStructProperty>(Property))
+            {
+                // Handle vector properties
+                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property is a struct: %s"), 
+                    StructProp->Struct ? *StructProp->Struct->GetName() : TEXT("NULL"));
+                    
+                if (StructProp->Struct == TBaseStructure<FVector>::Get())
+                {
+                    if (JsonValue->Type == EJson::Array)
+                    {
+                        // Handle array input [x, y, z]
+                        const TArray<TSharedPtr<FJsonValue>>& Arr = JsonValue->AsArray();
+                        if (Arr.Num() == 3)
+                        {
+                            FVector Vec(
+                                Arr[0]->AsNumber(),
+                                Arr[1]->AsNumber(),
+                                Arr[2]->AsNumber()
+                            );
+                            void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
+                            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting Vector(%f, %f, %f)"), 
+                                Vec.X, Vec.Y, Vec.Z);
+                            StructProp->CopySingleValue(PropertyAddr, &Vec);
+                            bSuccess = true;
+                        }
+                        else
+                        {
+                            ErrorMessage = FString::Printf(TEXT("Vector property requires 3 values, got %d"), Arr.Num());
+                            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
+                        }
+                    }
+                    else if (JsonValue->Type == EJson::Number)
+                    {
+                        // Handle scalar input (sets all components to same value)
+                        float Value = JsonValue->AsNumber();
+                        FVector Vec(Value, Value, Value);
+                        void* PropertyAddr = StructProp->ContainerPtrToValuePtr<void>(ComponentTemplate);
+                        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting Vector(%f, %f, %f) from scalar"), 
+                            Vec.X, Vec.Y, Vec.Z);
+                        StructProp->CopySingleValue(PropertyAddr, &Vec);
+                        bSuccess = true;
+                    }
+                    else
+                    {
+                        ErrorMessage = TEXT("Vector property requires either a single number or array of 3 numbers");
+                        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
+                    }
+                }
+                else
+                {
+                    // Handle other struct properties using default handler
+                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Using generic struct handler for %s"), 
+                        *PropertyName);
+                    bSuccess = FUnrealMCPCommonUtils::SetObjectProperty(ComponentTemplate, PropertyName, JsonValue, ErrorMessage);
+                    if (!bSuccess)
+                    {
+                        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set struct property: %s"), *ErrorMessage);
+                    }
+                }
+            }
+            else if (FEnumProperty* EnumProp = CastField<FEnumProperty>(Property))
+            {
+                // Handle enum properties
+                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property is an enum"));
+                if (JsonValue->Type == EJson::String)
+                {
+                    FString EnumValueName = JsonValue->AsString();
+                    UEnum* Enum = EnumProp->GetEnum();
+                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting enum from string: %s"), *EnumValueName);
+                    
+                    if (Enum)
+                    {
+                        int64 EnumValue = Enum->GetValueByNameString(EnumValueName);
+                        
+                        if (EnumValue != INDEX_NONE)
+                        {
+                            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Found enum value: %lld"), EnumValue);
+                            EnumProp->GetUnderlyingProperty()->SetIntPropertyValue(
+                                ComponentTemplate, 
+                                EnumValue
+                            );
+                            bSuccess = true;
+                        }
+                        else
+                        {
+                            // List all possible enum values
+                            UE_LOG(LogTemp, Warning, TEXT("SetComponentProperty - Available enum values for %s:"), 
+                                *Enum->GetName());
+                            for (int32 i = 0; i < Enum->NumEnums(); i++)
+                            {
+                                UE_LOG(LogTemp, Warning, TEXT("  - %s (%lld)"), 
+                                    *Enum->GetNameStringByIndex(i),
+                                    Enum->GetValueByIndex(i));
+                            }
+                            
+                            ErrorMessage = FString::Printf(TEXT("Invalid enum value '%s' for property %s"), 
+                                *EnumValueName, *PropertyName);
+                            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
+                        }
+                    }
+                    else
+                    {
+                        ErrorMessage = TEXT("Enum object is NULL");
+                        UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
+                    }
+                }
+                else if (JsonValue->Type == EJson::Number)
+                {
+                    // Allow setting enum by integer value
+                    int64 EnumValue = JsonValue->AsNumber();
+                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting enum from number: %lld"), EnumValue);
+                    EnumProp->GetUnderlyingProperty()->SetIntPropertyValue(
+                        ComponentTemplate, 
+                        EnumValue
+                    );
+                    bSuccess = true;
+                }
+                else
+                {
+                    ErrorMessage = TEXT("Enum property requires either a string name or integer value");
+                    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
+                }
+            }
+            else if (FNumericProperty* NumericProp = CastField<FNumericProperty>(Property))
+            {
+                // Handle numeric properties
+                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Property is numeric: IsInteger=%d, IsFloat=%d"), 
+                    NumericProp->IsInteger(), NumericProp->IsFloatingPoint());
+                    
+                if (JsonValue->Type == EJson::Number)
+                {
+                    double Value = JsonValue->AsNumber();
+                    UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Setting numeric value: %f"), Value);
+                    
+                    if (NumericProp->IsInteger())
+                    {
+                        NumericProp->SetIntPropertyValue(ComponentTemplate, (int64)Value);
+                        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Set integer value: %lld"), (int64)Value);
+                        bSuccess = true;
+                    }
+                    else if (NumericProp->IsFloatingPoint())
+                    {
+                        NumericProp->SetFloatingPointPropertyValue(ComponentTemplate, Value);
+                        UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Set float value: %f"), Value);
+                        bSuccess = true;
+                    }
+                }
+                else
+                {
+                    ErrorMessage = TEXT("Numeric property requires a number value");
+                    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - %s"), *ErrorMessage);
+                }
+            }
+            else
+            {
+                // Handle all other property types using default handler
+                UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Using generic property handler for %s (Type: %s)"), 
+                    *PropertyName, *Property->GetCPPType());
+                bSuccess = FUnrealMCPCommonUtils::SetObjectProperty(ComponentTemplate, PropertyName, JsonValue, ErrorMessage);
+                if (!bSuccess)
+                {
+                    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set property: %s"), *ErrorMessage);
+                }
+            }
+        }
+        catch (const std::exception& Ex)
+        {
+            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - EXCEPTION: %s"), ANSI_TO_TCHAR(Ex.what()));
+            return FUnrealMCPCommonUtils::CreateErrorResponse(
+                FString::Printf(TEXT("Exception while setting property %s: %s"), *PropertyName, ANSI_TO_TCHAR(Ex.what())));
+        }
+        catch (...)
+        {
+            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - UNKNOWN EXCEPTION occurred while setting property %s"), *PropertyName);
+            return FUnrealMCPCommonUtils::CreateErrorResponse(
+                FString::Printf(TEXT("Unknown exception while setting property %s"), *PropertyName));
+        }
+
+        if (bSuccess)
+        {
+            // Mark the blueprint as modified
+            UE_LOG(LogTemp, Log, TEXT("SetComponentProperty - Successfully set property %s on component %s"), 
+                *PropertyName, *ComponentName);
+            FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
+
+            TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+            ResultObj->SetStringField(TEXT("component"), ComponentName);
+            ResultObj->SetStringField(TEXT("property"), PropertyName);
+            ResultObj->SetBoolField(TEXT("success"), true);
+            return ResultObj;
+        }
+        else
+        {
+            UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Failed to set property %s: %s"), 
+                *PropertyName, *ErrorMessage);
+            return FUnrealMCPCommonUtils::CreateErrorResponse(ErrorMessage);
+        }
+    }
+
+    UE_LOG(LogTemp, Error, TEXT("SetComponentProperty - Missing 'property_value' parameter"));
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_value' parameter"));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetPhysicsProperties(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    FString ComponentName;
+    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+
+    // Find the component
+    USCS_Node* ComponentNode = nullptr;
+    for (USCS_Node* Node : Blueprint->SimpleConstructionScript->GetAllNodes())
+    {
+        if (Node && Node->GetVariableName().ToString() == ComponentName)
+        {
+            ComponentNode = Node;
+            break;
+        }
+    }
+
+    if (!ComponentNode)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Component not found: %s"), *ComponentName));
+    }
+
+    UPrimitiveComponent* PrimComponent = Cast<UPrimitiveComponent>(ComponentNode->ComponentTemplate);
+    if (!PrimComponent)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Component is not a primitive component"));
+    }
+
+    // Set physics properties
+    if (Params->HasField(TEXT("simulate_physics")))
+    {
+        PrimComponent->SetSimulatePhysics(Params->GetBoolField(TEXT("simulate_physics")));
+    }
+
+    if (Params->HasField(TEXT("mass")))
+    {
+        float Mass = Params->GetNumberField(TEXT("mass"));
+        // In UE5.5, use proper overrideMass instead of just scaling
+        PrimComponent->SetMassOverrideInKg(NAME_None, Mass);
+        UE_LOG(LogTemp, Display, TEXT("Set mass for component %s to %f kg"), *ComponentName, Mass);
+    }
+
+    if (Params->HasField(TEXT("linear_damping")))
+    {
+        PrimComponent->SetLinearDamping(Params->GetNumberField(TEXT("linear_damping")));
+    }
+
+    if (Params->HasField(TEXT("angular_damping")))
+    {
+        PrimComponent->SetAngularDamping(Params->GetNumberField(TEXT("angular_damping")));
+    }
+
+    // Mark the blueprint as modified
+    FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetStringField(TEXT("component"), ComponentName);
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCompileBlueprint(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+
+    // Compile the blueprint
+    FKismetEditorUtilities::CompileBlueprint(Blueprint);
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetStringField(TEXT("name"), BlueprintName);
+    ResultObj->SetBoolField(TEXT("compiled"), true);
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleCompileBlueprintsAll(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToCompileBlueprints(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    int32 Limit = 500;
+    if (Params->HasField(TEXT("limit")))
+    {
+        Limit = (int32)Params->GetNumberField(TEXT("limit"));
+    }
+    Limit = FMath::Clamp(Limit, 1, 10000);
+
+    bool bIncludeWarnings = true;
+    if (Params->HasField(TEXT("includeWarnings")))
+    {
+        bIncludeWarnings = Params->GetBoolField(TEXT("includeWarnings"));
+    }
+
+    TArray<FString> RootPaths;
+    if (Params->HasField(TEXT("paths")))
+    {
+        const TArray<TSharedPtr<FJsonValue>> PathsJson = Params->GetArrayField(TEXT("paths"));
+        for (const TSharedPtr<FJsonValue>& PathVal : PathsJson)
+        {
+            if (!PathVal.IsValid() || PathVal->Type != EJson::String) continue;
+            const FString P = PathVal->AsString().TrimStartAndEnd();
+            if (!P.IsEmpty())
+            {
+                RootPaths.Add(P);
+            }
+        }
+    }
+    if (RootPaths.Num() == 0)
+    {
+        RootPaths.Add(TEXT("/Game"));
+    }
+
+    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
+    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
+
+    FARFilter Filter;
+    Filter.bRecursivePaths = true;
+#if ENGINE_MAJOR_VERSION >= 5
+    Filter.ClassPaths.Add(UBlueprint::StaticClass()->GetClassPathName());
+#else
+    Filter.ClassNames.Add(UBlueprint::StaticClass()->GetFName());
+#endif
+    for (const FString& RootPath : RootPaths)
+    {
+        const FString Normalized = RootPath.StartsWith(TEXT("/")) ? RootPath : FString(TEXT("/")) + RootPath;
+        Filter.PackagePaths.Add(FName(*Normalized));
+    }
+
+    TArray<FAssetData> Assets;
+    AssetRegistry.GetAssets(Filter, Assets);
+
+    int32 TotalBlueprints = 0;
+    int32 Compiled = 0;
+    int32 Failed = 0;
+    int32 ErrorMessages = 0;
+    int32 WarningMessages = 0;
+
+    FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>(TEXT("MessageLog"));
+    const TSharedRef<IMessageLogListing> Listing = MessageLogModule.GetLogListing(TEXT("BlueprintLog"));
+
+    TArray<TSharedPtr<FJsonValue>> Results;
+
+    for (const FAssetData& Asset : Assets)
+    {
+        if (TotalBlueprints >= Limit) break;
+
+        UBlueprint* Blueprint = Cast<UBlueprint>(Asset.GetAsset());
+        if (!Blueprint) continue;
+
+        TotalBlueprints++;
+
+        Listing->ClearMessages();
+        FKismetEditorUtilities::CompileBlueprint(Blueprint);
+
+        const TArray<TSharedRef<FTokenizedMessage>>& Messages = Listing->GetFilteredMessages();
+        int32 BlueprintErrors = 0;
+        int32 BlueprintWarnings = 0;
+        TArray<TSharedPtr<FJsonValue>> MessageArray;
+
+        for (const TSharedRef<FTokenizedMessage>& Message : Messages)
+        {
+            const EMessageSeverity::Type Severity = Message->GetSeverity();
+            const bool bIsWarning =
+                Severity == EMessageSeverity::Warning || Severity == EMessageSeverity::PerformanceWarning;
+            const bool bIsError = Severity == EMessageSeverity::Error || Severity == EMessageSeverity::CriticalError;
+
+            if (bIsError) BlueprintErrors++;
+            if (bIsWarning) BlueprintWarnings++;
+
+            if (!bIncludeWarnings && bIsWarning) continue;
+
+            TSharedPtr<FJsonObject> Msg = MakeShared<FJsonObject>();
+            Msg->SetStringField(TEXT("severity"), MessageSeverityToString(Severity));
+            Msg->SetStringField(TEXT("message"), Message->ToText().ToString());
+            MessageArray.Add(MakeShared<FJsonValueObject>(Msg));
+        }
+
+        ErrorMessages += BlueprintErrors;
+        WarningMessages += BlueprintWarnings;
+
+        const bool bHadErrors = Blueprint->Status == BS_Error;
+        if (bHadErrors) Failed++; else Compiled++;
+
+        TSharedPtr<FJsonObject> Entry = MakeShared<FJsonObject>();
+        Entry->SetStringField(TEXT("name"), Blueprint->GetName());
+        Entry->SetStringField(TEXT("objectPath"), Asset.GetObjectPathString());
+        Entry->SetBoolField(TEXT("ok"), !bHadErrors);
+        Entry->SetNumberField(TEXT("errors"), BlueprintErrors);
+        Entry->SetNumberField(TEXT("warnings"), BlueprintWarnings);
+        Entry->SetArrayField(TEXT("messages"), MessageArray);
+        Results.Add(MakeShared<FJsonValueObject>(Entry));
+    }
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetNumberField(TEXT("found"), Assets.Num());
+    ResultObj->SetNumberField(TEXT("compiled"), Compiled);
+    ResultObj->SetNumberField(TEXT("failed"), Failed);
+    ResultObj->SetNumberField(TEXT("errors"), ErrorMessages);
+    ResultObj->SetNumberField(TEXT("warnings"), WarningMessages);
+    ResultObj->SetArrayField(TEXT("results"), Results);
+    ResultObj->SetBoolField(TEXT("truncated"), TotalBlueprints < Assets.Num() && TotalBlueprints >= Limit);
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSpawnBlueprintActor(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    FString ActorName;
+    if (!Params->TryGetStringField(TEXT("actor_name"), ActorName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'actor_name' parameter"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+
+    // Get transform parameters
+    FVector Location(0.0f, 0.0f, 0.0f);
+    FRotator Rotation(0.0f, 0.0f, 0.0f);
+
+    if (Params->HasField(TEXT("location")))
+    {
+        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
+    }
+    if (Params->HasField(TEXT("rotation")))
+    {
+        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
+    }
+
+    // Spawn the actor
+    UWorld* World = GEditor->GetEditorWorldContext().World();
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
+    }
+
+    FTransform SpawnTransform;
+    SpawnTransform.SetLocation(Location);
+    SpawnTransform.SetRotation(FQuat(Rotation));
+
+    AActor* NewActor = World->SpawnActor<AActor>(Blueprint->GeneratedClass, SpawnTransform);
+    if (NewActor)
+    {
+        NewActor->SetActorLabel(*ActorName);
+        return FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, true);
+    }
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn blueprint actor"));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetBlueprintProperty(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    FString PropertyName;
+    if (!Params->TryGetStringField(TEXT("property_name"), PropertyName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_name' parameter"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+
+    // Get the default object
+    UObject* DefaultObject = Blueprint->GeneratedClass->GetDefaultObject();
+    if (!DefaultObject)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get default object"));
+    }
+
+    // Set the property value
+    if (Params->HasField(TEXT("property_value")))
+    {
+        TSharedPtr<FJsonValue> JsonValue = Params->Values.FindRef(TEXT("property_value"));
+        
+        FString ErrorMessage;
+        if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, PropertyName, JsonValue, ErrorMessage))
+        {
+            // Mark the blueprint as modified
+            FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
+
+            TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+            ResultObj->SetStringField(TEXT("property"), PropertyName);
+            ResultObj->SetBoolField(TEXT("success"), true);
+            return ResultObj;
+        }
+        else
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(ErrorMessage);
+        }
+    }
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_value' parameter"));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetStaticMeshProperties(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    FString ComponentName;
+    if (!Params->TryGetStringField(TEXT("component_name"), ComponentName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'component_name' parameter"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+
+    // Find the component
+    USCS_Node* ComponentNode = nullptr;
+    for (USCS_Node* Node : Blueprint->SimpleConstructionScript->GetAllNodes())
+    {
+        if (Node && Node->GetVariableName().ToString() == ComponentName)
+        {
+            ComponentNode = Node;
+            break;
+        }
+    }
+
+    if (!ComponentNode)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Component not found: %s"), *ComponentName));
+    }
+
+    UStaticMeshComponent* MeshComponent = Cast<UStaticMeshComponent>(ComponentNode->ComponentTemplate);
+    if (!MeshComponent)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Component is not a static mesh component"));
+    }
+
+    // Set static mesh properties
+    if (Params->HasField(TEXT("static_mesh")))
+    {
+        FString MeshPath = Params->GetStringField(TEXT("static_mesh"));
+        UStaticMesh* Mesh = Cast<UStaticMesh>(UEditorAssetLibrary::LoadAsset(MeshPath));
+        if (Mesh)
+        {
+            MeshComponent->SetStaticMesh(Mesh);
+        }
+    }
+
+    if (Params->HasField(TEXT("material")))
+    {
+        FString MaterialPath = Params->GetStringField(TEXT("material"));
+        UMaterialInterface* Material = Cast<UMaterialInterface>(UEditorAssetLibrary::LoadAsset(MaterialPath));
+        if (Material)
+        {
+            MeshComponent->SetMaterial(0, Material);
+        }
+    }
+
+    // Mark the blueprint as modified
+    FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetStringField(TEXT("component"), ComponentName);
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleSetPawnProperties(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    // Find the blueprint
+    UBlueprint* Blueprint = FUnrealMCPCommonUtils::FindBlueprint(BlueprintName);
+    if (!Blueprint)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Blueprint not found: %s"), *BlueprintName));
+    }
+
+    // Get the default object
+    UObject* DefaultObject = Blueprint->GeneratedClass->GetDefaultObject();
+    if (!DefaultObject)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get default object"));
+    }
+
+    // Track if any properties were set successfully
+    bool bAnyPropertiesSet = false;
+    TSharedPtr<FJsonObject> ResultsObj = MakeShared<FJsonObject>();
+    
+    // Set auto possess player if specified
+    if (Params->HasField(TEXT("auto_possess_player")))
+    {
+        TSharedPtr<FJsonValue> AutoPossessValue = Params->Values.FindRef(TEXT("auto_possess_player"));
+        
+        FString ErrorMessage;
+        if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, TEXT("AutoPossessPlayer"), AutoPossessValue, ErrorMessage))
+        {
+            bAnyPropertiesSet = true;
+            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
+            PropResultObj->SetBoolField(TEXT("success"), true);
+            ResultsObj->SetObjectField(TEXT("AutoPossessPlayer"), PropResultObj);
+        }
+        else
+        {
+            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
+            PropResultObj->SetBoolField(TEXT("success"), false);
+            PropResultObj->SetStringField(TEXT("error"), ErrorMessage);
+            ResultsObj->SetObjectField(TEXT("AutoPossessPlayer"), PropResultObj);
+        }
+    }
+    
+    // Set controller rotation properties
+    const TCHAR* RotationProps[] = {
+        TEXT("bUseControllerRotationYaw"),
+        TEXT("bUseControllerRotationPitch"),
+        TEXT("bUseControllerRotationRoll")
+    };
+    
+    const TCHAR* ParamNames[] = {
+        TEXT("use_controller_rotation_yaw"),
+        TEXT("use_controller_rotation_pitch"),
+        TEXT("use_controller_rotation_roll")
+    };
+    
+    for (int32 i = 0; i < 3; i++)
+    {
+        if (Params->HasField(ParamNames[i]))
+        {
+            TSharedPtr<FJsonValue> Value = Params->Values.FindRef(ParamNames[i]);
+            
+            FString ErrorMessage;
+            if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, RotationProps[i], Value, ErrorMessage))
+            {
+                bAnyPropertiesSet = true;
+                TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
+                PropResultObj->SetBoolField(TEXT("success"), true);
+                ResultsObj->SetObjectField(RotationProps[i], PropResultObj);
+            }
+            else
+            {
+                TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
+                PropResultObj->SetBoolField(TEXT("success"), false);
+                PropResultObj->SetStringField(TEXT("error"), ErrorMessage);
+                ResultsObj->SetObjectField(RotationProps[i], PropResultObj);
+            }
+        }
+    }
+    
+    // Set can be damaged property
+    if (Params->HasField(TEXT("can_be_damaged")))
+    {
+        TSharedPtr<FJsonValue> Value = Params->Values.FindRef(TEXT("can_be_damaged"));
+        
+        FString ErrorMessage;
+        if (FUnrealMCPCommonUtils::SetObjectProperty(DefaultObject, TEXT("bCanBeDamaged"), Value, ErrorMessage))
+        {
+            bAnyPropertiesSet = true;
+            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
+            PropResultObj->SetBoolField(TEXT("success"), true);
+            ResultsObj->SetObjectField(TEXT("bCanBeDamaged"), PropResultObj);
+        }
+        else
+        {
+            TSharedPtr<FJsonObject> PropResultObj = MakeShared<FJsonObject>();
+            PropResultObj->SetBoolField(TEXT("success"), false);
+            PropResultObj->SetStringField(TEXT("error"), ErrorMessage);
+            ResultsObj->SetObjectField(TEXT("bCanBeDamaged"), PropResultObj);
+        }
+    }
+
+    // Mark the blueprint as modified if any properties were set
+    if (bAnyPropertiesSet)
+    {
+        FBlueprintEditorUtils::MarkBlueprintAsModified(Blueprint);
+    }
+    else if (ResultsObj->Values.Num() == 0)
+    {
+        // No properties were specified
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No properties specified to set"));
+    }
+
+    TSharedPtr<FJsonObject> ResponseObj = MakeShared<FJsonObject>();
+    ResponseObj->SetStringField(TEXT("blueprint"), BlueprintName);
+    ResponseObj->SetBoolField(TEXT("success"), bAnyPropertiesSet);
+    ResponseObj->SetObjectField(TEXT("results"), ResultsObj);
+    return ResponseObj;
+}