ue-mcp 1.2.4 → 1.3.0

package/plugin/ue_mcp_bridge/Source/UE_MCP_Bridge/Private/Handlers/LevelHandlers_InstanceProjection_Internal.h

@@ -0,0 +1,63 @@
+#pragma once
+
+#include "CoreMinimal.h"
+#include "Dom/JsonObject.h"
+#include "Dom/JsonValue.h"
+
+class UWorld;
+
+namespace UEMCPInstanceProjection
+{
+	constexpr int32 DefaultMaxInstances = 10000;
+	constexpr int32 HardMaxInstances = 50000;
+	constexpr int32 MaxReportedSamples = 32;
+	constexpr int32 MaxFilteredSurfaceHits = 64;
+
+	enum class EMissPolicy : uint8
+	{
+		Error,
+		Skip,
+	};
+
+	struct FProjectionPlanEntry
+	{
+		int32 InstanceIndex = INDEX_NONE;
+		FTransform Before = FTransform::Identity;
+		FTransform After = FTransform::Identity;
+		bool bHit = false;
+		FString HitActorLabel;
+		FString HitActorClass;
+		FString MissReason;
+	};
+
+	struct FProjectionPlan
+	{
+		TArray<FProjectionPlanEntry> Entries;
+		int32 HitCount = 0;
+		int32 MissCount = 0;
+		double MinDistance = TNumericLimits<double>::Max();
+		double MaxDistance = 0.0;
+	};
+
+	bool ParseMissPolicy(const FString& InValue, EMissPolicy& OutPolicy);
+
+	FVector ApplySurfaceOffset(const FVector& ImpactPoint, const FVector& ImpactNormal, double SurfaceOffset);
+
+	/**
+	 * Testable core for the registered editor-world handler.
+	 *
+	 * Raw bridge parameters:
+	 * - actorLabel (required), componentName (required only when ambiguous)
+	 * - instanceIndices (optional; omitted means all), maxInstances (default
+	 *   10000, hard limit 50000)
+	 * - direction, traceStartOffset, traceDistance, channel, traceComplex
+	 * - surfaceActorClass, surfaceActorLabels, surfaceOffset
+	 * - onMiss (error or skip), dryRun (default true)
+	 *
+	 * A commit still runs the complete preflight in the same game-thread call,
+	 * then applies all hits in one editor transaction without saving a package.
+	 */
+	TSharedPtr<FJsonValue> SnapInstancesToSurfaceInWorld(
+		UWorld* World,
+		const TSharedPtr<FJsonObject>& Params);
+}

package/plugin/ue_mcp_bridge/Source/UE_MCP_Bridge/Private/Handlers/LevelHandlers_Lights.cpp

@@ -168,6 +168,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::SpawnLight(const TSharedPtr<FJsonObject>&
 	auto Result = MCPSuccess();
 	MCPSetCreated(Result);
 	Result->SetStringField(TEXT("actorLabel"), FinalLabel);
+	Result->SetStringField(TEXT("actorPath"), NewLight->GetPathName());
 	Result->SetStringField(TEXT("actorName"), NewLight->GetName());
 	Result->SetStringField(TEXT("lightType"), LightType);
 
@@ -182,15 +183,14 @@ TSharedPtr<FJsonValue> FLevelHandlers::SpawnLight(const TSharedPtr<FJsonObject>&
 TSharedPtr<FJsonValue> FLevelHandlers::SetLightProperties(const TSharedPtr<FJsonObject>& Params)
 {
 	FString ActorLabel;
-	if (auto Err = RequireString(Params, TEXT("actorLabel"), ActorLabel)) return Err;
+	if (auto Err = RequireStringAlt(Params, TEXT("actorLabel"), TEXT("actorPath"), ActorLabel)) return Err;
 
 	REQUIRE_EDITOR_WORLD(World);
 
-	AActor* Actor = FindActorByLabel(World, ActorLabel);
-	if (!Actor)
-	{
-		return MCPError(FString::Printf(TEXT("Actor not found: %s"), *ActorLabel));
-	}
+	TSharedPtr<FJsonValue> ActorErr;
+	AActor* Actor = MCPResolveActor(World, Params, ActorErr);
+	if (!Actor) return ActorErr;
+	ActorLabel = Actor->GetActorLabel();
 
 	ULightComponent* LightComponent = Actor->FindComponentByClass<ULightComponent>();
 	// #608: USkyLightComponent is not a ULightComponent, so it was previously
@@ -447,6 +447,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::SetLightProperties(const TSharedPtr<FJson
 	auto Result = MCPSuccess();
 	MCPSetUpdated(Result);
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetNumberField(TEXT("intensity"), LightComponent ? (double)LightComponent->Intensity : (SkyForProps ? (double)SkyForProps->Intensity : 0.0));
 	Result->SetBoolField(TEXT("isSkyLight"), LightComponent == nullptr && SkyForProps != nullptr);
 	Result->SetStringField(TEXT("mobility"), MobilityToString(PropertyComponent->Mobility));
@@ -517,16 +518,45 @@ TSharedPtr<FJsonValue> FLevelHandlers::SetFogProperties(const TSharedPtr<FJsonOb
 	UWorld* World = ResolveWorldFromParams(Params, *WorldScope);
 	if (!World) return MCPError(TEXT("World not available"));
 
-	FString ActorLabel = OptionalString(Params, TEXT("actorLabel"));
-
+	// #983: a named selector goes through the shared resolver, so a duplicated
+	// label is refused with the candidate paths rather than tuning whichever
+	// fog the actor iterator reached first. Without one, "the only fog in the
+	// level" is a default this action is entitled to, and several is reported
+	// rather than picked between.
 	AExponentialHeightFog* Fog = nullptr;
-	for (TActorIterator<AExponentialHeightFog> It(World); It; ++It)
+	FMCPActorSelector FogSelector;
+	FogSelector.bRequired = false;
+	TSharedPtr<FJsonValue> FogError;
+	if (AActor* Named = MCPResolveActor(World, Params, FogError, FogSelector))
+	{
+		Fog = Cast<AExponentialHeightFog>(Named);
+		if (!Fog)
+		{
+			return MCPError(FString::Printf(
+				TEXT("Actor '%s' is a %s, not an ExponentialHeightFog"),
+				*Named->GetActorLabel(), *Named->GetClass()->GetName()));
+		}
+	}
+	else if (FogError.IsValid())
+	{
+		return FogError;
+	}
+	else
 	{
-		if (ActorLabel.IsEmpty() || It->GetActorLabel() == ActorLabel)
+		TArray<AExponentialHeightFog*> Fogs;
+		for (TActorIterator<AExponentialHeightFog> It(World); It; ++It)
+		{
+			if (IsValid(*It)) Fogs.Add(*It);
+		}
+		if (Fogs.Num() > 1)
 		{
-			Fog = *It;
-			break;
+			TArray<FString> Labels;
+			for (AExponentialHeightFog* Candidate : Fogs) Labels.Add(Candidate->GetActorLabel());
+			return MCPError(FString::Printf(
+				TEXT("%d ExponentialHeightFog actors in the level; pass actorLabel or actorPath to choose. Available: [%s]"),
+				Fogs.Num(), *FString::Join(Labels, TEXT(", "))));
 		}
+		Fog = Fogs.Num() == 1 ? Fogs[0] : nullptr;
 	}
 	if (!Fog) return MCPError(TEXT("No ExponentialHeightFog actor found"));
 
@@ -594,6 +624,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::SetFogProperties(const TSharedPtr<FJsonOb
 	auto Result = MCPSuccess();
 	MCPSetUpdated(Result);
 	Result->SetStringField(TEXT("actorLabel"), Fog->GetActorLabel());
+	Result->SetStringField(TEXT("actorPath"), Fog->GetPathName());
 	Result->SetNumberField(TEXT("fogDensity"), FC->FogDensity);
 	Result->SetNumberField(TEXT("fogHeightFalloff"), FC->FogHeightFalloff);
 	return MCPResult(Result);

package/plugin/ue_mcp_bridge/Source/UE_MCP_Bridge/Private/Handlers/LevelHandlers_MultiLevel.cpp

@@ -1,6 +1,7 @@
 #include "LevelHandlers.h"
 
 #include "HandlerUtils.h"
+#include "HandlerEditorState.h"
 
 #include "Editor.h"
 #include "Engine/Brush.h"
@@ -40,41 +41,6 @@ namespace
 		TArray<FString> ProtectedLabels;
 	};
 
-	TArray<TSharedPtr<FJsonValue>> StringListToJson(const TArray<FString>& Values)
-	{
-		TArray<TSharedPtr<FJsonValue>> Result;
-		Result.Reserve(Values.Num());
-		for (const FString& Value : Values)
-		{
-			Result.Add(MakeShared<FJsonValueString>(Value));
-		}
-		return Result;
-	}
-
-	void CollectDirtyEditorPackageNames(TArray<FString>& OutPackageNames)
-	{
-		OutPackageNames.Reset();
-		TArray<UPackage*> DirtyPackages;
-		FEditorFileUtils::GetDirtyContentPackages(DirtyPackages);
-		FEditorFileUtils::GetDirtyWorldPackages(DirtyPackages);
-		for (UPackage* Package : DirtyPackages)
-		{
-			if (!Package || !Package->IsDirty())
-			{
-				continue;
-			}
-
-			const FString PackageName = Package->GetName();
-			if (PackageName.StartsWith(TEXT("/Script/")))
-			{
-				continue;
-			}
-
-			OutPackageNames.AddUnique(PackageName);
-		}
-		OutPackageNames.Sort();
-	}
-
 	UClass* ResolveExpectedActorClass(const FString& ClassPath, FString& OutError)
 	{
 		if (ClassPath.IsEmpty())
@@ -209,12 +175,12 @@ namespace
 		Result->SetNumberField(TEXT("matched"), Request.MatchedLabels.Num());
 		Result->SetNumberField(TEXT("deleted"), Request.Deleted);
 		Result->SetBoolField(TEXT("saved"), Request.bSaved);
-		Result->SetArrayField(TEXT("matchedLabels"), StringListToJson(Request.MatchedLabels));
-		Result->SetArrayField(TEXT("missingLabels"), StringListToJson(Request.MissingLabels));
-		Result->SetArrayField(TEXT("duplicateLabels"), StringListToJson(Request.DuplicateLabels));
-		Result->SetArrayField(TEXT("wrongClassLabels"), StringListToJson(Request.WrongClassLabels));
-		Result->SetArrayField(TEXT("nonPersistentLabels"), StringListToJson(Request.NonPersistentLabels));
-		Result->SetArrayField(TEXT("protectedLabels"), StringListToJson(Request.ProtectedLabels));
+		Result->SetArrayField(TEXT("matchedLabels"), MCPStringListToJson(Request.MatchedLabels));
+		Result->SetArrayField(TEXT("missingLabels"), MCPStringListToJson(Request.MissingLabels));
+		Result->SetArrayField(TEXT("duplicateLabels"), MCPStringListToJson(Request.DuplicateLabels));
+		Result->SetArrayField(TEXT("wrongClassLabels"), MCPStringListToJson(Request.WrongClassLabels));
+		Result->SetArrayField(TEXT("nonPersistentLabels"), MCPStringListToJson(Request.NonPersistentLabels));
+		Result->SetArrayField(TEXT("protectedLabels"), MCPStringListToJson(Request.ProtectedLabels));
 		if (!Request.ExpectedClassPath.IsEmpty())
 		{
 			Result->SetStringField(TEXT("expectedClassPath"), Request.ExpectedClassPath);
@@ -399,7 +365,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::DeleteExactLabeledActorsInLevels(
 	}
 
 	TArray<FString> InitialDirtyPackages;
-	CollectDirtyEditorPackageNames(InitialDirtyPackages);
+	MCPEditorState::CollectDirtyEditorPackageNames(InitialDirtyPackages);
 	if (!InitialDirtyPackages.IsEmpty())
 	{
 		auto Result = MCPSuccess();
@@ -407,7 +373,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::DeleteExactLabeledActorsInLevels(
 		Result->SetStringField(
 			TEXT("error"),
 			TEXT("Refusing to load levels while content or map packages are dirty"));
-		Result->SetArrayField(TEXT("dirtyPackages"), StringListToJson(InitialDirtyPackages));
+		Result->SetArrayField(TEXT("dirtyPackages"), MCPStringListToJson(InitialDirtyPackages));
 		return MCPResult(Result);
 	}
 
@@ -477,7 +443,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::DeleteExactLabeledActorsInLevels(
 		Result->SetArrayField(TEXT("levels"), LevelResults);
 		if (!DirtyPackages.IsEmpty())
 		{
-			Result->SetArrayField(TEXT("dirtyPackages"), StringListToJson(DirtyPackages));
+			Result->SetArrayField(TEXT("dirtyPackages"), MCPStringListToJson(DirtyPackages));
 		}
 		return MCPResult(Result);
 	};
@@ -529,7 +495,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::DeleteExactLabeledActorsInLevels(
 		}
 
 		TArray<FString> DirtyAfterLoad;
-		CollectDirtyEditorPackageNames(DirtyAfterLoad);
+		MCPEditorState::CollectDirtyEditorPackageNames(DirtyAfterLoad);
 		if (!DirtyAfterLoad.IsEmpty())
 		{
 			return BuildResult(
@@ -605,7 +571,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::DeleteExactLabeledActorsInLevels(
 		}
 
 		TArray<FString> DirtyAfterLoad;
-		CollectDirtyEditorPackageNames(DirtyAfterLoad);
+		MCPEditorState::CollectDirtyEditorPackageNames(DirtyAfterLoad);
 		if (!DirtyAfterLoad.IsEmpty())
 		{
 			return BuildResult(
@@ -717,7 +683,7 @@ TSharedPtr<FJsonValue> FLevelHandlers::DeleteExactLabeledActorsInLevels(
 		Request.bSaved = true;
 
 		TArray<FString> DirtyAfterSave;
-		CollectDirtyEditorPackageNames(DirtyAfterSave);
+		MCPEditorState::CollectDirtyEditorPackageNames(DirtyAfterSave);
 		if (!DirtyAfterSave.IsEmpty())
 		{
 			return BuildResult(