flockbay 0.10.49 → 0.10.52

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

@@ -1,2618 +1,2618 @@
-#include "Commands/UnrealMCPEditorCommands.h"
-#include "Commands/UnrealMCPCommonUtils.h"
-#include "Editor.h"
-#include "Editor/EditorEngine.h"
-#include "EditorViewportClient.h"
-#include "LevelEditorViewport.h"
-#include "IAssetViewport.h"
-#include "ImageUtils.h"
-#include "HighResScreenshot.h"
-#include "Engine/GameViewportClient.h"
-#include "Misc/FileHelper.h"
-#include "Misc/Paths.h"
-#include "HAL/FileManager.h"
-#include "GameFramework/Actor.h"
-#include "Engine/Selection.h"
-#include "Kismet/GameplayStatics.h"
-#include "Engine/StaticMeshActor.h"
-#include "Engine/StaticMesh.h"
-#include "Engine/Texture2D.h"
-#include "Engine/SkeletalMesh.h"
-#include "Engine/DirectionalLight.h"
-#include "Engine/PointLight.h"
-#include "Engine/SpotLight.h"
-#include "Camera/CameraActor.h"
-#include "Landscape.h"
-#include "LandscapeImportHelper.h"
-#include "Components/StaticMeshComponent.h"
-#include "Materials/MaterialInterface.h"
-#include "Sound/SoundWave.h"
-#include "IImageWrapper.h"
-#include "IImageWrapperModule.h"
-#include "EditorSubsystem.h"
-#include "Subsystems/EditorActorSubsystem.h"
-#include "Engine/Blueprint.h"
-#include "Engine/BlueprintGeneratedClass.h"
-#include "UnrealEdGlobals.h"
-#include "Editor/UnrealEdEngine.h"
-#include "UObject/UnrealType.h"
-#include "Modules/ModuleManager.h"
-#include "LevelEditor.h"
-#include "PlayInEditorDataTypes.h"
-#include "Settings/LevelEditorPlaySettings.h"
-#include "Framework/Application/SlateApplication.h"
-#include "AssetRegistry/AssetRegistryModule.h"
-#include "UObject/SoftObjectPath.h"
-#include "UObject/Package.h"
-#include "UObject/UObjectGlobals.h"
-#include "FileHelpers.h"
-#include "MessageLogModule.h"
-#include "IMessageLogListing.h"
-#include "Engine/World.h"
-#include "Engine/EngineTypes.h"
-#include "GameFramework/PlayerController.h"
-#include "Camera/PlayerCameraManager.h"
-#include "Engine/LocalPlayer.h"
-#include "Engine/SceneCapture2D.h"
-#include "Components/SceneCaptureComponent2D.h"
-#include "Engine/TextureRenderTarget2D.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);
-}
-
-static bool SavePngToFile(const FString& FilePath, int32 Width, int32 Height, TArray<FColor>& Bitmap)
-{
-	IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>(FName("ImageWrapper"));
-	TSharedPtr<IImageWrapper> Wrapper = ImageWrapperModule.CreateImageWrapper(EImageFormat::PNG);
-	if (!Wrapper.IsValid())
-	{
-		return false;
-	}
-
-	// Normalize alpha: editor backbuffer alpha can be 0/undefined, which can make PNGs look dark/grey in viewers.
-	for (FColor& Pixel : Bitmap)
-	{
-		Pixel.A = 255;
-	}
-
-	if (!Wrapper->SetRaw(Bitmap.GetData(), Bitmap.Num() * sizeof(FColor), Width, Height, ERGBFormat::BGRA, 8))
-	{
-		return false;
-	}
-
-	const TArray64<uint8>& Compressed = Wrapper->GetCompressed(100);
-	if (Compressed.Num() <= 0 || Compressed.Num() > MAX_int32)
-	{
-		return false;
-	}
-
-	TArray<uint8> Out;
-	Out.Append(Compressed.GetData(), static_cast<int32>(Compressed.Num()));
-	return FFileHelper::SaveArrayToFile(Out, *FilePath);
-}
-
-FUnrealMCPEditorCommands::FUnrealMCPEditorCommands()
-{
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleCommand(const FString& CommandType, const TSharedPtr<FJsonObject>& Params)
-{
-    // Actor manipulation commands
-    if (CommandType == TEXT("get_actors_in_level"))
-    {
-        return HandleGetActorsInLevel(Params);
-    }
-    else if (CommandType == TEXT("find_actors_by_name"))
-    {
-        return HandleFindActorsByName(Params);
-    }
-    else if (CommandType == TEXT("spawn_actor") || CommandType == TEXT("create_actor"))
-    {
-        if (CommandType == TEXT("create_actor"))
-        {
-            UE_LOG(LogTemp, Warning, TEXT("'create_actor' command is deprecated and will be removed in a future version. Please use 'spawn_actor' instead."));
-        }
-        return HandleSpawnActor(Params);
-    }
-    else if (CommandType == TEXT("create_landscape"))
-    {
-        return HandleCreateLandscape(Params);
-    }
-    else if (CommandType == TEXT("delete_actor"))
-    {
-        return HandleDeleteActor(Params);
-    }
-    else if (CommandType == TEXT("set_actor_transform"))
-    {
-        return HandleSetActorTransform(Params);
-    }
-    else if (CommandType == TEXT("get_actor_properties"))
-    {
-        return HandleGetActorProperties(Params);
-    }
-    else if (CommandType == TEXT("set_actor_property"))
-    {
-        return HandleSetActorProperty(Params);
-    }
-    // Blueprint actor spawning
-    else if (CommandType == TEXT("spawn_blueprint_actor"))
-    {
-        return HandleSpawnBlueprintActor(Params);
-    }
-    // Editor viewport commands
-    else if (CommandType == TEXT("focus_viewport"))
-    {
-        return HandleFocusViewport(Params);
-    }
-    else if (CommandType == TEXT("take_screenshot"))
-    {
-        return HandleTakeScreenshot(Params);
-    }
-    else if (CommandType == TEXT("save_all"))
-    {
-        return HandleSaveAll(Params);
-    }
-    else if (CommandType == TEXT("get_play_in_editor_status"))
-    {
-        return HandleGetPlayInEditorStatus(Params);
-    }
-    else if (CommandType == TEXT("play_in_editor"))
-    {
-        return HandlePlayInEditor(Params);
-    }
-    else if (CommandType == TEXT("play_in_editor_windowed"))
-    {
-        return HandlePlayInEditorWindowed(Params);
-    }
-    else if (CommandType == TEXT("stop_play_in_editor"))
-    {
-        return HandleStopPlayInEditor(Params);
-    }
-    else if (CommandType == TEXT("search_assets"))
-    {
-        return HandleSearchAssets(Params);
-    }
-    else if (CommandType == TEXT("get_asset_info"))
-    {
-        return HandleGetAssetInfo(Params);
-    }
-    else if (CommandType == TEXT("list_asset_packs"))
-    {
-        return HandleListAssetPacks(Params);
-    }
-    else if (CommandType == TEXT("place_asset"))
-    {
-        return HandlePlaceAsset(Params);
-    }
-    else if (CommandType == TEXT("map_check"))
-    {
-        return HandleMapCheck(Params);
-    }
-    else if (CommandType == TEXT("get_editor_context"))
-    {
-        return HandleGetEditorContext(Params);
-    }
-    else if (CommandType == TEXT("get_player_context"))
-    {
-        return HandleGetPlayerContext(Params);
-    }
-    else if (CommandType == TEXT("raycast_from_camera"))
-    {
-        return HandleRaycastFromCamera(Params);
-    }
-    else if (CommandType == TEXT("raycast_down"))
-    {
-        return HandleRaycastDown(Params);
-    }
-    else if (CommandType == TEXT("get_actor_transform"))
-    {
-        return HandleGetActorTransform(Params);
-    }
-    else if (CommandType == TEXT("get_actor_bounds"))
-    {
-        return HandleGetActorBounds(Params);
-    }
-    
-    return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown editor command: %s"), *CommandType));
-}
-
-static TSharedPtr<FJsonObject> CreatePlayStatusResponse()
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetBoolField(TEXT("isPlaySessionInProgress"), GEditor->IsPlaySessionInProgress());
-    ResultObj->SetBoolField(TEXT("isPlaySessionRequestQueued"), GEditor->IsPlaySessionRequestQueued());
-    ResultObj->SetBoolField(TEXT("isPlayingSessionInEditor"), GEditor->IsPlayingSessionInEditor());
-    return ResultObj;
-}
-
-static bool IsSafeToModifyEditorWorld(FString& OutError)
-{
-    if (!GEditor)
-    {
-        OutError = TEXT("Editor is not available (GEditor is null).");
-        return false;
-    }
-
-    if (GEditor->IsPlaySessionInProgress())
-    {
-        OutError = TEXT("Play-In-Editor is running or queued. Stop PIE before modifying the editor world (use stop_play_in_editor).");
-        return false;
-    }
-
-    return true;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSaveAll(const TSharedPtr<FJsonObject>& Params)
-{
-    FString Err;
-    if (!IsSafeToModifyEditorWorld(Err))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-    }
-
-    TArray<UPackage*> DirtyBefore;
-    FEditorFileUtils::GetDirtyPackages(DirtyBefore);
-
-    TSet<FString> DirtyBeforeNames;
-    for (UPackage* Pkg : DirtyBefore)
-    {
-        if (!Pkg) continue;
-        DirtyBeforeNames.Add(Pkg->GetName());
-    }
-
-    const int32 DirtyBeforeCount = DirtyBeforeNames.Num();
-
-    // Save without prompting; fail-hard if anything remains dirty.
-    const bool bSaveOk = FEditorFileUtils::SaveDirtyPackages(
-        /*bPromptUserToSave=*/false,
-        /*bSaveMapPackages=*/true,
-        /*bSaveContentPackages=*/true,
-        /*bFastSave=*/false
-    );
-
-    TArray<UPackage*> DirtyAfter;
-    FEditorFileUtils::GetDirtyPackages(DirtyAfter);
-
-    TSet<FString> DirtyAfterNames;
-    for (UPackage* Pkg : DirtyAfter)
-    {
-        if (!Pkg) continue;
-        DirtyAfterNames.Add(Pkg->GetName());
-    }
-
-    TArray<TSharedPtr<FJsonValue>> Attempted;
-    for (const FString& Name : DirtyBeforeNames)
-    {
-        Attempted.Add(MakeShareable(new FJsonValueString(Name)));
-    }
-
-    TArray<TSharedPtr<FJsonValue>> StillDirty;
-    for (const FString& Name : DirtyAfterNames)
-    {
-        StillDirty.Add(MakeShareable(new FJsonValueString(Name)));
-    }
-
-    TArray<TSharedPtr<FJsonValue>> Saved;
-    for (const FString& Name : DirtyBeforeNames)
-    {
-        if (!DirtyAfterNames.Contains(Name))
-        {
-            Saved.Add(MakeShareable(new FJsonValueString(Name)));
-        }
-    }
-
-    if (DirtyBeforeCount == 0)
-    {
-        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-        ResultObj->SetBoolField(TEXT("success"), true);
-        ResultObj->SetNumberField(TEXT("dirtyBefore"), DirtyBeforeCount);
-        ResultObj->SetNumberField(TEXT("dirtyAfter"), DirtyAfterNames.Num());
-        ResultObj->SetArrayField(TEXT("attemptedPackages"), Attempted);
-        ResultObj->SetArrayField(TEXT("savedPackages"), Saved);
-        ResultObj->SetArrayField(TEXT("stillDirtyPackages"), StillDirty);
-        ResultObj->SetStringField(TEXT("message"), TEXT("No unsaved changes were detected."));
-        return ResultObj;
-    }
-
-    if (DirtyAfterNames.Num() > 0)
-    {
-        TSharedPtr<FJsonObject> Details = MakeShared<FJsonObject>();
-        Details->SetBoolField(TEXT("saveOk"), bSaveOk);
-        Details->SetNumberField(TEXT("dirtyBefore"), DirtyBeforeCount);
-        Details->SetNumberField(TEXT("dirtyAfter"), DirtyAfterNames.Num());
-        Details->SetArrayField(TEXT("attemptedPackages"), Attempted);
-        Details->SetArrayField(TEXT("savedPackages"), Saved);
-        Details->SetArrayField(TEXT("stillDirtyPackages"), StillDirty);
-
-        TSharedPtr<FJsonObject> ErrObj = FUnrealMCPCommonUtils::CreateErrorResponse(
-            TEXT("Some packages are still dirty after save_all. They may require manual Save As, source control checkout, or have save errors. Resolve in-editor and retry save_all."));
-        ErrObj->SetObjectField(TEXT("details"), Details);
-        return ErrObj;
-    }
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetBoolField(TEXT("success"), true);
-    ResultObj->SetNumberField(TEXT("dirtyBefore"), DirtyBeforeCount);
-    ResultObj->SetNumberField(TEXT("dirtyAfter"), DirtyAfterNames.Num());
-    ResultObj->SetArrayField(TEXT("attemptedPackages"), Attempted);
-    ResultObj->SetArrayField(TEXT("savedPackages"), Saved);
-    ResultObj->SetArrayField(TEXT("stillDirtyPackages"), StillDirty);
-    ResultObj->SetStringField(TEXT("message"), TEXT("Saved all dirty packages."));
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetPlayInEditorStatus(const TSharedPtr<FJsonObject>& Params)
-{
-    return CreatePlayStatusResponse();
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandlePlayInEditor(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    if (GEditor->IsPlaySessionInProgress())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Play session already running or queued."));
-    }
-
-    // Use the active editor viewport, matching how the LevelEditor subsystem triggers PIE.
-    FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
-    if (!LevelEditorModule)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("LevelEditor module not available."));
-    }
-
-    TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
-    if (!ActiveViewport.IsValid())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No active level viewport. Click the viewport and retry."));
-    }
-
-    FRequestPlaySessionParams SessionParams;
-    SessionParams.WorldType = EPlaySessionWorldType::PlayInEditor;
-    SessionParams.DestinationSlateViewport = ActiveViewport;
-
-    GEditor->RequestPlaySession(SessionParams);
-    const bool bQueued = GEditor->IsPlaySessionRequestQueued();
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetBoolField(TEXT("requested"), true);
-    ResultObj->SetBoolField(TEXT("queued"), bQueued);
-    ResultObj->SetBoolField(TEXT("started"), bQueued);
-    ResultObj->SetStringField(TEXT("mode"), TEXT("pie"));
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandlePlayInEditorWindowed(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    if (GEditor->IsPlaySessionInProgress())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Play session already running or queued."));
-    }
-
-    // Match the editor's built-in "New Editor Window (PIE)" behavior by setting the play mode type and
-    // not specifying a DestinationSlateViewport.
-    ULevelEditorPlaySettings* PlaySettings = GetMutableDefault<ULevelEditorPlaySettings>();
-    if (PlaySettings)
-    {
-        PlaySettings->LastExecutedPlayModeType = EPlayModeType::PlayMode_InEditorFloating;
-
-        if (FProperty* Prop = ULevelEditorPlaySettings::StaticClass()->FindPropertyByName(
-                GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, LastExecutedPlayModeType)))
-        {
-            FPropertyChangedEvent PropChangeEvent(Prop);
-            PlaySettings->PostEditChangeProperty(PropChangeEvent);
-        }
-
-        PlaySettings->SaveConfig();
-    }
-
-    const bool bAtPlayerStart =
-        PlaySettings && PlaySettings->LastExecutedPlayModeLocation == EPlayModeLocations::PlayLocation_DefaultPlayerStart;
-
-    FRequestPlaySessionParams SessionParams;
-    SessionParams.WorldType = EPlaySessionWorldType::PlayInEditor;
-
-    // If the user is playing from current camera location, use the active viewport camera as the start transform.
-    if (!bAtPlayerStart)
-    {
-        FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
-        if (LevelEditorModule)
-        {
-            TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
-            if (ActiveViewport.IsValid() && FSlateApplication::IsInitialized() &&
-                FSlateApplication::Get().FindWidgetWindow(ActiveViewport->AsWidget()).IsValid())
-            {
-                SessionParams.StartLocation = ActiveViewport->GetAssetViewportClient().GetViewLocation();
-                SessionParams.StartRotation = ActiveViewport->GetAssetViewportClient().GetViewRotation();
-            }
-        }
-    }
-
-    GEditor->RequestPlaySession(SessionParams);
-    const bool bQueued = GEditor->IsPlaySessionRequestQueued();
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetBoolField(TEXT("requested"), true);
-    ResultObj->SetBoolField(TEXT("queued"), bQueued);
-    ResultObj->SetBoolField(TEXT("started"), bQueued);
-    ResultObj->SetStringField(TEXT("mode"), TEXT("pie_new_window"));
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleStopPlayInEditor(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    if (GEditor->IsPlaySessionRequestQueued() && !GEditor->IsPlayingSessionInEditor())
-    {
-        GEditor->CancelRequestPlaySession();
-        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-        ResultObj->SetBoolField(TEXT("stopped"), true);
-        ResultObj->SetBoolField(TEXT("canceled"), true);
-        return ResultObj;
-    }
-
-    if (!GEditor->IsPlayingSessionInEditor())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No play session is running."));
-    }
-
-    GEditor->RequestEndPlayMap();
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetBoolField(TEXT("stopped"), true);
-    return ResultObj;
-}
-
-static FString NormalizeContentRoot(const FString& Root)
-{
-    FString Out = Root.TrimStartAndEnd();
-    if (Out.IsEmpty())
-    {
-        return TEXT("/Game/");
-    }
-    if (!Out.StartsWith(TEXT("/")))
-    {
-        Out = TEXT("/") + Out;
-    }
-    if (!Out.EndsWith(TEXT("/")))
-    {
-        Out += TEXT("/");
-    }
-    return Out;
-}
-
-static bool TryResolveAssetClassFilter(const TSharedPtr<FJsonObject>& Params, FARFilter& Filter, FString& OutError)
-{
-    if (!Params.IsValid() || !Params->HasField(TEXT("class")))
-    {
-        return true;
-    }
-
-    TArray<FString> ClassNames;
-
-    FString Single;
-    if (Params->TryGetStringField(TEXT("class"), Single))
-    {
-        Single = Single.TrimStartAndEnd();
-        if (!Single.IsEmpty())
-        {
-            ClassNames.Add(Single);
-        }
-    }
-    else
-    {
-        const TArray<TSharedPtr<FJsonValue>>* Arr = nullptr;
-        if (Params->TryGetArrayField(TEXT("class"), Arr) && Arr)
-        {
-            for (const TSharedPtr<FJsonValue>& V : *Arr)
-            {
-                if (!V.IsValid() || V->Type != EJson::String) continue;
-                FString S = V->AsString().TrimStartAndEnd();
-                if (!S.IsEmpty()) ClassNames.Add(S);
-            }
-        }
-    }
-
-    for (const FString& ClassNameRaw : ClassNames)
-    {
-        const FString ClassName = ClassNameRaw.TrimStartAndEnd();
-        if (ClassName.IsEmpty()) continue;
-
-        UClass* Class = nullptr;
-
-        if (ClassName.Equals(TEXT("StaticMesh"), ESearchCase::IgnoreCase) || ClassName.Equals(TEXT("UStaticMesh"), ESearchCase::IgnoreCase))
-        {
-            Class = UStaticMesh::StaticClass();
-        }
-        else if (ClassName.Equals(TEXT("Material"), ESearchCase::IgnoreCase) || ClassName.Equals(TEXT("MaterialInterface"), ESearchCase::IgnoreCase))
-        {
-            Class = UMaterialInterface::StaticClass();
-        }
-        else if (ClassName.Equals(TEXT("Texture2D"), ESearchCase::IgnoreCase))
-        {
-            Class = UTexture2D::StaticClass();
-        }
-        else if (ClassName.Equals(TEXT("Blueprint"), ESearchCase::IgnoreCase) || ClassName.Equals(TEXT("UBlueprint"), ESearchCase::IgnoreCase))
-        {
-            Class = UBlueprint::StaticClass();
-        }
-        else if (ClassName.Equals(TEXT("SkeletalMesh"), ESearchCase::IgnoreCase))
-        {
-            Class = USkeletalMesh::StaticClass();
-        }
-        else if (ClassName.Equals(TEXT("SoundWave"), ESearchCase::IgnoreCase))
-        {
-            Class = USoundWave::StaticClass();
-        }
-        else
-        {
-            Class = FindMcpClassByName(ClassName);
-            if (!Class && !ClassName.StartsWith(TEXT("U")))
-            {
-                Class = FindMcpClassByName(TEXT("U") + ClassName);
-            }
-        }
-
-        if (!Class)
-        {
-            OutError = FString::Printf(TEXT("Unknown asset class filter: %s"), *ClassNameRaw);
-            return false;
-        }
-
-        Filter.ClassPaths.Add(Class->GetClassPathName());
-    }
-
-    return true;
-}
-
-static int32 ScoreAssetMatch(const FString& Query, const FAssetData& Asset)
-{
-    if (Query.IsEmpty()) return 0;
-
-    const FString Name = Asset.AssetName.ToString();
-    const FString Path = Asset.GetObjectPathString();
-
-    if (Name.Equals(Query, ESearchCase::IgnoreCase)) return 0;
-    if (Name.StartsWith(Query, ESearchCase::IgnoreCase)) return 1;
-    if (Path.EndsWith(Query, ESearchCase::IgnoreCase)) return 2;
-    if (Name.Contains(Query, ESearchCase::IgnoreCase)) return 3;
-    if (Path.Contains(Query, ESearchCase::IgnoreCase)) return 4;
-    return 100;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSearchAssets(const TSharedPtr<FJsonObject>& Params)
-{
-    FString Root = TEXT("/Game/");
-    Params->TryGetStringField(TEXT("root"), Root);
-    Root = NormalizeContentRoot(Root);
-
-    FString Query;
-    Params->TryGetStringField(TEXT("query"), Query);
-    Query = Query.TrimStartAndEnd();
-
-    int32 Limit = 25;
-    if (Params->HasField(TEXT("limit")))
-    {
-        Limit = (int32)Params->GetNumberField(TEXT("limit"));
-    }
-    Limit = FMath::Clamp(Limit, 1, 200);
-
-    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
-    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
-
-    FARFilter Filter;
-    Filter.PackagePaths.Add(*Root);
-    Filter.bRecursivePaths = true;
-
-    FString ClassErr;
-    if (!TryResolveAssetClassFilter(Params, Filter, ClassErr))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(ClassErr);
-    }
-
-    TArray<FAssetData> Assets;
-    AssetRegistry.GetAssets(Filter, Assets);
-
-    if (!Query.IsEmpty())
-    {
-        Assets.RemoveAll([&Query](const FAssetData& Asset) {
-            const FString Name = Asset.AssetName.ToString();
-            const FString Path = Asset.GetObjectPathString();
-            return !(Name.Contains(Query, ESearchCase::IgnoreCase) || Path.Contains(Query, ESearchCase::IgnoreCase));
-        });
-
-        Assets.Sort([&Query](const FAssetData& A, const FAssetData& B) {
-            const int32 SA = ScoreAssetMatch(Query, A);
-            const int32 SB = ScoreAssetMatch(Query, B);
-            if (SA != SB) return SA < SB;
-            return A.AssetName.LexicalLess(B.AssetName);
-        });
-    }
-    else
-    {
-        Assets.Sort([](const FAssetData& A, const FAssetData& B) {
-            return A.AssetName.LexicalLess(B.AssetName);
-        });
-    }
-
-    const int32 Total = Assets.Num();
-    if (Assets.Num() > Limit)
-    {
-        Assets.SetNum(Limit);
-    }
-
-    TArray<TSharedPtr<FJsonValue>> OutAssets;
-    OutAssets.Reserve(Assets.Num());
-    for (const FAssetData& Asset : Assets)
-    {
-        TSharedPtr<FJsonObject> Obj = MakeShared<FJsonObject>();
-        Obj->SetStringField(TEXT("name"), Asset.AssetName.ToString());
-        Obj->SetStringField(TEXT("objectPath"), Asset.GetObjectPathString());
-        Obj->SetStringField(TEXT("packagePath"), Asset.PackagePath.ToString());
-        Obj->SetStringField(TEXT("class"), Asset.AssetClassPath.ToString());
-        OutAssets.Add(MakeShared<FJsonValueObject>(Obj));
-    }
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetStringField(TEXT("root"), Root);
-    Result->SetStringField(TEXT("query"), Query);
-    Result->SetNumberField(TEXT("count"), OutAssets.Num());
-    Result->SetNumberField(TEXT("totalMatches"), Total);
-    Result->SetArrayField(TEXT("assets"), OutAssets);
-    return Result;
-}
-
-static FString InferPlacementKindFromAssetClassPath(const FString& ClassPath)
-{
-    if (ClassPath.Contains(TEXT("StaticMesh"), ESearchCase::IgnoreCase)) return TEXT("static_mesh");
-    if (ClassPath.Contains(TEXT("Blueprint"), ESearchCase::IgnoreCase)) return TEXT("blueprint");
-    if (ClassPath.Contains(TEXT("Material"), ESearchCase::IgnoreCase)) return TEXT("material");
-    if (ClassPath.Contains(TEXT("Texture"), ESearchCase::IgnoreCase)) return TEXT("texture");
-    return TEXT("unknown");
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetAssetInfo(const TSharedPtr<FJsonObject>& Params)
-{
-    FString ObjectPath;
-    if (!Params->TryGetStringField(TEXT("objectPath"), ObjectPath) && !Params->TryGetStringField(TEXT("object_path"), ObjectPath))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'objectPath' parameter"));
-    }
-    ObjectPath = ObjectPath.TrimStartAndEnd();
-    if (ObjectPath.IsEmpty())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("objectPath is empty"));
-    }
-
-    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
-    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
-
-    const FAssetData Asset = AssetRegistry.GetAssetByObjectPath(FSoftObjectPath(ObjectPath));
-    if (!Asset.IsValid())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Asset not found: %s"), *ObjectPath));
-    }
-
-    const FString ClassPath = Asset.AssetClassPath.ToString();
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetStringField(TEXT("name"), Asset.AssetName.ToString());
-    Result->SetStringField(TEXT("objectPath"), Asset.GetObjectPathString());
-    Result->SetStringField(TEXT("packageName"), Asset.PackageName.ToString());
-    Result->SetStringField(TEXT("packagePath"), Asset.PackagePath.ToString());
-    Result->SetStringField(TEXT("class"), ClassPath);
-    Result->SetStringField(TEXT("placementKind"), InferPlacementKindFromAssetClassPath(ClassPath));
-
-    if (Params->HasField(TEXT("includeDependencies")) && Params->GetBoolField(TEXT("includeDependencies")))
-    {
-        TArray<FName> Deps;
-        AssetRegistry.GetDependencies(Asset.PackageName, Deps);
-        TArray<TSharedPtr<FJsonValue>> DepArr;
-        DepArr.Reserve(Deps.Num());
-        for (const FName& Dep : Deps)
-        {
-            DepArr.Add(MakeShared<FJsonValueString>(Dep.ToString()));
-        }
-        Result->SetArrayField(TEXT("dependencies"), DepArr);
-    }
-
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleListAssetPacks(const TSharedPtr<FJsonObject>& Params)
-{
-    int32 Limit = 200;
-    if (Params->HasField(TEXT("limit")))
-    {
-        Limit = (int32)Params->GetNumberField(TEXT("limit"));
-    }
-    Limit = FMath::Clamp(Limit, 1, 500);
-
-    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
-    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
-
-    TArray<FString> SubPaths;
-    AssetRegistry.GetSubPaths(TEXT("/Game"), SubPaths, false);
-    SubPaths.Sort();
-
-    TArray<TSharedPtr<FJsonValue>> Packs;
-    for (const FString& Path : SubPaths)
-    {
-        if (Packs.Num() >= Limit) break;
-        if (Path.StartsWith(TEXT("/Game/__External"), ESearchCase::IgnoreCase)) continue;
-        if (Path.StartsWith(TEXT("/Game/Developers"), ESearchCase::IgnoreCase)) continue;
-
-        FString Name = Path;
-        int32 SlashIndex;
-        if (Name.FindLastChar(TEXT('/'), SlashIndex))
-        {
-            Name = Name.Mid(SlashIndex + 1);
-        }
-
-        TSharedPtr<FJsonObject> Obj = MakeShared<FJsonObject>();
-        Obj->SetStringField(TEXT("name"), Name);
-        Obj->SetStringField(TEXT("path"), Path + TEXT("/"));
-        Packs.Add(MakeShared<FJsonValueObject>(Obj));
-    }
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetNumberField(TEXT("count"), Packs.Num());
-    Result->SetArrayField(TEXT("packs"), Packs);
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandlePlaceAsset(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    FString ObjectPath;
-    if (!Params->TryGetStringField(TEXT("objectPath"), ObjectPath) && !Params->TryGetStringField(TEXT("object_path"), ObjectPath))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'objectPath' parameter"));
-    }
-    ObjectPath = ObjectPath.TrimStartAndEnd();
-    if (ObjectPath.IsEmpty())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("objectPath is empty"));
-    }
-
-    FVector Location(0.0f, 0.0f, 0.0f);
-    FRotator Rotation(0.0f, 0.0f, 0.0f);
-    FVector Scale(1.0f, 1.0f, 1.0f);
-
-    if (Params->HasField(TEXT("location")))
-    {
-        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
-    }
-    if (Params->HasField(TEXT("rotation")))
-    {
-        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
-    }
-    if (Params->HasField(TEXT("scale")))
-    {
-        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
-    }
-
-    UWorld* World = GEditor ? GEditor->GetEditorWorldContext().World() : nullptr;
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
-    }
-
-    FString AssetClassPath;
-    FString AssetName;
-    {
-        FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
-        IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
-        const FAssetData Asset = AssetRegistry.GetAssetByObjectPath(FSoftObjectPath(ObjectPath));
-        if (Asset.IsValid())
-        {
-            AssetClassPath = Asset.AssetClassPath.ToString();
-            AssetName = Asset.AssetName.ToString();
-        }
-    }
-
-    FString RequestedName;
-    Params->TryGetStringField(TEXT("name"), RequestedName);
-    RequestedName = RequestedName.TrimStartAndEnd();
-    if (RequestedName.IsEmpty())
-    {
-        RequestedName = !AssetName.IsEmpty() ? AssetName : TEXT("PlacedAsset");
-    }
-
-    AActor* NewActor = nullptr;
-    FString PlacementKind = !AssetClassPath.IsEmpty() ? InferPlacementKindFromAssetClassPath(AssetClassPath) : TEXT("unknown");
-
-    UObject* AssetObj = LoadObject<UObject>(nullptr, *ObjectPath);
-    if (!AssetObj && !ObjectPath.Contains(TEXT("'")))
-    {
-        AssetObj = LoadObject<UObject>(nullptr, *FString::Printf(TEXT("StaticMesh'%s'"), *ObjectPath));
-        if (!AssetObj)
-        {
-            AssetObj = LoadObject<UObject>(nullptr, *FString::Printf(TEXT("Blueprint'%s'"), *ObjectPath));
-        }
-    }
-
-    if (!AssetObj)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Failed to load asset: %s"), *ObjectPath));
-    }
-
-    FActorSpawnParameters SpawnParams;
-    SpawnParams.Name = MakeUniqueObjectName(World, AActor::StaticClass(), FName(*RequestedName));
-
-    if (UStaticMesh* StaticMesh = Cast<UStaticMesh>(AssetObj))
-    {
-        PlacementKind = TEXT("static_mesh");
-        AStaticMeshActor* StaticMeshActor = World->SpawnActor<AStaticMeshActor>(AStaticMeshActor::StaticClass(), Location, Rotation, SpawnParams);
-        if (!StaticMeshActor || !StaticMeshActor->GetStaticMeshComponent())
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn StaticMeshActor"));
-        }
-
-        StaticMeshActor->GetStaticMeshComponent()->SetStaticMesh(StaticMesh);
-        StaticMeshActor->GetStaticMeshComponent()->MarkRenderStateDirty();
-        NewActor = StaticMeshActor;
-    }
-    else if (UBlueprint* Blueprint = Cast<UBlueprint>(AssetObj))
-    {
-        PlacementKind = TEXT("blueprint");
-        if (!Blueprint->GeneratedClass)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Blueprint has no GeneratedClass (compile it and retry)."));
-        }
-        const FTransform SpawnTransform(FQuat(Rotation), Location, Scale);
-        NewActor = World->SpawnActor<AActor>(Blueprint->GeneratedClass, SpawnTransform, SpawnParams);
-    }
-    else if (UBlueprintGeneratedClass* GeneratedClass = Cast<UBlueprintGeneratedClass>(AssetObj))
-    {
-        PlacementKind = TEXT("blueprint");
-        const FTransform SpawnTransform(FQuat(Rotation), Location, Scale);
-        NewActor = World->SpawnActor<AActor>(GeneratedClass, SpawnTransform, SpawnParams);
-    }
-    else if (UClass* Class = Cast<UClass>(AssetObj))
-    {
-        if (!Class->IsChildOf(AActor::StaticClass()))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Loaded class is not an Actor class: %s"), *Class->GetName()));
-        }
-        PlacementKind = TEXT("blueprint");
-        const FTransform SpawnTransform(FQuat(Rotation), Location, Scale);
-        NewActor = World->SpawnActor<AActor>(Class, SpawnTransform, SpawnParams);
-    }
-    else
-    {
-        const FString ClassName = AssetObj->GetClass() ? AssetObj->GetClass()->GetName() : TEXT("UnknownClass");
-        return FUnrealMCPCommonUtils::CreateErrorResponse(
-            FString::Printf(TEXT("Asset is not placeable (class: %s). Placeable: StaticMesh, Blueprint. Asset: %s"), *ClassName, *ObjectPath));
-    }
-
-    if (!NewActor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn actor for asset."));
-    }
-
-    NewActor->SetActorScale3D(Scale);
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetStringField(TEXT("placementKind"), PlacementKind);
-    Result->SetStringField(TEXT("requestedObjectPath"), ObjectPath);
-    Result->SetStringField(TEXT("spawnedName"), NewActor->GetName());
-    Result->SetObjectField(TEXT("actor"), FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, true));
-    return Result;
-}
-
-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");
-    }
-}
-
-static TArray<TSharedPtr<FJsonValue>> VectorToJsonArray(const FVector& V)
-{
-    TArray<TSharedPtr<FJsonValue>> Arr;
-    Arr.Add(MakeShared<FJsonValueNumber>(V.X));
-    Arr.Add(MakeShared<FJsonValueNumber>(V.Y));
-    Arr.Add(MakeShared<FJsonValueNumber>(V.Z));
-    return Arr;
-}
-
-static TArray<TSharedPtr<FJsonValue>> RotatorToJsonArray(const FRotator& R)
-{
-    TArray<TSharedPtr<FJsonValue>> Arr;
-    Arr.Add(MakeShared<FJsonValueNumber>(R.Pitch));
-    Arr.Add(MakeShared<FJsonValueNumber>(R.Yaw));
-    Arr.Add(MakeShared<FJsonValueNumber>(R.Roll));
-    return Arr;
-}
-
-static AActor* FindActorByNameOrLabel(UWorld* World, const FString& NameOrLabel)
-{
-    if (!World) return nullptr;
-    if (NameOrLabel.IsEmpty()) return nullptr;
-
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(World, AActor::StaticClass(), AllActors);
-    for (AActor* Actor : AllActors)
-    {
-        if (!Actor) continue;
-        if (Actor->GetName().Equals(NameOrLabel, ESearchCase::CaseSensitive) ||
-            Actor->GetName().Equals(NameOrLabel, ESearchCase::IgnoreCase))
-        {
-            return Actor;
-        }
-#if WITH_EDITOR
-        if (Actor->GetActorLabel().Equals(NameOrLabel, ESearchCase::IgnoreCase))
-        {
-            return Actor;
-        }
-#endif
-    }
-
-    return nullptr;
-}
-
-static TSharedPtr<FJsonObject> RaycastInWorld(UWorld* World, const FVector& Start, const FVector& Dir, float MaxDistance, const TArray<FString>& IgnoreActorNames)
-{
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No world available for raycast."));
-    }
-
-    const FVector Direction = Dir.GetSafeNormal();
-    if (Direction.IsNearlyZero())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Raycast direction is zero."));
-    }
-
-    MaxDistance = FMath::Clamp(MaxDistance, 1.0f, 1.0e7f);
-    const FVector End = Start + Direction * MaxDistance;
-
-    FCollisionQueryParams QueryParams(SCENE_QUERY_STAT(UnrealMCP_Raycast), true);
-    QueryParams.bReturnPhysicalMaterial = false;
-
-    for (const FString& Name : IgnoreActorNames)
-    {
-        if (AActor* Actor = FindActorByNameOrLabel(World, Name))
-        {
-            QueryParams.AddIgnoredActor(Actor);
-        }
-    }
-
-    FHitResult Hit;
-    const bool bHit = World->LineTraceSingleByChannel(Hit, Start, End, ECC_Visibility, QueryParams);
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetBoolField(TEXT("hit"), bHit);
-    Result->SetArrayField(TEXT("start"), VectorToJsonArray(Start));
-    Result->SetArrayField(TEXT("end"), VectorToJsonArray(End));
-    Result->SetNumberField(TEXT("maxDistance"), MaxDistance);
-
-    if (!bHit)
-    {
-        return Result;
-    }
-
-    Result->SetArrayField(TEXT("location"), VectorToJsonArray(Hit.ImpactPoint));
-    Result->SetArrayField(TEXT("normal"), VectorToJsonArray(Hit.ImpactNormal));
-    Result->SetNumberField(TEXT("distance"), Hit.Distance);
-    if (AActor* HitActor = Hit.GetActor())
-    {
-        Result->SetStringField(TEXT("actor"), HitActor->GetName());
-#if WITH_EDITOR
-        Result->SetStringField(TEXT("actorLabel"), HitActor->GetActorLabel());
-#endif
-    }
-    if (UPrimitiveComponent* HitComp = Hit.GetComponent())
-    {
-        Result->SetStringField(TEXT("component"), HitComp->GetName());
-    }
-
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleMapCheck(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    const bool bIncludeWarnings = !Params->HasField(TEXT("includeWarnings")) || Params->GetBoolField(TEXT("includeWarnings"));
-    int32 Limit = 200;
-    if (Params->HasField(TEXT("limit")))
-    {
-        Limit = (int32)Params->GetNumberField(TEXT("limit"));
-    }
-    Limit = FMath::Clamp(Limit, 1, 1000);
-
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    UWorld* World = GEditor->GetEditorWorldContext().World();
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
-    }
-
-    FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>(TEXT("MessageLog"));
-    const TSharedRef<IMessageLogListing> Listing = MessageLogModule.GetLogListing(TEXT("MapCheck"));
-    Listing->ClearMessages();
-
-    FOutputDeviceNull Ar;
-    // Use the editor's exec pathway so we can request "don't display dialog" without relying on private enums.
-    const bool bOk = GEditor->Exec(World, TEXT("MAP CHECK DONTDISPLAYDIALOG"), Ar);
-    if (!bOk)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to run Map Check."));
-    }
-
-    const TArray<TSharedRef<FTokenizedMessage>>& Messages = Listing->GetFilteredMessages();
-    int32 ErrorCount = 0;
-    int32 WarningCount = 0;
-    int32 IncludedMessageCount = 0;
-    bool bTruncated = false;
-
-    TArray<TSharedPtr<FJsonValue>> Issues;
-    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) ErrorCount++;
-        if (bIsWarning) WarningCount++;
-
-        if (!bIncludeWarnings && bIsWarning) continue;
-
-        IncludedMessageCount++;
-        if (Issues.Num() >= Limit)
-        {
-            bTruncated = true;
-            continue;
-        }
-
-        TSharedPtr<FJsonObject> Issue = MakeShared<FJsonObject>();
-        Issue->SetStringField(TEXT("severity"), MessageSeverityToString(Severity));
-        Issue->SetStringField(TEXT("message"), Message->ToText().ToString());
-        Issues.Add(MakeShared<FJsonValueObject>(Issue));
-    }
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetBoolField(TEXT("ok"), ErrorCount == 0);
-    Result->SetNumberField(TEXT("errors"), ErrorCount);
-    Result->SetNumberField(TEXT("warnings"), WarningCount);
-    Result->SetBoolField(TEXT("includeWarnings"), bIncludeWarnings);
-    Result->SetArrayField(TEXT("issues"), Issues);
-    Result->SetBoolField(TEXT("truncated"), bTruncated || IncludedMessageCount > Issues.Num());
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetEditorContext(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    UWorld* World = GEditor->GetEditorWorldContext().World();
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
-    }
-
-    const FDateTime Now = FDateTime::UtcNow();
-    const int64 TimestampMs = Now.ToUnixTimestamp() * 1000 + Now.GetMillisecond();
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetNumberField(TEXT("timestampMs"), (double)TimestampMs);
-
-    const FString MapPackage = World->GetOutermost() ? World->GetOutermost()->GetName() : World->GetMapName();
-    Result->SetStringField(TEXT("map"), MapPackage);
-
-    // Selection (editor)
-    TArray<TSharedPtr<FJsonValue>> Selection;
-    if (USelection* SelectedActors = GEditor->GetSelectedActors())
-    {
-        for (FSelectionIterator It(*SelectedActors); It; ++It)
-        {
-            if (AActor* Actor = Cast<AActor>(*It))
-            {
-                TSharedPtr<FJsonObject> Obj = MakeShared<FJsonObject>();
-                Obj->SetStringField(TEXT("name"), Actor->GetName());
-#if WITH_EDITOR
-                Obj->SetStringField(TEXT("label"), Actor->GetActorLabel());
-#endif
-                Obj->SetArrayField(TEXT("location"), VectorToJsonArray(Actor->GetActorLocation()));
-                Obj->SetArrayField(TEXT("rotation"), RotatorToJsonArray(Actor->GetActorRotation()));
-                Selection.Add(MakeShared<FJsonValueObject>(Obj));
-            }
-        }
-    }
-    Result->SetArrayField(TEXT("selection"), Selection);
-
-    // Active viewport camera (best-effort)
-    TSharedPtr<FJsonObject> ViewportCamera;
-    FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
-    if (LevelEditorModule)
-    {
-        TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
-        if (ActiveViewport.IsValid())
-        {
-            const FEditorViewportClient& VC = ActiveViewport->GetAssetViewportClient();
-            ViewportCamera = MakeShared<FJsonObject>();
-            ViewportCamera->SetArrayField(TEXT("location"), VectorToJsonArray(VC.GetViewLocation()));
-            ViewportCamera->SetArrayField(TEXT("rotation"), RotatorToJsonArray(VC.GetViewRotation()));
-            ViewportCamera->SetNumberField(TEXT("fov"), VC.ViewFOV);
-            ViewportCamera->SetArrayField(TEXT("forward"), VectorToJsonArray(VC.GetViewRotation().Vector()));
-        }
-    }
-    if (ViewportCamera.IsValid())
-    {
-        Result->SetObjectField(TEXT("viewportCamera"), ViewportCamera);
-    }
-    else
-    {
-        Result->SetField(TEXT("viewportCamera"), MakeShared<FJsonValueNull>());
-    }
-
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetPlayerContext(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    UWorld* PlayWorld = GEditor->PlayWorld;
-    const bool bIsPlaying = PlayWorld != nullptr;
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetBoolField(TEXT("isPlaying"), bIsPlaying);
-
-    if (!bIsPlaying)
-    {
-        Result->SetField(TEXT("pawn"), MakeShared<FJsonValueNull>());
-        Result->SetField(TEXT("camera"), MakeShared<FJsonValueNull>());
-        return Result;
-    }
-
-    APlayerController* PC = PlayWorld->GetFirstPlayerController();
-    if (!PC)
-    {
-        Result->SetField(TEXT("pawn"), MakeShared<FJsonValueNull>());
-        Result->SetField(TEXT("camera"), MakeShared<FJsonValueNull>());
-        return Result;
-    }
-
-    Result->SetStringField(TEXT("controller"), PC->GetName());
-
-    if (APawn* Pawn = PC->GetPawn())
-    {
-        TSharedPtr<FJsonObject> PawnObj = MakeShared<FJsonObject>();
-        PawnObj->SetStringField(TEXT("name"), Pawn->GetName());
-        PawnObj->SetArrayField(TEXT("location"), VectorToJsonArray(Pawn->GetActorLocation()));
-        PawnObj->SetArrayField(TEXT("rotation"), RotatorToJsonArray(Pawn->GetActorRotation()));
-        PawnObj->SetArrayField(TEXT("scale"), VectorToJsonArray(Pawn->GetActorScale3D()));
-        Result->SetObjectField(TEXT("pawn"), PawnObj);
-    }
-    else
-    {
-        Result->SetField(TEXT("pawn"), MakeShared<FJsonValueNull>());
-    }
-
-    FVector CamLoc;
-    FRotator CamRot;
-    PC->GetPlayerViewPoint(CamLoc, CamRot);
-
-    TSharedPtr<FJsonObject> CamObj = MakeShared<FJsonObject>();
-    CamObj->SetArrayField(TEXT("location"), VectorToJsonArray(CamLoc));
-    CamObj->SetArrayField(TEXT("rotation"), RotatorToJsonArray(CamRot));
-    CamObj->SetArrayField(TEXT("forward"), VectorToJsonArray(CamRot.Vector()));
-    Result->SetObjectField(TEXT("camera"), CamObj);
-
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleRaycastFromCamera(const TSharedPtr<FJsonObject>& Params)
-{
-    const FString Source = Params->HasField(TEXT("source")) ? Params->GetStringField(TEXT("source")).ToLower() : TEXT("editor");
-    const float MaxDistance = Params->HasField(TEXT("maxDistance")) ? (float)Params->GetNumberField(TEXT("maxDistance")) : 10000.0f;
-
-    TArray<FString> Ignore;
-    if (Params->HasField(TEXT("ignoreActors")))
-    {
-        const TArray<TSharedPtr<FJsonValue>> Arr = Params->GetArrayField(TEXT("ignoreActors"));
-        for (const TSharedPtr<FJsonValue>& V : Arr)
-        {
-            if (V.IsValid() && V->Type == EJson::String)
-            {
-                const FString S = V->AsString().TrimStartAndEnd();
-                if (!S.IsEmpty()) Ignore.Add(S);
-            }
-        }
-    }
-
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    if (Source == TEXT("pie") || Source == TEXT("player") || Source == TEXT("runtime"))
-    {
-        UWorld* PlayWorld = GEditor->PlayWorld;
-        if (!PlayWorld)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is not running (no PlayWorld)."));
-        }
-        APlayerController* PC = PlayWorld->GetFirstPlayerController();
-        if (!PC)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is running but no player controller was found."));
-        }
-        FVector CamLoc;
-        FRotator CamRot;
-        PC->GetPlayerViewPoint(CamLoc, CamRot);
-        return RaycastInWorld(PlayWorld, CamLoc, CamRot.Vector(), MaxDistance, Ignore);
-    }
-
-    // Default: editor viewport camera.
-    FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
-    if (!LevelEditorModule)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("LevelEditor module not available."));
-    }
-    TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
-    if (!ActiveViewport.IsValid())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No active level viewport. Click the viewport and retry."));
-    }
-
-    const FEditorViewportClient& VC = ActiveViewport->GetAssetViewportClient();
-    UWorld* World = GEditor->GetEditorWorldContext().World();
-    return RaycastInWorld(World, VC.GetViewLocation(), VC.GetViewRotation().Vector(), MaxDistance, Ignore);
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleRaycastDown(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    FString WorldSource = TEXT("editor");
-    if (Params->HasField(TEXT("source")))
-    {
-        WorldSource = Params->GetStringField(TEXT("source")).ToLower();
-    }
-
-    FVector Start;
-    if (Params->HasField(TEXT("startLocation")))
-    {
-        Start = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("startLocation"));
-    }
-    else
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'startLocation' parameter"));
-    }
-
-    const float MaxDistance = Params->HasField(TEXT("maxDistance")) ? (float)Params->GetNumberField(TEXT("maxDistance")) : 100000.0f;
-
-    UWorld* World = nullptr;
-    if (WorldSource == TEXT("pie"))
-    {
-        World = GEditor->PlayWorld;
-        if (!World)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is not running (no PlayWorld)."));
-        }
-    }
-    else
-    {
-        World = GEditor->GetEditorWorldContext().World();
-    }
-
-    return RaycastInWorld(World, Start, FVector(0.0f, 0.0f, -1.0f), MaxDistance, {});
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorTransform(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    FString Name;
-    if (!Params->TryGetStringField(TEXT("name"), Name) && !Params->TryGetStringField(TEXT("actor"), Name))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-    Name = Name.TrimStartAndEnd();
-    if (Name.IsEmpty())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Actor name is empty"));
-    }
-
-    FString Source = Params->HasField(TEXT("source")) ? Params->GetStringField(TEXT("source")).ToLower() : TEXT("editor");
-    UWorld* World = nullptr;
-    if (Source == TEXT("pie"))
-    {
-        World = GEditor->PlayWorld;
-    }
-    else
-    {
-        World = GEditor->GetEditorWorldContext().World();
-    }
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("World is not available."));
-    }
-
-    AActor* Actor = FindActorByNameOrLabel(World, Name);
-    if (!Actor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *Name));
-    }
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetStringField(TEXT("name"), Actor->GetName());
-#if WITH_EDITOR
-    Result->SetStringField(TEXT("label"), Actor->GetActorLabel());
-#endif
-    Result->SetArrayField(TEXT("location"), VectorToJsonArray(Actor->GetActorLocation()));
-    Result->SetArrayField(TEXT("rotation"), RotatorToJsonArray(Actor->GetActorRotation()));
-    Result->SetArrayField(TEXT("scale"), VectorToJsonArray(Actor->GetActorScale3D()));
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorBounds(const TSharedPtr<FJsonObject>& Params)
-{
-    if (!GEditor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
-    }
-
-    FString Name;
-    if (!Params->TryGetStringField(TEXT("name"), Name) && !Params->TryGetStringField(TEXT("actor"), Name))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-    Name = Name.TrimStartAndEnd();
-    if (Name.IsEmpty())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Actor name is empty"));
-    }
-
-    FString Source = Params->HasField(TEXT("source")) ? Params->GetStringField(TEXT("source")).ToLower() : TEXT("editor");
-    UWorld* World = nullptr;
-    if (Source == TEXT("pie"))
-    {
-        World = GEditor->PlayWorld;
-    }
-    else
-    {
-        World = GEditor->GetEditorWorldContext().World();
-    }
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("World is not available."));
-    }
-
-    AActor* Actor = FindActorByNameOrLabel(World, Name);
-    if (!Actor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *Name));
-    }
-
-    FVector Origin;
-    FVector Extent;
-    Actor->GetActorBounds(true, Origin, Extent, false);
-
-    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
-    Result->SetStringField(TEXT("name"), Actor->GetName());
-#if WITH_EDITOR
-    Result->SetStringField(TEXT("label"), Actor->GetActorLabel());
-#endif
-    Result->SetArrayField(TEXT("origin"), VectorToJsonArray(Origin));
-    Result->SetArrayField(TEXT("extent"), VectorToJsonArray(Extent));
-    Result->SetArrayField(TEXT("min"), VectorToJsonArray(Origin - Extent));
-    Result->SetArrayField(TEXT("max"), VectorToJsonArray(Origin + Extent));
-    return Result;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorsInLevel(const TSharedPtr<FJsonObject>& Params)
-{
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
-    
-    TArray<TSharedPtr<FJsonValue>> ActorArray;
-    for (AActor* Actor : AllActors)
-    {
-        if (Actor)
-        {
-            ActorArray.Add(FUnrealMCPCommonUtils::ActorToJson(Actor));
-        }
-    }
-    
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetArrayField(TEXT("actors"), ActorArray);
-    
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleFindActorsByName(const TSharedPtr<FJsonObject>& Params)
-{
-    FString Pattern;
-    if (!Params->TryGetStringField(TEXT("pattern"), Pattern) && !Params->TryGetStringField(TEXT("name"), Pattern))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'pattern' parameter"));
-    }
-    Pattern = Pattern.TrimStartAndEnd();
-    if (Pattern.IsEmpty())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("pattern is empty"));
-    }
-    
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
-    
-    TArray<TSharedPtr<FJsonValue>> MatchingActors;
-    for (AActor* Actor : AllActors)
-    {
-        if (!Actor) continue;
-        const bool bNameMatch = Actor->GetName().Contains(Pattern);
-#if WITH_EDITOR
-        const bool bLabelMatch = Actor->GetActorLabel().Contains(Pattern);
-#else
-        const bool bLabelMatch = false;
-#endif
-        if (bNameMatch || bLabelMatch)
-        {
-            MatchingActors.Add(FUnrealMCPCommonUtils::ActorToJson(Actor));
-        }
-    }
-    
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetArrayField(TEXT("actors"), MatchingActors);
-    
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSpawnActor(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    // Get required parameters
-    FString ActorType;
-    if (!Params->TryGetStringField(TEXT("type"), ActorType))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'type' parameter"));
-    }
-
-    // Get actor name (required parameter)
-    FString ActorName;
-    if (!Params->TryGetStringField(TEXT("name"), ActorName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-
-    // Get optional transform parameters
-    FVector Location(0.0f, 0.0f, 0.0f);
-    FRotator Rotation(0.0f, 0.0f, 0.0f);
-    FVector Scale(1.0f, 1.0f, 1.0f);
-
-    if (Params->HasField(TEXT("location")))
-    {
-        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
-    }
-    if (Params->HasField(TEXT("rotation")))
-    {
-        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
-    }
-    if (Params->HasField(TEXT("scale")))
-    {
-        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
-    }
-
-    // Create the actor based on type
-    AActor* NewActor = nullptr;
-    UWorld* World = GEditor->GetEditorWorldContext().World();
-
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
-    }
-
-    // Check if an actor with this name already exists
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(World, AActor::StaticClass(), AllActors);
-    for (AActor* Actor : AllActors)
-    {
-        if (Actor && Actor->GetName() == ActorName)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor with name '%s' already exists"), *ActorName));
-        }
-    }
-
-    FActorSpawnParameters SpawnParams;
-    SpawnParams.Name = *ActorName;
-
-    if (ActorType == TEXT("StaticMeshActor"))
-    {
-        NewActor = World->SpawnActor<AStaticMeshActor>(AStaticMeshActor::StaticClass(), Location, Rotation, SpawnParams);
-
-        // Optional: assign a StaticMesh at spawn time (preferred, since nested component property setting is limited).
-        FString StaticMeshPath;
-        if (Params->TryGetStringField(TEXT("static_mesh_path"), StaticMeshPath) ||
-            Params->TryGetStringField(TEXT("static_mesh"), StaticMeshPath))
-        {
-            StaticMeshPath = StaticMeshPath.TrimStartAndEnd();
-            if (!StaticMeshPath.IsEmpty())
-            {
-                UStaticMesh* StaticMesh = LoadObject<UStaticMesh>(nullptr, *StaticMeshPath);
-                if (!StaticMesh && !StaticMeshPath.StartsWith(TEXT("StaticMesh'")))
-                {
-                    StaticMesh = LoadObject<UStaticMesh>(nullptr, *FString::Printf(TEXT("StaticMesh'%s'"), *StaticMeshPath));
-                }
-
-                if (!StaticMesh)
-                {
-                    return FUnrealMCPCommonUtils::CreateErrorResponse(
-                        FString::Printf(TEXT("Static mesh not found: %s"), *StaticMeshPath));
-                }
-
-                AStaticMeshActor* StaticMeshActor = Cast<AStaticMeshActor>(NewActor);
-                if (!StaticMeshActor || !StaticMeshActor->GetStaticMeshComponent())
-                {
-                    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Spawned StaticMeshActor has no StaticMeshComponent."));
-                }
-
-                StaticMeshActor->GetStaticMeshComponent()->SetStaticMesh(StaticMesh);
-                StaticMeshActor->GetStaticMeshComponent()->MarkRenderStateDirty();
-            }
-        }
-    }
-    else if (ActorType == TEXT("PointLight"))
-    {
-        NewActor = World->SpawnActor<APointLight>(APointLight::StaticClass(), Location, Rotation, SpawnParams);
-    }
-    else if (ActorType == TEXT("SpotLight"))
-    {
-        NewActor = World->SpawnActor<ASpotLight>(ASpotLight::StaticClass(), Location, Rotation, SpawnParams);
-    }
-    else if (ActorType == TEXT("DirectionalLight"))
-    {
-        NewActor = World->SpawnActor<ADirectionalLight>(ADirectionalLight::StaticClass(), Location, Rotation, SpawnParams);
-    }
-    else if (ActorType == TEXT("CameraActor"))
-    {
-        NewActor = World->SpawnActor<ACameraActor>(ACameraActor::StaticClass(), Location, Rotation, SpawnParams);
-    }
-    else
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown actor type: %s"), *ActorType));
-    }
-
-    if (NewActor)
-    {
-        // Set scale (since SpawnActor only takes location and rotation)
-        FTransform Transform = NewActor->GetTransform();
-        Transform.SetScale3D(Scale);
-        NewActor->SetActorTransform(Transform);
-
-        // Return the created actor's details
-        return FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, true);
-    }
-
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create actor"));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleCreateLandscape(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    UWorld* World = GEditor ? GEditor->GetEditorWorldContext().World() : nullptr;
-    if (!World)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
-    }
-
-    FString LandscapeName;
-    if (!Params->TryGetStringField(TEXT("name"), LandscapeName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-    LandscapeName = LandscapeName.TrimStartAndEnd();
-    if (LandscapeName.IsEmpty())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Invalid 'name' parameter (empty)"));
-    }
-
-    // Ensure actor name uniqueness.
-    {
-        TArray<AActor*> AllActors;
-        UGameplayStatics::GetAllActorsOfClass(World, AActor::StaticClass(), AllActors);
-        for (AActor* Actor : AllActors)
-        {
-            if (Actor && Actor->GetName() == LandscapeName)
-            {
-                return FUnrealMCPCommonUtils::CreateErrorResponse(
-                    FString::Printf(TEXT("Actor with name '%s' already exists"), *LandscapeName));
-            }
-        }
-    }
-
-    FVector Location(0.0f, 0.0f, 0.0f);
-    FRotator Rotation(0.0f, 0.0f, 0.0f);
-    FVector Scale(100.0f, 100.0f, 100.0f);
-
-    if (Params->HasField(TEXT("location")))
-    {
-        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
-    }
-    if (Params->HasField(TEXT("rotation")))
-    {
-        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
-    }
-    if (Params->HasField(TEXT("scale")))
-    {
-        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
-    }
-
-    int32 ComponentCountX = 8;
-    int32 ComponentCountY = 8;
-    int32 SectionsPerComponent = 1;
-    int32 QuadsPerSection = 63;
-
-    {
-        double Value = 0;
-        if (Params->TryGetNumberField(TEXT("componentCountX"), Value)) ComponentCountX = (int32)Value;
-        if (Params->TryGetNumberField(TEXT("componentCountY"), Value)) ComponentCountY = (int32)Value;
-        if (Params->TryGetNumberField(TEXT("sectionsPerComponent"), Value)) SectionsPerComponent = (int32)Value;
-        if (Params->TryGetNumberField(TEXT("quadsPerSection"), Value)) QuadsPerSection = (int32)Value;
-    }
-
-    if (ComponentCountX <= 0 || ComponentCountY <= 0)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("componentCountX/componentCountY must be positive integers"));
-    }
-    if (SectionsPerComponent <= 0 || SectionsPerComponent > 2)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("sectionsPerComponent must be 1 or 2"));
-    }
-    if (QuadsPerSection <= 0)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("quadsPerSection must be a positive integer"));
-    }
-
-    const int32 QuadsPerComponent = SectionsPerComponent * QuadsPerSection;
-    const int32 SizeX = ComponentCountX * QuadsPerComponent + 1;
-    const int32 SizeY = ComponentCountY * QuadsPerComponent + 1;
-
-    const int64 TotalVerts = (int64)SizeX * (int64)SizeY;
-    if (TotalVerts > 16ll * 1024ll * 1024ll)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Landscape is too large (vertex count limit exceeded)"));
-    }
-
-    // Optional landscape material.
-    UMaterialInterface* LandscapeMaterial = nullptr;
-    {
-        FString MaterialPath;
-        if (Params->TryGetStringField(TEXT("materialPath"), MaterialPath) ||
-            Params->TryGetStringField(TEXT("material"), MaterialPath) ||
-            Params->TryGetStringField(TEXT("landscapeMaterial"), MaterialPath))
-        {
-            MaterialPath = MaterialPath.TrimStartAndEnd();
-            if (!MaterialPath.IsEmpty())
-            {
-                LandscapeMaterial = LoadObject<UMaterialInterface>(nullptr, *MaterialPath);
-                if (!LandscapeMaterial && !MaterialPath.StartsWith(TEXT("Material'")))
-                {
-                    LandscapeMaterial = LoadObject<UMaterialInterface>(nullptr, *FString::Printf(TEXT("Material'%s'"), *MaterialPath));
-                }
-                if (!LandscapeMaterial)
-                {
-                    return FUnrealMCPCommonUtils::CreateErrorResponse(
-                        FString::Printf(TEXT("Landscape material not found: %s"), *MaterialPath));
-                }
-            }
-        }
-    }
-
-    // Center on Location (similar to the editor create landscape UX).
-    const FVector Offset =
-        FTransform(Rotation, FVector::ZeroVector, Scale)
-            .TransformVector(FVector(-ComponentCountX * QuadsPerComponent / 2, -ComponentCountY * QuadsPerComponent / 2, 0));
-
-    FActorSpawnParameters SpawnParams;
-    SpawnParams.Name = *LandscapeName;
-    ALandscape* Landscape = World->SpawnActor<ALandscape>(Location + Offset, Rotation, SpawnParams);
-    if (!Landscape)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn Landscape actor"));
-    }
-
-    Landscape->SetActorRelativeScale3D(Scale);
-    if (LandscapeMaterial)
-    {
-        Landscape->LandscapeMaterial = LandscapeMaterial;
-    }
-
-    Landscape->StaticLightingLOD = FMath::DivideAndRoundUp(FMath::CeilLogTwo((SizeX * SizeY) / (2048 * 2048) + 1), (uint32)2);
-
-    // Flat heightmap.
-    TArray<uint16> HeightData;
-    HeightData.SetNumUninitialized(SizeX * SizeY);
-    for (int32 i = 0; i < HeightData.Num(); i++)
-    {
-        HeightData[i] = 32768;
-    }
-
-    TMap<FGuid, TArray<uint16>> HeightDataPerLayers;
-    HeightDataPerLayers.Add(FGuid(), MoveTemp(HeightData));
-
-    TMap<FGuid, TArray<FLandscapeImportLayerInfo>> MaterialLayerDataPerLayers;
-    MaterialLayerDataPerLayers.Add(FGuid(), TArray<FLandscapeImportLayerInfo>());
-
-    FString ReimportHeightmapFilePath;
-
-    Landscape->Import(
-        FGuid::NewGuid(),
-        0,
-        0,
-        SizeX - 1,
-        SizeY - 1,
-        SectionsPerComponent,
-        QuadsPerSection,
-        HeightDataPerLayers,
-        *ReimportHeightmapFilePath,
-        MaterialLayerDataPerLayers,
-        ELandscapeImportAlphamapType::Additive,
-        TArrayView<const FLandscapeLayer>());
-
-    ULandscapeInfo* LandscapeInfo = Landscape->GetLandscapeInfo();
-    if (!LandscapeInfo)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Landscape import failed (LandscapeInfo missing)"));
-    }
-
-    FActorLabelUtilities::SetActorLabelUnique(Landscape, LandscapeName);
-    LandscapeInfo->UpdateLayerInfoMap(Landscape);
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetObjectField(TEXT("landscape"), FUnrealMCPCommonUtils::ActorToJsonObject(Landscape));
-    ResultObj->SetNumberField(TEXT("componentCountX"), ComponentCountX);
-    ResultObj->SetNumberField(TEXT("componentCountY"), ComponentCountY);
-    ResultObj->SetNumberField(TEXT("sectionsPerComponent"), SectionsPerComponent);
-    ResultObj->SetNumberField(TEXT("quadsPerSection"), QuadsPerSection);
-    ResultObj->SetNumberField(TEXT("sizeX"), SizeX);
-    ResultObj->SetNumberField(TEXT("sizeY"), SizeY);
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleDeleteActor(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    FString ActorName;
-    if (!Params->TryGetStringField(TEXT("name"), ActorName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
-    
-    for (AActor* Actor : AllActors)
-    {
-        if (Actor && Actor->GetName() == ActorName)
-        {
-            // Store actor info before deletion for the response
-            TSharedPtr<FJsonObject> ActorInfo = FUnrealMCPCommonUtils::ActorToJsonObject(Actor);
-            
-            // Delete the actor
-            Actor->Destroy();
-            
-            TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-            ResultObj->SetObjectField(TEXT("deleted_actor"), ActorInfo);
-            return ResultObj;
-        }
-    }
-    
-    return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSetActorTransform(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    // Get actor name
-    FString ActorName;
-    if (!Params->TryGetStringField(TEXT("name"), ActorName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-
-    // Find the actor
-    AActor* TargetActor = nullptr;
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
-    
-    for (AActor* Actor : AllActors)
-    {
-        if (Actor && Actor->GetName() == ActorName)
-        {
-            TargetActor = Actor;
-            break;
-        }
-    }
-
-    if (!TargetActor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
-    }
-
-    // Get transform parameters
-    FTransform NewTransform = TargetActor->GetTransform();
-
-    if (Params->HasField(TEXT("location")))
-    {
-        NewTransform.SetLocation(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location")));
-    }
-    if (Params->HasField(TEXT("rotation")))
-    {
-        NewTransform.SetRotation(FQuat(FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"))));
-    }
-    if (Params->HasField(TEXT("scale")))
-    {
-        NewTransform.SetScale3D(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale")));
-    }
-
-    // Set the new transform
-    TargetActor->SetActorTransform(NewTransform);
-
-    // Return updated actor info
-    return FUnrealMCPCommonUtils::ActorToJsonObject(TargetActor, true);
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorProperties(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get actor name
-    FString ActorName;
-    if (!Params->TryGetStringField(TEXT("name"), ActorName) && !Params->TryGetStringField(TEXT("actor"), ActorName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-
-    // Find the actor
-    AActor* TargetActor = nullptr;
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
-    
-    for (AActor* Actor : AllActors)
-    {
-        if (Actor && Actor->GetName() == ActorName)
-        {
-            TargetActor = Actor;
-            break;
-        }
-    }
-
-    if (!TargetActor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
-    }
-
-    // Always return detailed properties for this command
-    return FUnrealMCPCommonUtils::ActorToJsonObject(TargetActor, true);
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSetActorProperty(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    // Get actor name
-    FString ActorName;
-    if (!Params->TryGetStringField(TEXT("name"), ActorName) && !Params->TryGetStringField(TEXT("actor"), ActorName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
-    }
-
-    // Find the actor
-    AActor* TargetActor = nullptr;
-    TArray<AActor*> AllActors;
-    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
-    
-    for (AActor* Actor : AllActors)
-    {
-        if (Actor && Actor->GetName() == ActorName)
-        {
-            TargetActor = Actor;
-            break;
-        }
-    }
-
-    if (!TargetActor)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
-    }
-
-    // Get property name
-    FString PropertyName;
-    if (!Params->TryGetStringField(TEXT("property_name"), PropertyName) && !Params->TryGetStringField(TEXT("property"), PropertyName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_name' parameter"));
-    }
-
-    // Get property value
-    if (!Params->HasField(TEXT("property_value")) && !Params->HasField(TEXT("value")))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_value' parameter"));
-    }
-    
-    TSharedPtr<FJsonValue> PropertyValue = Params->HasField(TEXT("property_value"))
-        ? Params->Values.FindRef(TEXT("property_value"))
-        : Params->Values.FindRef(TEXT("value"));
-    
-    // Set the property using our utility function
-    FString ErrorMessage;
-    if (FUnrealMCPCommonUtils::SetObjectProperty(TargetActor, PropertyName, PropertyValue, ErrorMessage))
-    {
-        // Property set successfully
-        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-        ResultObj->SetStringField(TEXT("actor"), ActorName);
-        ResultObj->SetStringField(TEXT("property"), PropertyName);
-        ResultObj->SetBoolField(TEXT("success"), true);
-        
-        // Also include the full actor details
-        ResultObj->SetObjectField(TEXT("actor_details"), FUnrealMCPCommonUtils::ActorToJsonObject(TargetActor, true));
-        return ResultObj;
-    }
-    else
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(ErrorMessage);
-    }
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSpawnBlueprintActor(const TSharedPtr<FJsonObject>& Params)
-{
-    {
-        FString Err;
-        if (!IsSafeToModifyEditorWorld(Err))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
-        }
-    }
-
-    // Get required parameters
-    FString BlueprintName;
-    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName) &&
-        !Params->TryGetStringField(TEXT("blueprint"), BlueprintName) &&
-        !Params->TryGetStringField(TEXT("blueprint_path"), BlueprintName) &&
-        !Params->TryGetStringField(TEXT("objectPath"), BlueprintName) &&
-        !Params->TryGetStringField(TEXT("object_path"), BlueprintName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
-    }
-
-    FString ActorName;
-    if (!Params->TryGetStringField(TEXT("actor_name"), ActorName) && !Params->TryGetStringField(TEXT("name"), ActorName))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'actor_name' parameter"));
-    }
-
-    // Find the blueprint
-    if (BlueprintName.IsEmpty())
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Blueprint name is empty"));
-    }
-    BlueprintName = BlueprintName.TrimStartAndEnd();
-    ActorName = ActorName.TrimStartAndEnd();
-
-    const auto SanitizeObjectName = [](const FString& In) -> FString {
-        FString Out;
-        Out.Reserve(In.Len());
-        for (int32 i = 0; i < In.Len(); i++)
-        {
-            const TCHAR Ch = In[i];
-            const bool bOk =
-                (Ch >= '0' && Ch <= '9') ||
-                (Ch >= 'A' && Ch <= 'Z') ||
-                (Ch >= 'a' && Ch <= 'z') ||
-                Ch == '_' || Ch == '-';
-            Out.AppendChar(bOk ? Ch : '_');
-        }
-        Out = Out.TrimStartAndEnd();
-        while (Out.Contains(TEXT("__")))
-        {
-            Out = Out.Replace(TEXT("__"), TEXT("_"));
-        }
-        if (Out.IsEmpty()) Out = TEXT("BPActor");
-        return Out;
-    };
-
-    const FString SafeActorBaseName = SanitizeObjectName(ActorName);
-
-    // Resolve an asset/object path:
-    // - If caller passes /Game/... treat as an object path/package path.
-    // - Otherwise assume /Game/Blueprints/<BlueprintName> (compat default).
-    FString AssetPath = BlueprintName;
-    if (!AssetPath.StartsWith(TEXT("/")))
-    {
-        AssetPath = TEXT("/Game/Blueprints/") + AssetPath;
-    }
-
-    UObject* AssetObj = LoadObject<UObject>(nullptr, *AssetPath);
-    if (!AssetObj && !AssetPath.Contains(TEXT("'")))
-    {
-        AssetObj = LoadObject<UObject>(nullptr, *FString::Printf(TEXT("Blueprint'%s'"), *AssetPath));
-    }
-
-    if (!AssetObj)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Failed to load blueprint asset: %s"), *AssetPath));
-    }
-
-    // Get transform parameters
-    FVector Location(0.0f, 0.0f, 0.0f);
-    FRotator Rotation(0.0f, 0.0f, 0.0f);
-    FVector Scale(1.0f, 1.0f, 1.0f);
-
-    if (Params->HasField(TEXT("location")))
-    {
-        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
-    }
-    if (Params->HasField(TEXT("rotation")))
-    {
-        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
-    }
-    if (Params->HasField(TEXT("scale")))
-    {
-        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
-    }
-
-    // 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));
-    SpawnTransform.SetScale3D(Scale);
-
-    FActorSpawnParameters SpawnParams;
-    SpawnParams.Name = MakeUniqueObjectName(World, AActor::StaticClass(), FName(*SafeActorBaseName));
-
-    UClass* ActorClass = nullptr;
-    if (UBlueprint* Blueprint = Cast<UBlueprint>(AssetObj))
-    {
-        ActorClass = Blueprint->GeneratedClass;
-    }
-    else if (UBlueprintGeneratedClass* BPGC = Cast<UBlueprintGeneratedClass>(AssetObj))
-    {
-        ActorClass = BPGC;
-    }
-    else if (UClass* Class = Cast<UClass>(AssetObj))
-    {
-        ActorClass = Class;
-    }
-
-    if (!ActorClass || !ActorClass->IsChildOf(AActor::StaticClass()))
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Loaded asset is not a spawnable Actor Blueprint/Class. Compile the Blueprint and retry."));
-    }
-
-    AActor* NewActor = World->SpawnActor<AActor>(ActorClass, SpawnTransform, SpawnParams);
-    if (NewActor)
-    {
-        bool bDetailed = true;
-        if (Params->HasField(TEXT("include_details")))
-        {
-            bDetailed = Params->GetBoolField(TEXT("include_details"));
-        }
-        else if (Params->HasField(TEXT("detailed")))
-        {
-            bDetailed = Params->GetBoolField(TEXT("detailed"));
-        }
-        else if (Params->HasField(TEXT("includeProperties")))
-        {
-            bDetailed = Params->GetBoolField(TEXT("includeProperties"));
-        }
-
-        return FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, bDetailed);
-    }
-
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn blueprint actor"));
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleFocusViewport(const TSharedPtr<FJsonObject>& Params)
-{
-    // Get target actor name if provided
-    FString TargetActorName;
-    bool HasTargetActor = Params->TryGetStringField(TEXT("target"), TargetActorName);
-
-    // Get location if provided
-    FVector Location(0.0f, 0.0f, 0.0f);
-    bool HasLocation = false;
-    if (Params->HasField(TEXT("location")))
-    {
-        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
-        HasLocation = true;
-    }
-
-    // Get distance
-    float Distance = 1000.0f;
-    if (Params->HasField(TEXT("distance")))
-    {
-        Distance = Params->GetNumberField(TEXT("distance"));
-    }
-
-    // Get orientation if provided
-    FRotator Orientation(0.0f, 0.0f, 0.0f);
-    bool HasOrientation = false;
-    if (Params->HasField(TEXT("orientation")))
-    {
-        Orientation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("orientation"));
-        HasOrientation = true;
-    }
-
-    // Get the active viewport
-    FLevelEditorViewportClient* ViewportClient = (FLevelEditorViewportClient*)GEditor->GetActiveViewport()->GetClient();
-    if (!ViewportClient)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get active viewport"));
-    }
-
-    // If we have a target actor, focus on it
-    if (HasTargetActor)
-    {
-        // Find the actor
-        AActor* TargetActor = nullptr;
-        TArray<AActor*> AllActors;
-        UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
-        
-        for (AActor* Actor : AllActors)
-        {
-            if (Actor && Actor->GetName() == TargetActorName)
-            {
-                TargetActor = Actor;
-                break;
-            }
-        }
-
-        if (!TargetActor)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *TargetActorName));
-        }
-
-        // Focus on the actor
-        ViewportClient->SetViewLocation(TargetActor->GetActorLocation() - FVector(Distance, 0.0f, 0.0f));
-    }
-    // Otherwise use the provided location
-    else if (HasLocation)
-    {
-        ViewportClient->SetViewLocation(Location - FVector(Distance, 0.0f, 0.0f));
-    }
-    else
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Either 'target' or 'location' must be provided"));
-    }
-
-    // Set orientation if provided
-    if (HasOrientation)
-    {
-        ViewportClient->SetViewRotation(Orientation);
-    }
-
-    // Force viewport to redraw
-    ViewportClient->Invalidate();
-
-    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-    ResultObj->SetBoolField(TEXT("success"), true);
-    return ResultObj;
-}
-
-TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleTakeScreenshot(const TSharedPtr<FJsonObject>& Params)
-{
-    // Optional file path parameter.
-    // If omitted, save to <Project>/Saved/Screenshots/Flockbay with an auto-generated filename.
-    FString FilePath;
-    const bool bHasFilePath = Params->TryGetStringField(TEXT("filepath"), FilePath);
-
-    FString FileName;
-    Params->TryGetStringField(TEXT("filename"), FileName);
-    
-    const FString DefaultDir = FPaths::Combine(FPaths::ProjectSavedDir(), TEXT("Screenshots"), TEXT("Flockbay"));
-    IFileManager::Get().MakeDirectory(*DefaultDir, /*Tree*/ true);
-
-    if (bHasFilePath)
-    {
-        FilePath = FilePath.TrimStartAndEnd();
-        if (FilePath.IsEmpty())
-        {
-            FilePath.Reset();
-        }
-        else if (!FPaths::IsRelative(FilePath))
-        {
-            // absolute path: use as-is
-        }
-        else
-        {
-            // relative path: resolve under our default screenshots folder
-            FilePath = FPaths::Combine(DefaultDir, FilePath);
-        }
-    }
-
-    if (FilePath.IsEmpty())
-    {
-        if (FileName.IsEmpty())
-        {
-            FileName = FString::Printf(TEXT("mcp_screenshot_%s"), *FDateTime::Now().ToString(TEXT("%Y%m%d_%H%M%S")));
-        }
-        FilePath = FPaths::Combine(DefaultDir, FileName);
-    }
-
-    // Ensure the file path has a proper extension
-    if (!FilePath.EndsWith(TEXT(".png")))
-    {
-        FilePath += TEXT(".png");
-    }
-
-    FString Source = TEXT("auto");
-    if (Params->TryGetStringField(TEXT("source"), Source))
-    {
-        Source = Source.TrimStartAndEnd().ToLower();
-        if (Source.IsEmpty())
-        {
-            Source = TEXT("auto");
-        }
-    }
-
-    double WidthNum = 0.0;
-    double HeightNum = 0.0;
-    int32 RequestedWidth = 0;
-    int32 RequestedHeight = 0;
-    if (Params->TryGetNumberField(TEXT("width"), WidthNum))
-    {
-        RequestedWidth = static_cast<int32>(WidthNum);
-    }
-    else if (Params->TryGetNumberField(TEXT("resX"), WidthNum))
-    {
-        RequestedWidth = static_cast<int32>(WidthNum);
-    }
-
-    if (Params->TryGetNumberField(TEXT("height"), HeightNum))
-    {
-        RequestedHeight = static_cast<int32>(HeightNum);
-    }
-    else if (Params->TryGetNumberField(TEXT("resY"), HeightNum))
-    {
-        RequestedHeight = static_cast<int32>(HeightNum);
-    }
-
-    const bool bPieRunning = (GEditor && GEditor->PlayWorld);
-    const bool bWantsPie = (Source == TEXT("pie"));
-    const bool bWantsEditor = (Source == TEXT("editor"));
-    const bool bAuto = (Source == TEXT("auto"));
-    if (!bWantsPie && !bWantsEditor && !bAuto)
-    {
-        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Invalid screenshot source: %s (expected: auto|pie|editor)"), *Source));
-    }
-
-    const bool bUsePieCapture = bWantsPie || (bAuto && bPieRunning);
-    if (bUsePieCapture)
-    {
-        if (!bPieRunning)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is not running (PlayWorld is null)."));
-        }
-
-        UWorld* PlayWorld = GEditor->PlayWorld;
-        APlayerController* PC = PlayWorld ? PlayWorld->GetFirstPlayerController() : nullptr;
-        if (!PC)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to find PlayerController in PlayWorld."));
-        }
-
-        APlayerCameraManager* PCM = PC->PlayerCameraManager;
-        if (!PCM)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to find PlayerCameraManager (PlayerController.PlayerCameraManager is null)."));
-        }
-
-        int32 Width = RequestedWidth;
-        int32 Height = RequestedHeight;
-        if (Width <= 0 || Height <= 0)
-        {
-            if (ULocalPlayer* LocalPlayer = PC->GetLocalPlayer())
-            {
-                if (LocalPlayer->ViewportClient && LocalPlayer->ViewportClient->Viewport)
-                {
-                    const FIntPoint ViewSize = LocalPlayer->ViewportClient->Viewport->GetSizeXY();
-                    if (ViewSize.X > 0 && ViewSize.Y > 0)
-                    {
-                        if (Width <= 0)
-                        {
-                            Width = ViewSize.X;
-                        }
-                        if (Height <= 0)
-                        {
-                            Height = ViewSize.Y;
-                        }
-                    }
-                }
-            }
-        }
-
-        if (Width <= 0 || Height <= 0)
-        {
-            Width = 1280;
-            Height = 720;
-        }
-
-        const FVector CamLocation = PCM->GetCameraLocation();
-        const FRotator CamRotation = PCM->GetCameraRotation();
-
-        FActorSpawnParameters SpawnParams;
-        SpawnParams.ObjectFlags |= RF_Transient;
-        SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
-
-        ASceneCapture2D* CaptureActor = PlayWorld->SpawnActor<ASceneCapture2D>(ASceneCapture2D::StaticClass(), CamLocation, CamRotation, SpawnParams);
-        if (!CaptureActor)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn ASceneCapture2D for PIE screenshot capture."));
-        }
-
-        USceneCaptureComponent2D* CaptureComp = CaptureActor->GetCaptureComponent2D();
-        if (!CaptureComp)
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get SceneCaptureComponent2D from ASceneCapture2D."));
-        }
-
-        UTextureRenderTarget2D* RenderTarget = NewObject<UTextureRenderTarget2D>(CaptureComp);
-        if (!RenderTarget)
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create UTextureRenderTarget2D."));
-        }
-        RenderTarget->InitCustomFormat(Width, Height, PF_B8G8R8A8, /*bForceLinearGamma*/ false);
-        RenderTarget->ClearColor = FLinearColor::Black;
-        RenderTarget->UpdateResourceImmediate(true);
-
-        CaptureComp->TextureTarget = RenderTarget;
-        CaptureComp->bCaptureEveryFrame = false;
-        CaptureComp->bCaptureOnMovement = false;
-        CaptureComp->CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
-        CaptureComp->FOVAngle = PCM->GetFOVAngle();
-
-        CaptureComp->CaptureScene();
-
-        FTextureRenderTargetResource* RenderResource = RenderTarget->GameThread_GetRenderTargetResource();
-        if (!RenderResource)
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get render target resource for PIE screenshot capture."));
-        }
-
-        TArray<FColor> Bitmap;
-        if (!RenderResource->ReadPixels(Bitmap))
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to read pixels from PIE render target."));
-        }
-
-        CaptureActor->Destroy();
-
-        if (!SavePngToFile(FilePath, Width, Height, Bitmap))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to save screenshot PNG to disk."));
-        }
-
-        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-        ResultObj->SetStringField(TEXT("filepath"), FilePath);
-        ResultObj->SetStringField(TEXT("source"), TEXT("pie"));
-        ResultObj->SetNumberField(TEXT("width"), Width);
-        ResultObj->SetNumberField(TEXT("height"), Height);
-        return ResultObj;
-    }
-
-    // Editor screenshot (prefer offscreen SceneCapture2D; ReadPixels on the active viewport can be blank/stale when the OS window isn't focused).
-    if (GEditor && GEditor->GetActiveViewport())
-    {
-        GEditor->RedrawAllViewports(/*bInvalidateHitProxies*/ true);
-
-        FViewport* Viewport = GEditor->GetActiveViewport();
-        FEditorViewportClient* ViewportClient = (FEditorViewportClient*)Viewport->GetClient();
-        if (!ViewportClient)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get active editor viewport client for editor screenshot capture."));
-        }
-
-        UWorld* EditorWorld = ViewportClient->GetWorld();
-        if (!EditorWorld)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world for editor screenshot capture."));
-        }
-
-        int32 Width = RequestedWidth;
-        int32 Height = RequestedHeight;
-        if (Width <= 0 || Height <= 0)
-        {
-            const FIntPoint ViewSize = Viewport->GetSizeXY();
-            if (ViewSize.X > 0 && ViewSize.Y > 0)
-            {
-                if (Width <= 0)
-                {
-                    Width = ViewSize.X;
-                }
-                if (Height <= 0)
-                {
-                    Height = ViewSize.Y;
-                }
-            }
-        }
-        if (Width <= 0 || Height <= 0)
-        {
-            Width = 1280;
-            Height = 720;
-        }
-
-        const FVector CamLocation = ViewportClient->GetViewLocation();
-        const FRotator CamRotation = ViewportClient->GetViewRotation();
-
-        FActorSpawnParameters SpawnParams;
-        SpawnParams.ObjectFlags |= RF_Transient;
-        SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
-
-        ASceneCapture2D* CaptureActor =
-            EditorWorld->SpawnActor<ASceneCapture2D>(ASceneCapture2D::StaticClass(), CamLocation, CamRotation, SpawnParams);
-        if (!CaptureActor)
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn ASceneCapture2D for editor screenshot capture."));
-        }
-
-        USceneCaptureComponent2D* CaptureComp = CaptureActor->GetCaptureComponent2D();
-        if (!CaptureComp)
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get SceneCaptureComponent2D from ASceneCapture2D (editor capture)."));
-        }
-
-        UTextureRenderTarget2D* RenderTarget = NewObject<UTextureRenderTarget2D>(CaptureComp);
-        if (!RenderTarget)
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create UTextureRenderTarget2D (editor capture)."));
-        }
-        RenderTarget->InitCustomFormat(Width, Height, PF_B8G8R8A8, /*bForceLinearGamma*/ false);
-        RenderTarget->ClearColor = FLinearColor::Black;
-        RenderTarget->UpdateResourceImmediate(true);
-
-        CaptureComp->TextureTarget = RenderTarget;
-        CaptureComp->bCaptureEveryFrame = false;
-        CaptureComp->bCaptureOnMovement = false;
-        CaptureComp->CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
-        CaptureComp->FOVAngle = ViewportClient->ViewFOV;
-
-        CaptureComp->CaptureScene();
-
-        FTextureRenderTargetResource* RenderResource = RenderTarget->GameThread_GetRenderTargetResource();
-        if (!RenderResource)
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get render target resource for editor screenshot capture."));
-        }
-
-        TArray<FColor> Bitmap;
-        if (!RenderResource->ReadPixels(Bitmap))
-        {
-            CaptureActor->Destroy();
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to read pixels from editor render target."));
-        }
-
-        CaptureActor->Destroy();
-
-        if (!SavePngToFile(FilePath, Width, Height, Bitmap))
-        {
-            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to save editor screenshot PNG to disk."));
-        }
-
-        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
-        ResultObj->SetStringField(TEXT("filepath"), FilePath);
-        ResultObj->SetStringField(TEXT("source"), TEXT("editor"));
-        ResultObj->SetNumberField(TEXT("width"), Width);
-        ResultObj->SetNumberField(TEXT("height"), Height);
-        return ResultObj;
-    }
-
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to take screenshot."));
-} 
+#include "Commands/UnrealMCPEditorCommands.h"
+#include "Commands/UnrealMCPCommonUtils.h"
+#include "Editor.h"
+#include "Editor/EditorEngine.h"
+#include "EditorViewportClient.h"
+#include "LevelEditorViewport.h"
+#include "IAssetViewport.h"
+#include "ImageUtils.h"
+#include "HighResScreenshot.h"
+#include "Engine/GameViewportClient.h"
+#include "Misc/FileHelper.h"
+#include "Misc/Paths.h"
+#include "HAL/FileManager.h"
+#include "GameFramework/Actor.h"
+#include "Engine/Selection.h"
+#include "Kismet/GameplayStatics.h"
+#include "Engine/StaticMeshActor.h"
+#include "Engine/StaticMesh.h"
+#include "Engine/Texture2D.h"
+#include "Engine/SkeletalMesh.h"
+#include "Engine/DirectionalLight.h"
+#include "Engine/PointLight.h"
+#include "Engine/SpotLight.h"
+#include "Camera/CameraActor.h"
+#include "Landscape.h"
+#include "LandscapeImportHelper.h"
+#include "Components/StaticMeshComponent.h"
+#include "Materials/MaterialInterface.h"
+#include "Sound/SoundWave.h"
+#include "IImageWrapper.h"
+#include "IImageWrapperModule.h"
+#include "EditorSubsystem.h"
+#include "Subsystems/EditorActorSubsystem.h"
+#include "Engine/Blueprint.h"
+#include "Engine/BlueprintGeneratedClass.h"
+#include "UnrealEdGlobals.h"
+#include "Editor/UnrealEdEngine.h"
+#include "UObject/UnrealType.h"
+#include "Modules/ModuleManager.h"
+#include "LevelEditor.h"
+#include "PlayInEditorDataTypes.h"
+#include "Settings/LevelEditorPlaySettings.h"
+#include "Framework/Application/SlateApplication.h"
+#include "AssetRegistry/AssetRegistryModule.h"
+#include "UObject/SoftObjectPath.h"
+#include "UObject/Package.h"
+#include "UObject/UObjectGlobals.h"
+#include "FileHelpers.h"
+#include "MessageLogModule.h"
+#include "IMessageLogListing.h"
+#include "Engine/World.h"
+#include "Engine/EngineTypes.h"
+#include "GameFramework/PlayerController.h"
+#include "Camera/PlayerCameraManager.h"
+#include "Engine/LocalPlayer.h"
+#include "Engine/SceneCapture2D.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Engine/TextureRenderTarget2D.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);
+}
+
+static bool SavePngToFile(const FString& FilePath, int32 Width, int32 Height, TArray<FColor>& Bitmap)
+{
+	IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>(FName("ImageWrapper"));
+	TSharedPtr<IImageWrapper> Wrapper = ImageWrapperModule.CreateImageWrapper(EImageFormat::PNG);
+	if (!Wrapper.IsValid())
+	{
+		return false;
+	}
+
+	// Normalize alpha: editor backbuffer alpha can be 0/undefined, which can make PNGs look dark/grey in viewers.
+	for (FColor& Pixel : Bitmap)
+	{
+		Pixel.A = 255;
+	}
+
+	if (!Wrapper->SetRaw(Bitmap.GetData(), Bitmap.Num() * sizeof(FColor), Width, Height, ERGBFormat::BGRA, 8))
+	{
+		return false;
+	}
+
+	const TArray64<uint8>& Compressed = Wrapper->GetCompressed(100);
+	if (Compressed.Num() <= 0 || Compressed.Num() > MAX_int32)
+	{
+		return false;
+	}
+
+	TArray<uint8> Out;
+	Out.Append(Compressed.GetData(), static_cast<int32>(Compressed.Num()));
+	return FFileHelper::SaveArrayToFile(Out, *FilePath);
+}
+
+FUnrealMCPEditorCommands::FUnrealMCPEditorCommands()
+{
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleCommand(const FString& CommandType, const TSharedPtr<FJsonObject>& Params)
+{
+    // Actor manipulation commands
+    if (CommandType == TEXT("get_actors_in_level"))
+    {
+        return HandleGetActorsInLevel(Params);
+    }
+    else if (CommandType == TEXT("find_actors_by_name"))
+    {
+        return HandleFindActorsByName(Params);
+    }
+    else if (CommandType == TEXT("spawn_actor") || CommandType == TEXT("create_actor"))
+    {
+        if (CommandType == TEXT("create_actor"))
+        {
+            UE_LOG(LogTemp, Warning, TEXT("'create_actor' command is deprecated and will be removed in a future version. Please use 'spawn_actor' instead."));
+        }
+        return HandleSpawnActor(Params);
+    }
+    else if (CommandType == TEXT("create_landscape"))
+    {
+        return HandleCreateLandscape(Params);
+    }
+    else if (CommandType == TEXT("delete_actor"))
+    {
+        return HandleDeleteActor(Params);
+    }
+    else if (CommandType == TEXT("set_actor_transform"))
+    {
+        return HandleSetActorTransform(Params);
+    }
+    else if (CommandType == TEXT("get_actor_properties"))
+    {
+        return HandleGetActorProperties(Params);
+    }
+    else if (CommandType == TEXT("set_actor_property"))
+    {
+        return HandleSetActorProperty(Params);
+    }
+    // Blueprint actor spawning
+    else if (CommandType == TEXT("spawn_blueprint_actor"))
+    {
+        return HandleSpawnBlueprintActor(Params);
+    }
+    // Editor viewport commands
+    else if (CommandType == TEXT("focus_viewport"))
+    {
+        return HandleFocusViewport(Params);
+    }
+    else if (CommandType == TEXT("take_screenshot"))
+    {
+        return HandleTakeScreenshot(Params);
+    }
+    else if (CommandType == TEXT("save_all"))
+    {
+        return HandleSaveAll(Params);
+    }
+    else if (CommandType == TEXT("get_play_in_editor_status"))
+    {
+        return HandleGetPlayInEditorStatus(Params);
+    }
+    else if (CommandType == TEXT("play_in_editor"))
+    {
+        return HandlePlayInEditor(Params);
+    }
+    else if (CommandType == TEXT("play_in_editor_windowed"))
+    {
+        return HandlePlayInEditorWindowed(Params);
+    }
+    else if (CommandType == TEXT("stop_play_in_editor"))
+    {
+        return HandleStopPlayInEditor(Params);
+    }
+    else if (CommandType == TEXT("search_assets"))
+    {
+        return HandleSearchAssets(Params);
+    }
+    else if (CommandType == TEXT("get_asset_info"))
+    {
+        return HandleGetAssetInfo(Params);
+    }
+    else if (CommandType == TEXT("list_asset_packs"))
+    {
+        return HandleListAssetPacks(Params);
+    }
+    else if (CommandType == TEXT("place_asset"))
+    {
+        return HandlePlaceAsset(Params);
+    }
+    else if (CommandType == TEXT("map_check"))
+    {
+        return HandleMapCheck(Params);
+    }
+    else if (CommandType == TEXT("get_editor_context"))
+    {
+        return HandleGetEditorContext(Params);
+    }
+    else if (CommandType == TEXT("get_player_context"))
+    {
+        return HandleGetPlayerContext(Params);
+    }
+    else if (CommandType == TEXT("raycast_from_camera"))
+    {
+        return HandleRaycastFromCamera(Params);
+    }
+    else if (CommandType == TEXT("raycast_down"))
+    {
+        return HandleRaycastDown(Params);
+    }
+    else if (CommandType == TEXT("get_actor_transform"))
+    {
+        return HandleGetActorTransform(Params);
+    }
+    else if (CommandType == TEXT("get_actor_bounds"))
+    {
+        return HandleGetActorBounds(Params);
+    }
+    
+    return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown editor command: %s"), *CommandType));
+}
+
+static TSharedPtr<FJsonObject> CreatePlayStatusResponse()
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetBoolField(TEXT("isPlaySessionInProgress"), GEditor->IsPlaySessionInProgress());
+    ResultObj->SetBoolField(TEXT("isPlaySessionRequestQueued"), GEditor->IsPlaySessionRequestQueued());
+    ResultObj->SetBoolField(TEXT("isPlayingSessionInEditor"), GEditor->IsPlayingSessionInEditor());
+    return ResultObj;
+}
+
+static bool IsSafeToModifyEditorWorld(FString& OutError)
+{
+    if (!GEditor)
+    {
+        OutError = TEXT("Editor is not available (GEditor is null).");
+        return false;
+    }
+
+    if (GEditor->IsPlaySessionInProgress())
+    {
+        OutError = TEXT("Play-In-Editor is running or queued. Stop PIE before modifying the editor world (use stop_play_in_editor).");
+        return false;
+    }
+
+    return true;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSaveAll(const TSharedPtr<FJsonObject>& Params)
+{
+    FString Err;
+    if (!IsSafeToModifyEditorWorld(Err))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+    }
+
+    TArray<UPackage*> DirtyBefore;
+    FEditorFileUtils::GetDirtyPackages(DirtyBefore);
+
+    TSet<FString> DirtyBeforeNames;
+    for (UPackage* Pkg : DirtyBefore)
+    {
+        if (!Pkg) continue;
+        DirtyBeforeNames.Add(Pkg->GetName());
+    }
+
+    const int32 DirtyBeforeCount = DirtyBeforeNames.Num();
+
+    // Save without prompting; fail-hard if anything remains dirty.
+    const bool bSaveOk = FEditorFileUtils::SaveDirtyPackages(
+        /*bPromptUserToSave=*/false,
+        /*bSaveMapPackages=*/true,
+        /*bSaveContentPackages=*/true,
+        /*bFastSave=*/false
+    );
+
+    TArray<UPackage*> DirtyAfter;
+    FEditorFileUtils::GetDirtyPackages(DirtyAfter);
+
+    TSet<FString> DirtyAfterNames;
+    for (UPackage* Pkg : DirtyAfter)
+    {
+        if (!Pkg) continue;
+        DirtyAfterNames.Add(Pkg->GetName());
+    }
+
+    TArray<TSharedPtr<FJsonValue>> Attempted;
+    for (const FString& Name : DirtyBeforeNames)
+    {
+        Attempted.Add(MakeShareable(new FJsonValueString(Name)));
+    }
+
+    TArray<TSharedPtr<FJsonValue>> StillDirty;
+    for (const FString& Name : DirtyAfterNames)
+    {
+        StillDirty.Add(MakeShareable(new FJsonValueString(Name)));
+    }
+
+    TArray<TSharedPtr<FJsonValue>> Saved;
+    for (const FString& Name : DirtyBeforeNames)
+    {
+        if (!DirtyAfterNames.Contains(Name))
+        {
+            Saved.Add(MakeShareable(new FJsonValueString(Name)));
+        }
+    }
+
+    if (DirtyBeforeCount == 0)
+    {
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetBoolField(TEXT("success"), true);
+        ResultObj->SetNumberField(TEXT("dirtyBefore"), DirtyBeforeCount);
+        ResultObj->SetNumberField(TEXT("dirtyAfter"), DirtyAfterNames.Num());
+        ResultObj->SetArrayField(TEXT("attemptedPackages"), Attempted);
+        ResultObj->SetArrayField(TEXT("savedPackages"), Saved);
+        ResultObj->SetArrayField(TEXT("stillDirtyPackages"), StillDirty);
+        ResultObj->SetStringField(TEXT("message"), TEXT("No unsaved changes were detected."));
+        return ResultObj;
+    }
+
+    if (DirtyAfterNames.Num() > 0)
+    {
+        TSharedPtr<FJsonObject> Details = MakeShared<FJsonObject>();
+        Details->SetBoolField(TEXT("saveOk"), bSaveOk);
+        Details->SetNumberField(TEXT("dirtyBefore"), DirtyBeforeCount);
+        Details->SetNumberField(TEXT("dirtyAfter"), DirtyAfterNames.Num());
+        Details->SetArrayField(TEXT("attemptedPackages"), Attempted);
+        Details->SetArrayField(TEXT("savedPackages"), Saved);
+        Details->SetArrayField(TEXT("stillDirtyPackages"), StillDirty);
+
+        TSharedPtr<FJsonObject> ErrObj = FUnrealMCPCommonUtils::CreateErrorResponse(
+            TEXT("Some packages are still dirty after save_all. They may require manual Save As, source control checkout, or have save errors. Resolve in-editor and retry save_all."));
+        ErrObj->SetObjectField(TEXT("details"), Details);
+        return ErrObj;
+    }
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetBoolField(TEXT("success"), true);
+    ResultObj->SetNumberField(TEXT("dirtyBefore"), DirtyBeforeCount);
+    ResultObj->SetNumberField(TEXT("dirtyAfter"), DirtyAfterNames.Num());
+    ResultObj->SetArrayField(TEXT("attemptedPackages"), Attempted);
+    ResultObj->SetArrayField(TEXT("savedPackages"), Saved);
+    ResultObj->SetArrayField(TEXT("stillDirtyPackages"), StillDirty);
+    ResultObj->SetStringField(TEXT("message"), TEXT("Saved all dirty packages."));
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetPlayInEditorStatus(const TSharedPtr<FJsonObject>& Params)
+{
+    return CreatePlayStatusResponse();
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandlePlayInEditor(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    if (GEditor->IsPlaySessionInProgress())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Play session already running or queued."));
+    }
+
+    // Use the active editor viewport, matching how the LevelEditor subsystem triggers PIE.
+    FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
+    if (!LevelEditorModule)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("LevelEditor module not available."));
+    }
+
+    TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
+    if (!ActiveViewport.IsValid())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No active level viewport. Click the viewport and retry."));
+    }
+
+    FRequestPlaySessionParams SessionParams;
+    SessionParams.WorldType = EPlaySessionWorldType::PlayInEditor;
+    SessionParams.DestinationSlateViewport = ActiveViewport;
+
+    GEditor->RequestPlaySession(SessionParams);
+    const bool bQueued = GEditor->IsPlaySessionRequestQueued();
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetBoolField(TEXT("requested"), true);
+    ResultObj->SetBoolField(TEXT("queued"), bQueued);
+    ResultObj->SetBoolField(TEXT("started"), bQueued);
+    ResultObj->SetStringField(TEXT("mode"), TEXT("pie"));
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandlePlayInEditorWindowed(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    if (GEditor->IsPlaySessionInProgress())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Play session already running or queued."));
+    }
+
+    // Match the editor's built-in "New Editor Window (PIE)" behavior by setting the play mode type and
+    // not specifying a DestinationSlateViewport.
+    ULevelEditorPlaySettings* PlaySettings = GetMutableDefault<ULevelEditorPlaySettings>();
+    if (PlaySettings)
+    {
+        PlaySettings->LastExecutedPlayModeType = EPlayModeType::PlayMode_InEditorFloating;
+
+        if (FProperty* Prop = ULevelEditorPlaySettings::StaticClass()->FindPropertyByName(
+                GET_MEMBER_NAME_CHECKED(ULevelEditorPlaySettings, LastExecutedPlayModeType)))
+        {
+            FPropertyChangedEvent PropChangeEvent(Prop);
+            PlaySettings->PostEditChangeProperty(PropChangeEvent);
+        }
+
+        PlaySettings->SaveConfig();
+    }
+
+    const bool bAtPlayerStart =
+        PlaySettings && PlaySettings->LastExecutedPlayModeLocation == EPlayModeLocations::PlayLocation_DefaultPlayerStart;
+
+    FRequestPlaySessionParams SessionParams;
+    SessionParams.WorldType = EPlaySessionWorldType::PlayInEditor;
+
+    // If the user is playing from current camera location, use the active viewport camera as the start transform.
+    if (!bAtPlayerStart)
+    {
+        FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
+        if (LevelEditorModule)
+        {
+            TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
+            if (ActiveViewport.IsValid() && FSlateApplication::IsInitialized() &&
+                FSlateApplication::Get().FindWidgetWindow(ActiveViewport->AsWidget()).IsValid())
+            {
+                SessionParams.StartLocation = ActiveViewport->GetAssetViewportClient().GetViewLocation();
+                SessionParams.StartRotation = ActiveViewport->GetAssetViewportClient().GetViewRotation();
+            }
+        }
+    }
+
+    GEditor->RequestPlaySession(SessionParams);
+    const bool bQueued = GEditor->IsPlaySessionRequestQueued();
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetBoolField(TEXT("requested"), true);
+    ResultObj->SetBoolField(TEXT("queued"), bQueued);
+    ResultObj->SetBoolField(TEXT("started"), bQueued);
+    ResultObj->SetStringField(TEXT("mode"), TEXT("pie_new_window"));
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleStopPlayInEditor(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    if (GEditor->IsPlaySessionRequestQueued() && !GEditor->IsPlayingSessionInEditor())
+    {
+        GEditor->CancelRequestPlaySession();
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetBoolField(TEXT("stopped"), true);
+        ResultObj->SetBoolField(TEXT("canceled"), true);
+        return ResultObj;
+    }
+
+    if (!GEditor->IsPlayingSessionInEditor())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No play session is running."));
+    }
+
+    GEditor->RequestEndPlayMap();
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetBoolField(TEXT("stopped"), true);
+    return ResultObj;
+}
+
+static FString NormalizeContentRoot(const FString& Root)
+{
+    FString Out = Root.TrimStartAndEnd();
+    if (Out.IsEmpty())
+    {
+        return TEXT("/Game/");
+    }
+    if (!Out.StartsWith(TEXT("/")))
+    {
+        Out = TEXT("/") + Out;
+    }
+    if (!Out.EndsWith(TEXT("/")))
+    {
+        Out += TEXT("/");
+    }
+    return Out;
+}
+
+static bool TryResolveAssetClassFilter(const TSharedPtr<FJsonObject>& Params, FARFilter& Filter, FString& OutError)
+{
+    if (!Params.IsValid() || !Params->HasField(TEXT("class")))
+    {
+        return true;
+    }
+
+    TArray<FString> ClassNames;
+
+    FString Single;
+    if (Params->TryGetStringField(TEXT("class"), Single))
+    {
+        Single = Single.TrimStartAndEnd();
+        if (!Single.IsEmpty())
+        {
+            ClassNames.Add(Single);
+        }
+    }
+    else
+    {
+        const TArray<TSharedPtr<FJsonValue>>* Arr = nullptr;
+        if (Params->TryGetArrayField(TEXT("class"), Arr) && Arr)
+        {
+            for (const TSharedPtr<FJsonValue>& V : *Arr)
+            {
+                if (!V.IsValid() || V->Type != EJson::String) continue;
+                FString S = V->AsString().TrimStartAndEnd();
+                if (!S.IsEmpty()) ClassNames.Add(S);
+            }
+        }
+    }
+
+    for (const FString& ClassNameRaw : ClassNames)
+    {
+        const FString ClassName = ClassNameRaw.TrimStartAndEnd();
+        if (ClassName.IsEmpty()) continue;
+
+        UClass* Class = nullptr;
+
+        if (ClassName.Equals(TEXT("StaticMesh"), ESearchCase::IgnoreCase) || ClassName.Equals(TEXT("UStaticMesh"), ESearchCase::IgnoreCase))
+        {
+            Class = UStaticMesh::StaticClass();
+        }
+        else if (ClassName.Equals(TEXT("Material"), ESearchCase::IgnoreCase) || ClassName.Equals(TEXT("MaterialInterface"), ESearchCase::IgnoreCase))
+        {
+            Class = UMaterialInterface::StaticClass();
+        }
+        else if (ClassName.Equals(TEXT("Texture2D"), ESearchCase::IgnoreCase))
+        {
+            Class = UTexture2D::StaticClass();
+        }
+        else if (ClassName.Equals(TEXT("Blueprint"), ESearchCase::IgnoreCase) || ClassName.Equals(TEXT("UBlueprint"), ESearchCase::IgnoreCase))
+        {
+            Class = UBlueprint::StaticClass();
+        }
+        else if (ClassName.Equals(TEXT("SkeletalMesh"), ESearchCase::IgnoreCase))
+        {
+            Class = USkeletalMesh::StaticClass();
+        }
+        else if (ClassName.Equals(TEXT("SoundWave"), ESearchCase::IgnoreCase))
+        {
+            Class = USoundWave::StaticClass();
+        }
+        else
+        {
+            Class = FindMcpClassByName(ClassName);
+            if (!Class && !ClassName.StartsWith(TEXT("U")))
+            {
+                Class = FindMcpClassByName(TEXT("U") + ClassName);
+            }
+        }
+
+        if (!Class)
+        {
+            OutError = FString::Printf(TEXT("Unknown asset class filter: %s"), *ClassNameRaw);
+            return false;
+        }
+
+        Filter.ClassPaths.Add(Class->GetClassPathName());
+    }
+
+    return true;
+}
+
+static int32 ScoreAssetMatch(const FString& Query, const FAssetData& Asset)
+{
+    if (Query.IsEmpty()) return 0;
+
+    const FString Name = Asset.AssetName.ToString();
+    const FString Path = Asset.GetObjectPathString();
+
+    if (Name.Equals(Query, ESearchCase::IgnoreCase)) return 0;
+    if (Name.StartsWith(Query, ESearchCase::IgnoreCase)) return 1;
+    if (Path.EndsWith(Query, ESearchCase::IgnoreCase)) return 2;
+    if (Name.Contains(Query, ESearchCase::IgnoreCase)) return 3;
+    if (Path.Contains(Query, ESearchCase::IgnoreCase)) return 4;
+    return 100;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSearchAssets(const TSharedPtr<FJsonObject>& Params)
+{
+    FString Root = TEXT("/Game/");
+    Params->TryGetStringField(TEXT("root"), Root);
+    Root = NormalizeContentRoot(Root);
+
+    FString Query;
+    Params->TryGetStringField(TEXT("query"), Query);
+    Query = Query.TrimStartAndEnd();
+
+    int32 Limit = 25;
+    if (Params->HasField(TEXT("limit")))
+    {
+        Limit = (int32)Params->GetNumberField(TEXT("limit"));
+    }
+    Limit = FMath::Clamp(Limit, 1, 200);
+
+    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
+    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
+
+    FARFilter Filter;
+    Filter.PackagePaths.Add(*Root);
+    Filter.bRecursivePaths = true;
+
+    FString ClassErr;
+    if (!TryResolveAssetClassFilter(Params, Filter, ClassErr))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(ClassErr);
+    }
+
+    TArray<FAssetData> Assets;
+    AssetRegistry.GetAssets(Filter, Assets);
+
+    if (!Query.IsEmpty())
+    {
+        Assets.RemoveAll([&Query](const FAssetData& Asset) {
+            const FString Name = Asset.AssetName.ToString();
+            const FString Path = Asset.GetObjectPathString();
+            return !(Name.Contains(Query, ESearchCase::IgnoreCase) || Path.Contains(Query, ESearchCase::IgnoreCase));
+        });
+
+        Assets.Sort([&Query](const FAssetData& A, const FAssetData& B) {
+            const int32 SA = ScoreAssetMatch(Query, A);
+            const int32 SB = ScoreAssetMatch(Query, B);
+            if (SA != SB) return SA < SB;
+            return A.AssetName.LexicalLess(B.AssetName);
+        });
+    }
+    else
+    {
+        Assets.Sort([](const FAssetData& A, const FAssetData& B) {
+            return A.AssetName.LexicalLess(B.AssetName);
+        });
+    }
+
+    const int32 Total = Assets.Num();
+    if (Assets.Num() > Limit)
+    {
+        Assets.SetNum(Limit);
+    }
+
+    TArray<TSharedPtr<FJsonValue>> OutAssets;
+    OutAssets.Reserve(Assets.Num());
+    for (const FAssetData& Asset : Assets)
+    {
+        TSharedPtr<FJsonObject> Obj = MakeShared<FJsonObject>();
+        Obj->SetStringField(TEXT("name"), Asset.AssetName.ToString());
+        Obj->SetStringField(TEXT("objectPath"), Asset.GetObjectPathString());
+        Obj->SetStringField(TEXT("packagePath"), Asset.PackagePath.ToString());
+        Obj->SetStringField(TEXT("class"), Asset.AssetClassPath.ToString());
+        OutAssets.Add(MakeShared<FJsonValueObject>(Obj));
+    }
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetStringField(TEXT("root"), Root);
+    Result->SetStringField(TEXT("query"), Query);
+    Result->SetNumberField(TEXT("count"), OutAssets.Num());
+    Result->SetNumberField(TEXT("totalMatches"), Total);
+    Result->SetArrayField(TEXT("assets"), OutAssets);
+    return Result;
+}
+
+static FString InferPlacementKindFromAssetClassPath(const FString& ClassPath)
+{
+    if (ClassPath.Contains(TEXT("StaticMesh"), ESearchCase::IgnoreCase)) return TEXT("static_mesh");
+    if (ClassPath.Contains(TEXT("Blueprint"), ESearchCase::IgnoreCase)) return TEXT("blueprint");
+    if (ClassPath.Contains(TEXT("Material"), ESearchCase::IgnoreCase)) return TEXT("material");
+    if (ClassPath.Contains(TEXT("Texture"), ESearchCase::IgnoreCase)) return TEXT("texture");
+    return TEXT("unknown");
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetAssetInfo(const TSharedPtr<FJsonObject>& Params)
+{
+    FString ObjectPath;
+    if (!Params->TryGetStringField(TEXT("objectPath"), ObjectPath) && !Params->TryGetStringField(TEXT("object_path"), ObjectPath))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'objectPath' parameter"));
+    }
+    ObjectPath = ObjectPath.TrimStartAndEnd();
+    if (ObjectPath.IsEmpty())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("objectPath is empty"));
+    }
+
+    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
+    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
+
+    const FAssetData Asset = AssetRegistry.GetAssetByObjectPath(FSoftObjectPath(ObjectPath));
+    if (!Asset.IsValid())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Asset not found: %s"), *ObjectPath));
+    }
+
+    const FString ClassPath = Asset.AssetClassPath.ToString();
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetStringField(TEXT("name"), Asset.AssetName.ToString());
+    Result->SetStringField(TEXT("objectPath"), Asset.GetObjectPathString());
+    Result->SetStringField(TEXT("packageName"), Asset.PackageName.ToString());
+    Result->SetStringField(TEXT("packagePath"), Asset.PackagePath.ToString());
+    Result->SetStringField(TEXT("class"), ClassPath);
+    Result->SetStringField(TEXT("placementKind"), InferPlacementKindFromAssetClassPath(ClassPath));
+
+    if (Params->HasField(TEXT("includeDependencies")) && Params->GetBoolField(TEXT("includeDependencies")))
+    {
+        TArray<FName> Deps;
+        AssetRegistry.GetDependencies(Asset.PackageName, Deps);
+        TArray<TSharedPtr<FJsonValue>> DepArr;
+        DepArr.Reserve(Deps.Num());
+        for (const FName& Dep : Deps)
+        {
+            DepArr.Add(MakeShared<FJsonValueString>(Dep.ToString()));
+        }
+        Result->SetArrayField(TEXT("dependencies"), DepArr);
+    }
+
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleListAssetPacks(const TSharedPtr<FJsonObject>& Params)
+{
+    int32 Limit = 200;
+    if (Params->HasField(TEXT("limit")))
+    {
+        Limit = (int32)Params->GetNumberField(TEXT("limit"));
+    }
+    Limit = FMath::Clamp(Limit, 1, 500);
+
+    FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
+    IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
+
+    TArray<FString> SubPaths;
+    AssetRegistry.GetSubPaths(TEXT("/Game"), SubPaths, false);
+    SubPaths.Sort();
+
+    TArray<TSharedPtr<FJsonValue>> Packs;
+    for (const FString& Path : SubPaths)
+    {
+        if (Packs.Num() >= Limit) break;
+        if (Path.StartsWith(TEXT("/Game/__External"), ESearchCase::IgnoreCase)) continue;
+        if (Path.StartsWith(TEXT("/Game/Developers"), ESearchCase::IgnoreCase)) continue;
+
+        FString Name = Path;
+        int32 SlashIndex;
+        if (Name.FindLastChar(TEXT('/'), SlashIndex))
+        {
+            Name = Name.Mid(SlashIndex + 1);
+        }
+
+        TSharedPtr<FJsonObject> Obj = MakeShared<FJsonObject>();
+        Obj->SetStringField(TEXT("name"), Name);
+        Obj->SetStringField(TEXT("path"), Path + TEXT("/"));
+        Packs.Add(MakeShared<FJsonValueObject>(Obj));
+    }
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetNumberField(TEXT("count"), Packs.Num());
+    Result->SetArrayField(TEXT("packs"), Packs);
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandlePlaceAsset(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    FString ObjectPath;
+    if (!Params->TryGetStringField(TEXT("objectPath"), ObjectPath) && !Params->TryGetStringField(TEXT("object_path"), ObjectPath))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'objectPath' parameter"));
+    }
+    ObjectPath = ObjectPath.TrimStartAndEnd();
+    if (ObjectPath.IsEmpty())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("objectPath is empty"));
+    }
+
+    FVector Location(0.0f, 0.0f, 0.0f);
+    FRotator Rotation(0.0f, 0.0f, 0.0f);
+    FVector Scale(1.0f, 1.0f, 1.0f);
+
+    if (Params->HasField(TEXT("location")))
+    {
+        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
+    }
+    if (Params->HasField(TEXT("rotation")))
+    {
+        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
+    }
+    if (Params->HasField(TEXT("scale")))
+    {
+        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
+    }
+
+    UWorld* World = GEditor ? GEditor->GetEditorWorldContext().World() : nullptr;
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
+    }
+
+    FString AssetClassPath;
+    FString AssetName;
+    {
+        FAssetRegistryModule& AssetRegistryModule = FModuleManager::LoadModuleChecked<FAssetRegistryModule>(TEXT("AssetRegistry"));
+        IAssetRegistry& AssetRegistry = AssetRegistryModule.Get();
+        const FAssetData Asset = AssetRegistry.GetAssetByObjectPath(FSoftObjectPath(ObjectPath));
+        if (Asset.IsValid())
+        {
+            AssetClassPath = Asset.AssetClassPath.ToString();
+            AssetName = Asset.AssetName.ToString();
+        }
+    }
+
+    FString RequestedName;
+    Params->TryGetStringField(TEXT("name"), RequestedName);
+    RequestedName = RequestedName.TrimStartAndEnd();
+    if (RequestedName.IsEmpty())
+    {
+        RequestedName = !AssetName.IsEmpty() ? AssetName : TEXT("PlacedAsset");
+    }
+
+    AActor* NewActor = nullptr;
+    FString PlacementKind = !AssetClassPath.IsEmpty() ? InferPlacementKindFromAssetClassPath(AssetClassPath) : TEXT("unknown");
+
+    UObject* AssetObj = LoadObject<UObject>(nullptr, *ObjectPath);
+    if (!AssetObj && !ObjectPath.Contains(TEXT("'")))
+    {
+        AssetObj = LoadObject<UObject>(nullptr, *FString::Printf(TEXT("StaticMesh'%s'"), *ObjectPath));
+        if (!AssetObj)
+        {
+            AssetObj = LoadObject<UObject>(nullptr, *FString::Printf(TEXT("Blueprint'%s'"), *ObjectPath));
+        }
+    }
+
+    if (!AssetObj)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Failed to load asset: %s"), *ObjectPath));
+    }
+
+    FActorSpawnParameters SpawnParams;
+    SpawnParams.Name = MakeUniqueObjectName(World, AActor::StaticClass(), FName(*RequestedName));
+
+    if (UStaticMesh* StaticMesh = Cast<UStaticMesh>(AssetObj))
+    {
+        PlacementKind = TEXT("static_mesh");
+        AStaticMeshActor* StaticMeshActor = World->SpawnActor<AStaticMeshActor>(AStaticMeshActor::StaticClass(), Location, Rotation, SpawnParams);
+        if (!StaticMeshActor || !StaticMeshActor->GetStaticMeshComponent())
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn StaticMeshActor"));
+        }
+
+        StaticMeshActor->GetStaticMeshComponent()->SetStaticMesh(StaticMesh);
+        StaticMeshActor->GetStaticMeshComponent()->MarkRenderStateDirty();
+        NewActor = StaticMeshActor;
+    }
+    else if (UBlueprint* Blueprint = Cast<UBlueprint>(AssetObj))
+    {
+        PlacementKind = TEXT("blueprint");
+        if (!Blueprint->GeneratedClass)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Blueprint has no GeneratedClass (compile it and retry)."));
+        }
+        const FTransform SpawnTransform(FQuat(Rotation), Location, Scale);
+        NewActor = World->SpawnActor<AActor>(Blueprint->GeneratedClass, SpawnTransform, SpawnParams);
+    }
+    else if (UBlueprintGeneratedClass* GeneratedClass = Cast<UBlueprintGeneratedClass>(AssetObj))
+    {
+        PlacementKind = TEXT("blueprint");
+        const FTransform SpawnTransform(FQuat(Rotation), Location, Scale);
+        NewActor = World->SpawnActor<AActor>(GeneratedClass, SpawnTransform, SpawnParams);
+    }
+    else if (UClass* Class = Cast<UClass>(AssetObj))
+    {
+        if (!Class->IsChildOf(AActor::StaticClass()))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Loaded class is not an Actor class: %s"), *Class->GetName()));
+        }
+        PlacementKind = TEXT("blueprint");
+        const FTransform SpawnTransform(FQuat(Rotation), Location, Scale);
+        NewActor = World->SpawnActor<AActor>(Class, SpawnTransform, SpawnParams);
+    }
+    else
+    {
+        const FString ClassName = AssetObj->GetClass() ? AssetObj->GetClass()->GetName() : TEXT("UnknownClass");
+        return FUnrealMCPCommonUtils::CreateErrorResponse(
+            FString::Printf(TEXT("Asset is not placeable (class: %s). Placeable: StaticMesh, Blueprint. Asset: %s"), *ClassName, *ObjectPath));
+    }
+
+    if (!NewActor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn actor for asset."));
+    }
+
+    NewActor->SetActorScale3D(Scale);
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetStringField(TEXT("placementKind"), PlacementKind);
+    Result->SetStringField(TEXT("requestedObjectPath"), ObjectPath);
+    Result->SetStringField(TEXT("spawnedName"), NewActor->GetName());
+    Result->SetObjectField(TEXT("actor"), FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, true));
+    return Result;
+}
+
+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");
+    }
+}
+
+static TArray<TSharedPtr<FJsonValue>> VectorToJsonArray(const FVector& V)
+{
+    TArray<TSharedPtr<FJsonValue>> Arr;
+    Arr.Add(MakeShared<FJsonValueNumber>(V.X));
+    Arr.Add(MakeShared<FJsonValueNumber>(V.Y));
+    Arr.Add(MakeShared<FJsonValueNumber>(V.Z));
+    return Arr;
+}
+
+static TArray<TSharedPtr<FJsonValue>> RotatorToJsonArray(const FRotator& R)
+{
+    TArray<TSharedPtr<FJsonValue>> Arr;
+    Arr.Add(MakeShared<FJsonValueNumber>(R.Pitch));
+    Arr.Add(MakeShared<FJsonValueNumber>(R.Yaw));
+    Arr.Add(MakeShared<FJsonValueNumber>(R.Roll));
+    return Arr;
+}
+
+static AActor* FindActorByNameOrLabel(UWorld* World, const FString& NameOrLabel)
+{
+    if (!World) return nullptr;
+    if (NameOrLabel.IsEmpty()) return nullptr;
+
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(World, AActor::StaticClass(), AllActors);
+    for (AActor* Actor : AllActors)
+    {
+        if (!Actor) continue;
+        if (Actor->GetName().Equals(NameOrLabel, ESearchCase::CaseSensitive) ||
+            Actor->GetName().Equals(NameOrLabel, ESearchCase::IgnoreCase))
+        {
+            return Actor;
+        }
+#if WITH_EDITOR
+        if (Actor->GetActorLabel().Equals(NameOrLabel, ESearchCase::IgnoreCase))
+        {
+            return Actor;
+        }
+#endif
+    }
+
+    return nullptr;
+}
+
+static TSharedPtr<FJsonObject> RaycastInWorld(UWorld* World, const FVector& Start, const FVector& Dir, float MaxDistance, const TArray<FString>& IgnoreActorNames)
+{
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No world available for raycast."));
+    }
+
+    const FVector Direction = Dir.GetSafeNormal();
+    if (Direction.IsNearlyZero())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Raycast direction is zero."));
+    }
+
+    MaxDistance = FMath::Clamp(MaxDistance, 1.0f, 1.0e7f);
+    const FVector End = Start + Direction * MaxDistance;
+
+    FCollisionQueryParams QueryParams(SCENE_QUERY_STAT(UnrealMCP_Raycast), true);
+    QueryParams.bReturnPhysicalMaterial = false;
+
+    for (const FString& Name : IgnoreActorNames)
+    {
+        if (AActor* Actor = FindActorByNameOrLabel(World, Name))
+        {
+            QueryParams.AddIgnoredActor(Actor);
+        }
+    }
+
+    FHitResult Hit;
+    const bool bHit = World->LineTraceSingleByChannel(Hit, Start, End, ECC_Visibility, QueryParams);
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetBoolField(TEXT("hit"), bHit);
+    Result->SetArrayField(TEXT("start"), VectorToJsonArray(Start));
+    Result->SetArrayField(TEXT("end"), VectorToJsonArray(End));
+    Result->SetNumberField(TEXT("maxDistance"), MaxDistance);
+
+    if (!bHit)
+    {
+        return Result;
+    }
+
+    Result->SetArrayField(TEXT("location"), VectorToJsonArray(Hit.ImpactPoint));
+    Result->SetArrayField(TEXT("normal"), VectorToJsonArray(Hit.ImpactNormal));
+    Result->SetNumberField(TEXT("distance"), Hit.Distance);
+    if (AActor* HitActor = Hit.GetActor())
+    {
+        Result->SetStringField(TEXT("actor"), HitActor->GetName());
+#if WITH_EDITOR
+        Result->SetStringField(TEXT("actorLabel"), HitActor->GetActorLabel());
+#endif
+    }
+    if (UPrimitiveComponent* HitComp = Hit.GetComponent())
+    {
+        Result->SetStringField(TEXT("component"), HitComp->GetName());
+    }
+
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleMapCheck(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    const bool bIncludeWarnings = !Params->HasField(TEXT("includeWarnings")) || Params->GetBoolField(TEXT("includeWarnings"));
+    int32 Limit = 200;
+    if (Params->HasField(TEXT("limit")))
+    {
+        Limit = (int32)Params->GetNumberField(TEXT("limit"));
+    }
+    Limit = FMath::Clamp(Limit, 1, 1000);
+
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    UWorld* World = GEditor->GetEditorWorldContext().World();
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
+    }
+
+    FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>(TEXT("MessageLog"));
+    const TSharedRef<IMessageLogListing> Listing = MessageLogModule.GetLogListing(TEXT("MapCheck"));
+    Listing->ClearMessages();
+
+    FOutputDeviceNull Ar;
+    // Use the editor's exec pathway so we can request "don't display dialog" without relying on private enums.
+    const bool bOk = GEditor->Exec(World, TEXT("MAP CHECK DONTDISPLAYDIALOG"), Ar);
+    if (!bOk)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to run Map Check."));
+    }
+
+    const TArray<TSharedRef<FTokenizedMessage>>& Messages = Listing->GetFilteredMessages();
+    int32 ErrorCount = 0;
+    int32 WarningCount = 0;
+    int32 IncludedMessageCount = 0;
+    bool bTruncated = false;
+
+    TArray<TSharedPtr<FJsonValue>> Issues;
+    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) ErrorCount++;
+        if (bIsWarning) WarningCount++;
+
+        if (!bIncludeWarnings && bIsWarning) continue;
+
+        IncludedMessageCount++;
+        if (Issues.Num() >= Limit)
+        {
+            bTruncated = true;
+            continue;
+        }
+
+        TSharedPtr<FJsonObject> Issue = MakeShared<FJsonObject>();
+        Issue->SetStringField(TEXT("severity"), MessageSeverityToString(Severity));
+        Issue->SetStringField(TEXT("message"), Message->ToText().ToString());
+        Issues.Add(MakeShared<FJsonValueObject>(Issue));
+    }
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetBoolField(TEXT("ok"), ErrorCount == 0);
+    Result->SetNumberField(TEXT("errors"), ErrorCount);
+    Result->SetNumberField(TEXT("warnings"), WarningCount);
+    Result->SetBoolField(TEXT("includeWarnings"), bIncludeWarnings);
+    Result->SetArrayField(TEXT("issues"), Issues);
+    Result->SetBoolField(TEXT("truncated"), bTruncated || IncludedMessageCount > Issues.Num());
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetEditorContext(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    UWorld* World = GEditor->GetEditorWorldContext().World();
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
+    }
+
+    const FDateTime Now = FDateTime::UtcNow();
+    const int64 TimestampMs = Now.ToUnixTimestamp() * 1000 + Now.GetMillisecond();
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetNumberField(TEXT("timestampMs"), (double)TimestampMs);
+
+    const FString MapPackage = World->GetOutermost() ? World->GetOutermost()->GetName() : World->GetMapName();
+    Result->SetStringField(TEXT("map"), MapPackage);
+
+    // Selection (editor)
+    TArray<TSharedPtr<FJsonValue>> Selection;
+    if (USelection* SelectedActors = GEditor->GetSelectedActors())
+    {
+        for (FSelectionIterator It(*SelectedActors); It; ++It)
+        {
+            if (AActor* Actor = Cast<AActor>(*It))
+            {
+                TSharedPtr<FJsonObject> Obj = MakeShared<FJsonObject>();
+                Obj->SetStringField(TEXT("name"), Actor->GetName());
+#if WITH_EDITOR
+                Obj->SetStringField(TEXT("label"), Actor->GetActorLabel());
+#endif
+                Obj->SetArrayField(TEXT("location"), VectorToJsonArray(Actor->GetActorLocation()));
+                Obj->SetArrayField(TEXT("rotation"), RotatorToJsonArray(Actor->GetActorRotation()));
+                Selection.Add(MakeShared<FJsonValueObject>(Obj));
+            }
+        }
+    }
+    Result->SetArrayField(TEXT("selection"), Selection);
+
+    // Active viewport camera (best-effort)
+    TSharedPtr<FJsonObject> ViewportCamera;
+    FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
+    if (LevelEditorModule)
+    {
+        TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
+        if (ActiveViewport.IsValid())
+        {
+            const FEditorViewportClient& VC = ActiveViewport->GetAssetViewportClient();
+            ViewportCamera = MakeShared<FJsonObject>();
+            ViewportCamera->SetArrayField(TEXT("location"), VectorToJsonArray(VC.GetViewLocation()));
+            ViewportCamera->SetArrayField(TEXT("rotation"), RotatorToJsonArray(VC.GetViewRotation()));
+            ViewportCamera->SetNumberField(TEXT("fov"), VC.ViewFOV);
+            ViewportCamera->SetArrayField(TEXT("forward"), VectorToJsonArray(VC.GetViewRotation().Vector()));
+        }
+    }
+    if (ViewportCamera.IsValid())
+    {
+        Result->SetObjectField(TEXT("viewportCamera"), ViewportCamera);
+    }
+    else
+    {
+        Result->SetField(TEXT("viewportCamera"), MakeShared<FJsonValueNull>());
+    }
+
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetPlayerContext(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    UWorld* PlayWorld = GEditor->PlayWorld;
+    const bool bIsPlaying = PlayWorld != nullptr;
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetBoolField(TEXT("isPlaying"), bIsPlaying);
+
+    if (!bIsPlaying)
+    {
+        Result->SetField(TEXT("pawn"), MakeShared<FJsonValueNull>());
+        Result->SetField(TEXT("camera"), MakeShared<FJsonValueNull>());
+        return Result;
+    }
+
+    APlayerController* PC = PlayWorld->GetFirstPlayerController();
+    if (!PC)
+    {
+        Result->SetField(TEXT("pawn"), MakeShared<FJsonValueNull>());
+        Result->SetField(TEXT("camera"), MakeShared<FJsonValueNull>());
+        return Result;
+    }
+
+    Result->SetStringField(TEXT("controller"), PC->GetName());
+
+    if (APawn* Pawn = PC->GetPawn())
+    {
+        TSharedPtr<FJsonObject> PawnObj = MakeShared<FJsonObject>();
+        PawnObj->SetStringField(TEXT("name"), Pawn->GetName());
+        PawnObj->SetArrayField(TEXT("location"), VectorToJsonArray(Pawn->GetActorLocation()));
+        PawnObj->SetArrayField(TEXT("rotation"), RotatorToJsonArray(Pawn->GetActorRotation()));
+        PawnObj->SetArrayField(TEXT("scale"), VectorToJsonArray(Pawn->GetActorScale3D()));
+        Result->SetObjectField(TEXT("pawn"), PawnObj);
+    }
+    else
+    {
+        Result->SetField(TEXT("pawn"), MakeShared<FJsonValueNull>());
+    }
+
+    FVector CamLoc;
+    FRotator CamRot;
+    PC->GetPlayerViewPoint(CamLoc, CamRot);
+
+    TSharedPtr<FJsonObject> CamObj = MakeShared<FJsonObject>();
+    CamObj->SetArrayField(TEXT("location"), VectorToJsonArray(CamLoc));
+    CamObj->SetArrayField(TEXT("rotation"), RotatorToJsonArray(CamRot));
+    CamObj->SetArrayField(TEXT("forward"), VectorToJsonArray(CamRot.Vector()));
+    Result->SetObjectField(TEXT("camera"), CamObj);
+
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleRaycastFromCamera(const TSharedPtr<FJsonObject>& Params)
+{
+    const FString Source = Params->HasField(TEXT("source")) ? Params->GetStringField(TEXT("source")).ToLower() : TEXT("editor");
+    const float MaxDistance = Params->HasField(TEXT("maxDistance")) ? (float)Params->GetNumberField(TEXT("maxDistance")) : 10000.0f;
+
+    TArray<FString> Ignore;
+    if (Params->HasField(TEXT("ignoreActors")))
+    {
+        const TArray<TSharedPtr<FJsonValue>> Arr = Params->GetArrayField(TEXT("ignoreActors"));
+        for (const TSharedPtr<FJsonValue>& V : Arr)
+        {
+            if (V.IsValid() && V->Type == EJson::String)
+            {
+                const FString S = V->AsString().TrimStartAndEnd();
+                if (!S.IsEmpty()) Ignore.Add(S);
+            }
+        }
+    }
+
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    if (Source == TEXT("pie") || Source == TEXT("player") || Source == TEXT("runtime"))
+    {
+        UWorld* PlayWorld = GEditor->PlayWorld;
+        if (!PlayWorld)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is not running (no PlayWorld)."));
+        }
+        APlayerController* PC = PlayWorld->GetFirstPlayerController();
+        if (!PC)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is running but no player controller was found."));
+        }
+        FVector CamLoc;
+        FRotator CamRot;
+        PC->GetPlayerViewPoint(CamLoc, CamRot);
+        return RaycastInWorld(PlayWorld, CamLoc, CamRot.Vector(), MaxDistance, Ignore);
+    }
+
+    // Default: editor viewport camera.
+    FLevelEditorModule* LevelEditorModule = FModuleManager::LoadModulePtr<FLevelEditorModule>(TEXT("LevelEditor"));
+    if (!LevelEditorModule)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("LevelEditor module not available."));
+    }
+    TSharedPtr<IAssetViewport> ActiveViewport = LevelEditorModule->GetFirstActiveViewport();
+    if (!ActiveViewport.IsValid())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("No active level viewport. Click the viewport and retry."));
+    }
+
+    const FEditorViewportClient& VC = ActiveViewport->GetAssetViewportClient();
+    UWorld* World = GEditor->GetEditorWorldContext().World();
+    return RaycastInWorld(World, VC.GetViewLocation(), VC.GetViewRotation().Vector(), MaxDistance, Ignore);
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleRaycastDown(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    FString WorldSource = TEXT("editor");
+    if (Params->HasField(TEXT("source")))
+    {
+        WorldSource = Params->GetStringField(TEXT("source")).ToLower();
+    }
+
+    FVector Start;
+    if (Params->HasField(TEXT("startLocation")))
+    {
+        Start = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("startLocation"));
+    }
+    else
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'startLocation' parameter"));
+    }
+
+    const float MaxDistance = Params->HasField(TEXT("maxDistance")) ? (float)Params->GetNumberField(TEXT("maxDistance")) : 100000.0f;
+
+    UWorld* World = nullptr;
+    if (WorldSource == TEXT("pie"))
+    {
+        World = GEditor->PlayWorld;
+        if (!World)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is not running (no PlayWorld)."));
+        }
+    }
+    else
+    {
+        World = GEditor->GetEditorWorldContext().World();
+    }
+
+    return RaycastInWorld(World, Start, FVector(0.0f, 0.0f, -1.0f), MaxDistance, {});
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorTransform(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    FString Name;
+    if (!Params->TryGetStringField(TEXT("name"), Name) && !Params->TryGetStringField(TEXT("actor"), Name))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+    Name = Name.TrimStartAndEnd();
+    if (Name.IsEmpty())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Actor name is empty"));
+    }
+
+    FString Source = Params->HasField(TEXT("source")) ? Params->GetStringField(TEXT("source")).ToLower() : TEXT("editor");
+    UWorld* World = nullptr;
+    if (Source == TEXT("pie"))
+    {
+        World = GEditor->PlayWorld;
+    }
+    else
+    {
+        World = GEditor->GetEditorWorldContext().World();
+    }
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("World is not available."));
+    }
+
+    AActor* Actor = FindActorByNameOrLabel(World, Name);
+    if (!Actor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *Name));
+    }
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetStringField(TEXT("name"), Actor->GetName());
+#if WITH_EDITOR
+    Result->SetStringField(TEXT("label"), Actor->GetActorLabel());
+#endif
+    Result->SetArrayField(TEXT("location"), VectorToJsonArray(Actor->GetActorLocation()));
+    Result->SetArrayField(TEXT("rotation"), RotatorToJsonArray(Actor->GetActorRotation()));
+    Result->SetArrayField(TEXT("scale"), VectorToJsonArray(Actor->GetActorScale3D()));
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorBounds(const TSharedPtr<FJsonObject>& Params)
+{
+    if (!GEditor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Editor is not available (GEditor is null)."));
+    }
+
+    FString Name;
+    if (!Params->TryGetStringField(TEXT("name"), Name) && !Params->TryGetStringField(TEXT("actor"), Name))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+    Name = Name.TrimStartAndEnd();
+    if (Name.IsEmpty())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Actor name is empty"));
+    }
+
+    FString Source = Params->HasField(TEXT("source")) ? Params->GetStringField(TEXT("source")).ToLower() : TEXT("editor");
+    UWorld* World = nullptr;
+    if (Source == TEXT("pie"))
+    {
+        World = GEditor->PlayWorld;
+    }
+    else
+    {
+        World = GEditor->GetEditorWorldContext().World();
+    }
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("World is not available."));
+    }
+
+    AActor* Actor = FindActorByNameOrLabel(World, Name);
+    if (!Actor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *Name));
+    }
+
+    FVector Origin;
+    FVector Extent;
+    Actor->GetActorBounds(true, Origin, Extent, false);
+
+    TSharedPtr<FJsonObject> Result = MakeShared<FJsonObject>();
+    Result->SetStringField(TEXT("name"), Actor->GetName());
+#if WITH_EDITOR
+    Result->SetStringField(TEXT("label"), Actor->GetActorLabel());
+#endif
+    Result->SetArrayField(TEXT("origin"), VectorToJsonArray(Origin));
+    Result->SetArrayField(TEXT("extent"), VectorToJsonArray(Extent));
+    Result->SetArrayField(TEXT("min"), VectorToJsonArray(Origin - Extent));
+    Result->SetArrayField(TEXT("max"), VectorToJsonArray(Origin + Extent));
+    return Result;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorsInLevel(const TSharedPtr<FJsonObject>& Params)
+{
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
+    
+    TArray<TSharedPtr<FJsonValue>> ActorArray;
+    for (AActor* Actor : AllActors)
+    {
+        if (Actor)
+        {
+            ActorArray.Add(FUnrealMCPCommonUtils::ActorToJson(Actor));
+        }
+    }
+    
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetArrayField(TEXT("actors"), ActorArray);
+    
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleFindActorsByName(const TSharedPtr<FJsonObject>& Params)
+{
+    FString Pattern;
+    if (!Params->TryGetStringField(TEXT("pattern"), Pattern) && !Params->TryGetStringField(TEXT("name"), Pattern))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'pattern' parameter"));
+    }
+    Pattern = Pattern.TrimStartAndEnd();
+    if (Pattern.IsEmpty())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("pattern is empty"));
+    }
+    
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
+    
+    TArray<TSharedPtr<FJsonValue>> MatchingActors;
+    for (AActor* Actor : AllActors)
+    {
+        if (!Actor) continue;
+        const bool bNameMatch = Actor->GetName().Contains(Pattern);
+#if WITH_EDITOR
+        const bool bLabelMatch = Actor->GetActorLabel().Contains(Pattern);
+#else
+        const bool bLabelMatch = false;
+#endif
+        if (bNameMatch || bLabelMatch)
+        {
+            MatchingActors.Add(FUnrealMCPCommonUtils::ActorToJson(Actor));
+        }
+    }
+    
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetArrayField(TEXT("actors"), MatchingActors);
+    
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSpawnActor(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    // Get required parameters
+    FString ActorType;
+    if (!Params->TryGetStringField(TEXT("type"), ActorType))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'type' parameter"));
+    }
+
+    // Get actor name (required parameter)
+    FString ActorName;
+    if (!Params->TryGetStringField(TEXT("name"), ActorName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+
+    // Get optional transform parameters
+    FVector Location(0.0f, 0.0f, 0.0f);
+    FRotator Rotation(0.0f, 0.0f, 0.0f);
+    FVector Scale(1.0f, 1.0f, 1.0f);
+
+    if (Params->HasField(TEXT("location")))
+    {
+        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
+    }
+    if (Params->HasField(TEXT("rotation")))
+    {
+        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
+    }
+    if (Params->HasField(TEXT("scale")))
+    {
+        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
+    }
+
+    // Create the actor based on type
+    AActor* NewActor = nullptr;
+    UWorld* World = GEditor->GetEditorWorldContext().World();
+
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
+    }
+
+    // Check if an actor with this name already exists
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(World, AActor::StaticClass(), AllActors);
+    for (AActor* Actor : AllActors)
+    {
+        if (Actor && Actor->GetName() == ActorName)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor with name '%s' already exists"), *ActorName));
+        }
+    }
+
+    FActorSpawnParameters SpawnParams;
+    SpawnParams.Name = *ActorName;
+
+    if (ActorType == TEXT("StaticMeshActor"))
+    {
+        NewActor = World->SpawnActor<AStaticMeshActor>(AStaticMeshActor::StaticClass(), Location, Rotation, SpawnParams);
+
+        // Optional: assign a StaticMesh at spawn time (preferred, since nested component property setting is limited).
+        FString StaticMeshPath;
+        if (Params->TryGetStringField(TEXT("static_mesh_path"), StaticMeshPath) ||
+            Params->TryGetStringField(TEXT("static_mesh"), StaticMeshPath))
+        {
+            StaticMeshPath = StaticMeshPath.TrimStartAndEnd();
+            if (!StaticMeshPath.IsEmpty())
+            {
+                UStaticMesh* StaticMesh = LoadObject<UStaticMesh>(nullptr, *StaticMeshPath);
+                if (!StaticMesh && !StaticMeshPath.StartsWith(TEXT("StaticMesh'")))
+                {
+                    StaticMesh = LoadObject<UStaticMesh>(nullptr, *FString::Printf(TEXT("StaticMesh'%s'"), *StaticMeshPath));
+                }
+
+                if (!StaticMesh)
+                {
+                    return FUnrealMCPCommonUtils::CreateErrorResponse(
+                        FString::Printf(TEXT("Static mesh not found: %s"), *StaticMeshPath));
+                }
+
+                AStaticMeshActor* StaticMeshActor = Cast<AStaticMeshActor>(NewActor);
+                if (!StaticMeshActor || !StaticMeshActor->GetStaticMeshComponent())
+                {
+                    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Spawned StaticMeshActor has no StaticMeshComponent."));
+                }
+
+                StaticMeshActor->GetStaticMeshComponent()->SetStaticMesh(StaticMesh);
+                StaticMeshActor->GetStaticMeshComponent()->MarkRenderStateDirty();
+            }
+        }
+    }
+    else if (ActorType == TEXT("PointLight"))
+    {
+        NewActor = World->SpawnActor<APointLight>(APointLight::StaticClass(), Location, Rotation, SpawnParams);
+    }
+    else if (ActorType == TEXT("SpotLight"))
+    {
+        NewActor = World->SpawnActor<ASpotLight>(ASpotLight::StaticClass(), Location, Rotation, SpawnParams);
+    }
+    else if (ActorType == TEXT("DirectionalLight"))
+    {
+        NewActor = World->SpawnActor<ADirectionalLight>(ADirectionalLight::StaticClass(), Location, Rotation, SpawnParams);
+    }
+    else if (ActorType == TEXT("CameraActor"))
+    {
+        NewActor = World->SpawnActor<ACameraActor>(ACameraActor::StaticClass(), Location, Rotation, SpawnParams);
+    }
+    else
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Unknown actor type: %s"), *ActorType));
+    }
+
+    if (NewActor)
+    {
+        // Set scale (since SpawnActor only takes location and rotation)
+        FTransform Transform = NewActor->GetTransform();
+        Transform.SetScale3D(Scale);
+        NewActor->SetActorTransform(Transform);
+
+        // Return the created actor's details
+        return FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, true);
+    }
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create actor"));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleCreateLandscape(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    UWorld* World = GEditor ? GEditor->GetEditorWorldContext().World() : nullptr;
+    if (!World)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world"));
+    }
+
+    FString LandscapeName;
+    if (!Params->TryGetStringField(TEXT("name"), LandscapeName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+    LandscapeName = LandscapeName.TrimStartAndEnd();
+    if (LandscapeName.IsEmpty())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Invalid 'name' parameter (empty)"));
+    }
+
+    // Ensure actor name uniqueness.
+    {
+        TArray<AActor*> AllActors;
+        UGameplayStatics::GetAllActorsOfClass(World, AActor::StaticClass(), AllActors);
+        for (AActor* Actor : AllActors)
+        {
+            if (Actor && Actor->GetName() == LandscapeName)
+            {
+                return FUnrealMCPCommonUtils::CreateErrorResponse(
+                    FString::Printf(TEXT("Actor with name '%s' already exists"), *LandscapeName));
+            }
+        }
+    }
+
+    FVector Location(0.0f, 0.0f, 0.0f);
+    FRotator Rotation(0.0f, 0.0f, 0.0f);
+    FVector Scale(100.0f, 100.0f, 100.0f);
+
+    if (Params->HasField(TEXT("location")))
+    {
+        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
+    }
+    if (Params->HasField(TEXT("rotation")))
+    {
+        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
+    }
+    if (Params->HasField(TEXT("scale")))
+    {
+        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
+    }
+
+    int32 ComponentCountX = 8;
+    int32 ComponentCountY = 8;
+    int32 SectionsPerComponent = 1;
+    int32 QuadsPerSection = 63;
+
+    {
+        double Value = 0;
+        if (Params->TryGetNumberField(TEXT("componentCountX"), Value)) ComponentCountX = (int32)Value;
+        if (Params->TryGetNumberField(TEXT("componentCountY"), Value)) ComponentCountY = (int32)Value;
+        if (Params->TryGetNumberField(TEXT("sectionsPerComponent"), Value)) SectionsPerComponent = (int32)Value;
+        if (Params->TryGetNumberField(TEXT("quadsPerSection"), Value)) QuadsPerSection = (int32)Value;
+    }
+
+    if (ComponentCountX <= 0 || ComponentCountY <= 0)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("componentCountX/componentCountY must be positive integers"));
+    }
+    if (SectionsPerComponent <= 0 || SectionsPerComponent > 2)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("sectionsPerComponent must be 1 or 2"));
+    }
+    if (QuadsPerSection <= 0)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("quadsPerSection must be a positive integer"));
+    }
+
+    const int32 QuadsPerComponent = SectionsPerComponent * QuadsPerSection;
+    const int32 SizeX = ComponentCountX * QuadsPerComponent + 1;
+    const int32 SizeY = ComponentCountY * QuadsPerComponent + 1;
+
+    const int64 TotalVerts = (int64)SizeX * (int64)SizeY;
+    if (TotalVerts > 16ll * 1024ll * 1024ll)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Landscape is too large (vertex count limit exceeded)"));
+    }
+
+    // Optional landscape material.
+    UMaterialInterface* LandscapeMaterial = nullptr;
+    {
+        FString MaterialPath;
+        if (Params->TryGetStringField(TEXT("materialPath"), MaterialPath) ||
+            Params->TryGetStringField(TEXT("material"), MaterialPath) ||
+            Params->TryGetStringField(TEXT("landscapeMaterial"), MaterialPath))
+        {
+            MaterialPath = MaterialPath.TrimStartAndEnd();
+            if (!MaterialPath.IsEmpty())
+            {
+                LandscapeMaterial = LoadObject<UMaterialInterface>(nullptr, *MaterialPath);
+                if (!LandscapeMaterial && !MaterialPath.StartsWith(TEXT("Material'")))
+                {
+                    LandscapeMaterial = LoadObject<UMaterialInterface>(nullptr, *FString::Printf(TEXT("Material'%s'"), *MaterialPath));
+                }
+                if (!LandscapeMaterial)
+                {
+                    return FUnrealMCPCommonUtils::CreateErrorResponse(
+                        FString::Printf(TEXT("Landscape material not found: %s"), *MaterialPath));
+                }
+            }
+        }
+    }
+
+    // Center on Location (similar to the editor create landscape UX).
+    const FVector Offset =
+        FTransform(Rotation, FVector::ZeroVector, Scale)
+            .TransformVector(FVector(-ComponentCountX * QuadsPerComponent / 2, -ComponentCountY * QuadsPerComponent / 2, 0));
+
+    FActorSpawnParameters SpawnParams;
+    SpawnParams.Name = *LandscapeName;
+    ALandscape* Landscape = World->SpawnActor<ALandscape>(Location + Offset, Rotation, SpawnParams);
+    if (!Landscape)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn Landscape actor"));
+    }
+
+    Landscape->SetActorRelativeScale3D(Scale);
+    if (LandscapeMaterial)
+    {
+        Landscape->LandscapeMaterial = LandscapeMaterial;
+    }
+
+    Landscape->StaticLightingLOD = FMath::DivideAndRoundUp(FMath::CeilLogTwo((SizeX * SizeY) / (2048 * 2048) + 1), (uint32)2);
+
+    // Flat heightmap.
+    TArray<uint16> HeightData;
+    HeightData.SetNumUninitialized(SizeX * SizeY);
+    for (int32 i = 0; i < HeightData.Num(); i++)
+    {
+        HeightData[i] = 32768;
+    }
+
+    TMap<FGuid, TArray<uint16>> HeightDataPerLayers;
+    HeightDataPerLayers.Add(FGuid(), MoveTemp(HeightData));
+
+    TMap<FGuid, TArray<FLandscapeImportLayerInfo>> MaterialLayerDataPerLayers;
+    MaterialLayerDataPerLayers.Add(FGuid(), TArray<FLandscapeImportLayerInfo>());
+
+    FString ReimportHeightmapFilePath;
+
+    Landscape->Import(
+        FGuid::NewGuid(),
+        0,
+        0,
+        SizeX - 1,
+        SizeY - 1,
+        SectionsPerComponent,
+        QuadsPerSection,
+        HeightDataPerLayers,
+        *ReimportHeightmapFilePath,
+        MaterialLayerDataPerLayers,
+        ELandscapeImportAlphamapType::Additive,
+        TArrayView<const FLandscapeLayer>());
+
+    ULandscapeInfo* LandscapeInfo = Landscape->GetLandscapeInfo();
+    if (!LandscapeInfo)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Landscape import failed (LandscapeInfo missing)"));
+    }
+
+    FActorLabelUtilities::SetActorLabelUnique(Landscape, LandscapeName);
+    LandscapeInfo->UpdateLayerInfoMap(Landscape);
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetObjectField(TEXT("landscape"), FUnrealMCPCommonUtils::ActorToJsonObject(Landscape));
+    ResultObj->SetNumberField(TEXT("componentCountX"), ComponentCountX);
+    ResultObj->SetNumberField(TEXT("componentCountY"), ComponentCountY);
+    ResultObj->SetNumberField(TEXT("sectionsPerComponent"), SectionsPerComponent);
+    ResultObj->SetNumberField(TEXT("quadsPerSection"), QuadsPerSection);
+    ResultObj->SetNumberField(TEXT("sizeX"), SizeX);
+    ResultObj->SetNumberField(TEXT("sizeY"), SizeY);
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleDeleteActor(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    FString ActorName;
+    if (!Params->TryGetStringField(TEXT("name"), ActorName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
+    
+    for (AActor* Actor : AllActors)
+    {
+        if (Actor && Actor->GetName() == ActorName)
+        {
+            // Store actor info before deletion for the response
+            TSharedPtr<FJsonObject> ActorInfo = FUnrealMCPCommonUtils::ActorToJsonObject(Actor);
+            
+            // Delete the actor
+            Actor->Destroy();
+            
+            TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+            ResultObj->SetObjectField(TEXT("deleted_actor"), ActorInfo);
+            return ResultObj;
+        }
+    }
+    
+    return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSetActorTransform(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    // Get actor name
+    FString ActorName;
+    if (!Params->TryGetStringField(TEXT("name"), ActorName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+
+    // Find the actor
+    AActor* TargetActor = nullptr;
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
+    
+    for (AActor* Actor : AllActors)
+    {
+        if (Actor && Actor->GetName() == ActorName)
+        {
+            TargetActor = Actor;
+            break;
+        }
+    }
+
+    if (!TargetActor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
+    }
+
+    // Get transform parameters
+    FTransform NewTransform = TargetActor->GetTransform();
+
+    if (Params->HasField(TEXT("location")))
+    {
+        NewTransform.SetLocation(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location")));
+    }
+    if (Params->HasField(TEXT("rotation")))
+    {
+        NewTransform.SetRotation(FQuat(FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"))));
+    }
+    if (Params->HasField(TEXT("scale")))
+    {
+        NewTransform.SetScale3D(FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale")));
+    }
+
+    // Set the new transform
+    TargetActor->SetActorTransform(NewTransform);
+
+    // Return updated actor info
+    return FUnrealMCPCommonUtils::ActorToJsonObject(TargetActor, true);
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleGetActorProperties(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get actor name
+    FString ActorName;
+    if (!Params->TryGetStringField(TEXT("name"), ActorName) && !Params->TryGetStringField(TEXT("actor"), ActorName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+
+    // Find the actor
+    AActor* TargetActor = nullptr;
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
+    
+    for (AActor* Actor : AllActors)
+    {
+        if (Actor && Actor->GetName() == ActorName)
+        {
+            TargetActor = Actor;
+            break;
+        }
+    }
+
+    if (!TargetActor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
+    }
+
+    // Always return detailed properties for this command
+    return FUnrealMCPCommonUtils::ActorToJsonObject(TargetActor, true);
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSetActorProperty(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    // Get actor name
+    FString ActorName;
+    if (!Params->TryGetStringField(TEXT("name"), ActorName) && !Params->TryGetStringField(TEXT("actor"), ActorName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'name' parameter"));
+    }
+
+    // Find the actor
+    AActor* TargetActor = nullptr;
+    TArray<AActor*> AllActors;
+    UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
+    
+    for (AActor* Actor : AllActors)
+    {
+        if (Actor && Actor->GetName() == ActorName)
+        {
+            TargetActor = Actor;
+            break;
+        }
+    }
+
+    if (!TargetActor)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *ActorName));
+    }
+
+    // Get property name
+    FString PropertyName;
+    if (!Params->TryGetStringField(TEXT("property_name"), PropertyName) && !Params->TryGetStringField(TEXT("property"), PropertyName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_name' parameter"));
+    }
+
+    // Get property value
+    if (!Params->HasField(TEXT("property_value")) && !Params->HasField(TEXT("value")))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'property_value' parameter"));
+    }
+    
+    TSharedPtr<FJsonValue> PropertyValue = Params->HasField(TEXT("property_value"))
+        ? Params->Values.FindRef(TEXT("property_value"))
+        : Params->Values.FindRef(TEXT("value"));
+    
+    // Set the property using our utility function
+    FString ErrorMessage;
+    if (FUnrealMCPCommonUtils::SetObjectProperty(TargetActor, PropertyName, PropertyValue, ErrorMessage))
+    {
+        // Property set successfully
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetStringField(TEXT("actor"), ActorName);
+        ResultObj->SetStringField(TEXT("property"), PropertyName);
+        ResultObj->SetBoolField(TEXT("success"), true);
+        
+        // Also include the full actor details
+        ResultObj->SetObjectField(TEXT("actor_details"), FUnrealMCPCommonUtils::ActorToJsonObject(TargetActor, true));
+        return ResultObj;
+    }
+    else
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(ErrorMessage);
+    }
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSpawnBlueprintActor(const TSharedPtr<FJsonObject>& Params)
+{
+    {
+        FString Err;
+        if (!IsSafeToModifyEditorWorld(Err))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(Err);
+        }
+    }
+
+    // Get required parameters
+    FString BlueprintName;
+    if (!Params->TryGetStringField(TEXT("blueprint_name"), BlueprintName) &&
+        !Params->TryGetStringField(TEXT("blueprint"), BlueprintName) &&
+        !Params->TryGetStringField(TEXT("blueprint_path"), BlueprintName) &&
+        !Params->TryGetStringField(TEXT("objectPath"), BlueprintName) &&
+        !Params->TryGetStringField(TEXT("object_path"), BlueprintName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'blueprint_name' parameter"));
+    }
+
+    FString ActorName;
+    if (!Params->TryGetStringField(TEXT("actor_name"), ActorName) && !Params->TryGetStringField(TEXT("name"), ActorName))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Missing 'actor_name' parameter"));
+    }
+
+    // Find the blueprint
+    if (BlueprintName.IsEmpty())
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Blueprint name is empty"));
+    }
+    BlueprintName = BlueprintName.TrimStartAndEnd();
+    ActorName = ActorName.TrimStartAndEnd();
+
+    const auto SanitizeObjectName = [](const FString& In) -> FString {
+        FString Out;
+        Out.Reserve(In.Len());
+        for (int32 i = 0; i < In.Len(); i++)
+        {
+            const TCHAR Ch = In[i];
+            const bool bOk =
+                (Ch >= '0' && Ch <= '9') ||
+                (Ch >= 'A' && Ch <= 'Z') ||
+                (Ch >= 'a' && Ch <= 'z') ||
+                Ch == '_' || Ch == '-';
+            Out.AppendChar(bOk ? Ch : '_');
+        }
+        Out = Out.TrimStartAndEnd();
+        while (Out.Contains(TEXT("__")))
+        {
+            Out = Out.Replace(TEXT("__"), TEXT("_"));
+        }
+        if (Out.IsEmpty()) Out = TEXT("BPActor");
+        return Out;
+    };
+
+    const FString SafeActorBaseName = SanitizeObjectName(ActorName);
+
+    // Resolve an asset/object path:
+    // - If caller passes /Game/... treat as an object path/package path.
+    // - Otherwise assume /Game/Blueprints/<BlueprintName> (compat default).
+    FString AssetPath = BlueprintName;
+    if (!AssetPath.StartsWith(TEXT("/")))
+    {
+        AssetPath = TEXT("/Game/Blueprints/") + AssetPath;
+    }
+
+    UObject* AssetObj = LoadObject<UObject>(nullptr, *AssetPath);
+    if (!AssetObj && !AssetPath.Contains(TEXT("'")))
+    {
+        AssetObj = LoadObject<UObject>(nullptr, *FString::Printf(TEXT("Blueprint'%s'"), *AssetPath));
+    }
+
+    if (!AssetObj)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Failed to load blueprint asset: %s"), *AssetPath));
+    }
+
+    // Get transform parameters
+    FVector Location(0.0f, 0.0f, 0.0f);
+    FRotator Rotation(0.0f, 0.0f, 0.0f);
+    FVector Scale(1.0f, 1.0f, 1.0f);
+
+    if (Params->HasField(TEXT("location")))
+    {
+        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
+    }
+    if (Params->HasField(TEXT("rotation")))
+    {
+        Rotation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("rotation"));
+    }
+    if (Params->HasField(TEXT("scale")))
+    {
+        Scale = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("scale"));
+    }
+
+    // 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));
+    SpawnTransform.SetScale3D(Scale);
+
+    FActorSpawnParameters SpawnParams;
+    SpawnParams.Name = MakeUniqueObjectName(World, AActor::StaticClass(), FName(*SafeActorBaseName));
+
+    UClass* ActorClass = nullptr;
+    if (UBlueprint* Blueprint = Cast<UBlueprint>(AssetObj))
+    {
+        ActorClass = Blueprint->GeneratedClass;
+    }
+    else if (UBlueprintGeneratedClass* BPGC = Cast<UBlueprintGeneratedClass>(AssetObj))
+    {
+        ActorClass = BPGC;
+    }
+    else if (UClass* Class = Cast<UClass>(AssetObj))
+    {
+        ActorClass = Class;
+    }
+
+    if (!ActorClass || !ActorClass->IsChildOf(AActor::StaticClass()))
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Loaded asset is not a spawnable Actor Blueprint/Class. Compile the Blueprint and retry."));
+    }
+
+    AActor* NewActor = World->SpawnActor<AActor>(ActorClass, SpawnTransform, SpawnParams);
+    if (NewActor)
+    {
+        bool bDetailed = true;
+        if (Params->HasField(TEXT("include_details")))
+        {
+            bDetailed = Params->GetBoolField(TEXT("include_details"));
+        }
+        else if (Params->HasField(TEXT("detailed")))
+        {
+            bDetailed = Params->GetBoolField(TEXT("detailed"));
+        }
+        else if (Params->HasField(TEXT("includeProperties")))
+        {
+            bDetailed = Params->GetBoolField(TEXT("includeProperties"));
+        }
+
+        return FUnrealMCPCommonUtils::ActorToJsonObject(NewActor, bDetailed);
+    }
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn blueprint actor"));
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleFocusViewport(const TSharedPtr<FJsonObject>& Params)
+{
+    // Get target actor name if provided
+    FString TargetActorName;
+    bool HasTargetActor = Params->TryGetStringField(TEXT("target"), TargetActorName);
+
+    // Get location if provided
+    FVector Location(0.0f, 0.0f, 0.0f);
+    bool HasLocation = false;
+    if (Params->HasField(TEXT("location")))
+    {
+        Location = FUnrealMCPCommonUtils::GetVectorFromJson(Params, TEXT("location"));
+        HasLocation = true;
+    }
+
+    // Get distance
+    float Distance = 1000.0f;
+    if (Params->HasField(TEXT("distance")))
+    {
+        Distance = Params->GetNumberField(TEXT("distance"));
+    }
+
+    // Get orientation if provided
+    FRotator Orientation(0.0f, 0.0f, 0.0f);
+    bool HasOrientation = false;
+    if (Params->HasField(TEXT("orientation")))
+    {
+        Orientation = FUnrealMCPCommonUtils::GetRotatorFromJson(Params, TEXT("orientation"));
+        HasOrientation = true;
+    }
+
+    // Get the active viewport
+    FLevelEditorViewportClient* ViewportClient = (FLevelEditorViewportClient*)GEditor->GetActiveViewport()->GetClient();
+    if (!ViewportClient)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get active viewport"));
+    }
+
+    // If we have a target actor, focus on it
+    if (HasTargetActor)
+    {
+        // Find the actor
+        AActor* TargetActor = nullptr;
+        TArray<AActor*> AllActors;
+        UGameplayStatics::GetAllActorsOfClass(GWorld, AActor::StaticClass(), AllActors);
+        
+        for (AActor* Actor : AllActors)
+        {
+            if (Actor && Actor->GetName() == TargetActorName)
+            {
+                TargetActor = Actor;
+                break;
+            }
+        }
+
+        if (!TargetActor)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Actor not found: %s"), *TargetActorName));
+        }
+
+        // Focus on the actor
+        ViewportClient->SetViewLocation(TargetActor->GetActorLocation() - FVector(Distance, 0.0f, 0.0f));
+    }
+    // Otherwise use the provided location
+    else if (HasLocation)
+    {
+        ViewportClient->SetViewLocation(Location - FVector(Distance, 0.0f, 0.0f));
+    }
+    else
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Either 'target' or 'location' must be provided"));
+    }
+
+    // Set orientation if provided
+    if (HasOrientation)
+    {
+        ViewportClient->SetViewRotation(Orientation);
+    }
+
+    // Force viewport to redraw
+    ViewportClient->Invalidate();
+
+    TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+    ResultObj->SetBoolField(TEXT("success"), true);
+    return ResultObj;
+}
+
+TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleTakeScreenshot(const TSharedPtr<FJsonObject>& Params)
+{
+    // Optional file path parameter.
+    // If omitted, save to <Project>/Saved/Screenshots/Flockbay with an auto-generated filename.
+    FString FilePath;
+    const bool bHasFilePath = Params->TryGetStringField(TEXT("filepath"), FilePath);
+
+    FString FileName;
+    Params->TryGetStringField(TEXT("filename"), FileName);
+    
+    const FString DefaultDir = FPaths::Combine(FPaths::ProjectSavedDir(), TEXT("Screenshots"), TEXT("Flockbay"));
+    IFileManager::Get().MakeDirectory(*DefaultDir, /*Tree*/ true);
+
+    if (bHasFilePath)
+    {
+        FilePath = FilePath.TrimStartAndEnd();
+        if (FilePath.IsEmpty())
+        {
+            FilePath.Reset();
+        }
+        else if (!FPaths::IsRelative(FilePath))
+        {
+            // absolute path: use as-is
+        }
+        else
+        {
+            // relative path: resolve under our default screenshots folder
+            FilePath = FPaths::Combine(DefaultDir, FilePath);
+        }
+    }
+
+    if (FilePath.IsEmpty())
+    {
+        if (FileName.IsEmpty())
+        {
+            FileName = FString::Printf(TEXT("mcp_screenshot_%s"), *FDateTime::Now().ToString(TEXT("%Y%m%d_%H%M%S")));
+        }
+        FilePath = FPaths::Combine(DefaultDir, FileName);
+    }
+
+    // Ensure the file path has a proper extension
+    if (!FilePath.EndsWith(TEXT(".png")))
+    {
+        FilePath += TEXT(".png");
+    }
+
+    FString Source = TEXT("auto");
+    if (Params->TryGetStringField(TEXT("source"), Source))
+    {
+        Source = Source.TrimStartAndEnd().ToLower();
+        if (Source.IsEmpty())
+        {
+            Source = TEXT("auto");
+        }
+    }
+
+    double WidthNum = 0.0;
+    double HeightNum = 0.0;
+    int32 RequestedWidth = 0;
+    int32 RequestedHeight = 0;
+    if (Params->TryGetNumberField(TEXT("width"), WidthNum))
+    {
+        RequestedWidth = static_cast<int32>(WidthNum);
+    }
+    else if (Params->TryGetNumberField(TEXT("resX"), WidthNum))
+    {
+        RequestedWidth = static_cast<int32>(WidthNum);
+    }
+
+    if (Params->TryGetNumberField(TEXT("height"), HeightNum))
+    {
+        RequestedHeight = static_cast<int32>(HeightNum);
+    }
+    else if (Params->TryGetNumberField(TEXT("resY"), HeightNum))
+    {
+        RequestedHeight = static_cast<int32>(HeightNum);
+    }
+
+    const bool bPieRunning = (GEditor && GEditor->PlayWorld);
+    const bool bWantsPie = (Source == TEXT("pie"));
+    const bool bWantsEditor = (Source == TEXT("editor"));
+    const bool bAuto = (Source == TEXT("auto"));
+    if (!bWantsPie && !bWantsEditor && !bAuto)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Invalid screenshot source: %s (expected: auto|pie|editor)"), *Source));
+    }
+
+    const bool bUsePieCapture = bWantsPie || (bAuto && bPieRunning);
+    if (bUsePieCapture)
+    {
+        if (!bPieRunning)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is not running (PlayWorld is null)."));
+        }
+
+        UWorld* PlayWorld = GEditor->PlayWorld;
+        APlayerController* PC = PlayWorld ? PlayWorld->GetFirstPlayerController() : nullptr;
+        if (!PC)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to find PlayerController in PlayWorld."));
+        }
+
+        APlayerCameraManager* PCM = PC->PlayerCameraManager;
+        if (!PCM)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to find PlayerCameraManager (PlayerController.PlayerCameraManager is null)."));
+        }
+
+        int32 Width = RequestedWidth;
+        int32 Height = RequestedHeight;
+        if (Width <= 0 || Height <= 0)
+        {
+            if (ULocalPlayer* LocalPlayer = PC->GetLocalPlayer())
+            {
+                if (LocalPlayer->ViewportClient && LocalPlayer->ViewportClient->Viewport)
+                {
+                    const FIntPoint ViewSize = LocalPlayer->ViewportClient->Viewport->GetSizeXY();
+                    if (ViewSize.X > 0 && ViewSize.Y > 0)
+                    {
+                        if (Width <= 0)
+                        {
+                            Width = ViewSize.X;
+                        }
+                        if (Height <= 0)
+                        {
+                            Height = ViewSize.Y;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (Width <= 0 || Height <= 0)
+        {
+            Width = 1280;
+            Height = 720;
+        }
+
+        const FVector CamLocation = PCM->GetCameraLocation();
+        const FRotator CamRotation = PCM->GetCameraRotation();
+
+        FActorSpawnParameters SpawnParams;
+        SpawnParams.ObjectFlags |= RF_Transient;
+        SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
+
+        ASceneCapture2D* CaptureActor = PlayWorld->SpawnActor<ASceneCapture2D>(ASceneCapture2D::StaticClass(), CamLocation, CamRotation, SpawnParams);
+        if (!CaptureActor)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn ASceneCapture2D for PIE screenshot capture."));
+        }
+
+        USceneCaptureComponent2D* CaptureComp = CaptureActor->GetCaptureComponent2D();
+        if (!CaptureComp)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get SceneCaptureComponent2D from ASceneCapture2D."));
+        }
+
+        UTextureRenderTarget2D* RenderTarget = NewObject<UTextureRenderTarget2D>(CaptureComp);
+        if (!RenderTarget)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create UTextureRenderTarget2D."));
+        }
+        RenderTarget->InitCustomFormat(Width, Height, PF_B8G8R8A8, /*bForceLinearGamma*/ false);
+        RenderTarget->ClearColor = FLinearColor::Black;
+        RenderTarget->UpdateResourceImmediate(true);
+
+        CaptureComp->TextureTarget = RenderTarget;
+        CaptureComp->bCaptureEveryFrame = false;
+        CaptureComp->bCaptureOnMovement = false;
+        CaptureComp->CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
+        CaptureComp->FOVAngle = PCM->GetFOVAngle();
+
+        CaptureComp->CaptureScene();
+
+        FTextureRenderTargetResource* RenderResource = RenderTarget->GameThread_GetRenderTargetResource();
+        if (!RenderResource)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get render target resource for PIE screenshot capture."));
+        }
+
+        TArray<FColor> Bitmap;
+        if (!RenderResource->ReadPixels(Bitmap))
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to read pixels from PIE render target."));
+        }
+
+        CaptureActor->Destroy();
+
+        if (!SavePngToFile(FilePath, Width, Height, Bitmap))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to save screenshot PNG to disk."));
+        }
+
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetStringField(TEXT("filepath"), FilePath);
+        ResultObj->SetStringField(TEXT("source"), TEXT("pie"));
+        ResultObj->SetNumberField(TEXT("width"), Width);
+        ResultObj->SetNumberField(TEXT("height"), Height);
+        return ResultObj;
+    }
+
+    // Editor screenshot (prefer offscreen SceneCapture2D; ReadPixels on the active viewport can be blank/stale when the OS window isn't focused).
+    if (GEditor && GEditor->GetActiveViewport())
+    {
+        GEditor->RedrawAllViewports(/*bInvalidateHitProxies*/ true);
+
+        FViewport* Viewport = GEditor->GetActiveViewport();
+        FEditorViewportClient* ViewportClient = (FEditorViewportClient*)Viewport->GetClient();
+        if (!ViewportClient)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get active editor viewport client for editor screenshot capture."));
+        }
+
+        UWorld* EditorWorld = ViewportClient->GetWorld();
+        if (!EditorWorld)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get editor world for editor screenshot capture."));
+        }
+
+        int32 Width = RequestedWidth;
+        int32 Height = RequestedHeight;
+        if (Width <= 0 || Height <= 0)
+        {
+            const FIntPoint ViewSize = Viewport->GetSizeXY();
+            if (ViewSize.X > 0 && ViewSize.Y > 0)
+            {
+                if (Width <= 0)
+                {
+                    Width = ViewSize.X;
+                }
+                if (Height <= 0)
+                {
+                    Height = ViewSize.Y;
+                }
+            }
+        }
+        if (Width <= 0 || Height <= 0)
+        {
+            Width = 1280;
+            Height = 720;
+        }
+
+        const FVector CamLocation = ViewportClient->GetViewLocation();
+        const FRotator CamRotation = ViewportClient->GetViewRotation();
+
+        FActorSpawnParameters SpawnParams;
+        SpawnParams.ObjectFlags |= RF_Transient;
+        SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
+
+        ASceneCapture2D* CaptureActor =
+            EditorWorld->SpawnActor<ASceneCapture2D>(ASceneCapture2D::StaticClass(), CamLocation, CamRotation, SpawnParams);
+        if (!CaptureActor)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn ASceneCapture2D for editor screenshot capture."));
+        }
+
+        USceneCaptureComponent2D* CaptureComp = CaptureActor->GetCaptureComponent2D();
+        if (!CaptureComp)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get SceneCaptureComponent2D from ASceneCapture2D (editor capture)."));
+        }
+
+        UTextureRenderTarget2D* RenderTarget = NewObject<UTextureRenderTarget2D>(CaptureComp);
+        if (!RenderTarget)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create UTextureRenderTarget2D (editor capture)."));
+        }
+        RenderTarget->InitCustomFormat(Width, Height, PF_B8G8R8A8, /*bForceLinearGamma*/ false);
+        RenderTarget->ClearColor = FLinearColor::Black;
+        RenderTarget->UpdateResourceImmediate(true);
+
+        CaptureComp->TextureTarget = RenderTarget;
+        CaptureComp->bCaptureEveryFrame = false;
+        CaptureComp->bCaptureOnMovement = false;
+        CaptureComp->CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
+        CaptureComp->FOVAngle = ViewportClient->ViewFOV;
+
+        CaptureComp->CaptureScene();
+
+        FTextureRenderTargetResource* RenderResource = RenderTarget->GameThread_GetRenderTargetResource();
+        if (!RenderResource)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get render target resource for editor screenshot capture."));
+        }
+
+        TArray<FColor> Bitmap;
+        if (!RenderResource->ReadPixels(Bitmap))
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to read pixels from editor render target."));
+        }
+
+        CaptureActor->Destroy();
+
+        if (!SavePngToFile(FilePath, Width, Height, Bitmap))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to save editor screenshot PNG to disk."));
+        }
+
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetStringField(TEXT("filepath"), FilePath);
+        ResultObj->SetStringField(TEXT("source"), TEXT("editor"));
+        ResultObj->SetNumberField(TEXT("width"), Width);
+        ResultObj->SetNumberField(TEXT("height"), Height);
+        return ResultObj;
+    }
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to take screenshot."));
+}