ue-mcp 1.2.3 → 1.3.0

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

@@ -399,6 +399,7 @@ TSharedPtr<FJsonValue> FNiagaraHandlers::SpawnNiagaraAtLocation(const TSharedPtr
 	if (SpawnedComponent->GetOwner())
 	{
 		Result->SetStringField(TEXT("actorLabel"), SpawnedComponent->GetOwner()->GetActorLabel());
+		Result->SetStringField(TEXT("actorPath"), SpawnedComponent->GetOwner()->GetPathName());
 		Result->SetStringField(TEXT("actorName"), SpawnedComponent->GetOwner()->GetName());
 
 		// Rollback: delete_actor
@@ -476,6 +477,7 @@ TSharedPtr<FJsonValue> FNiagaraHandlers::SpawnNiagaraActor(const TSharedPtr<FJso
 	MCPSetCreated(Result);
 	Result->SetStringField(TEXT("systemPath"), SystemPath);
 	Result->SetStringField(TEXT("actorLabel"), Actor->GetActorLabel());
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("actorName"), Actor->GetName());
 	Result->SetBoolField(TEXT("activated"), bActivate);
 
@@ -491,15 +493,14 @@ TSharedPtr<FJsonValue> FNiagaraHandlers::SpawnNiagaraActor(const TSharedPtr<FJso
 TSharedPtr<FJsonValue> FNiagaraHandlers::ReactivateNiagara(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();
 	UNiagaraComponent* Comp = Actor->FindComponentByClass<UNiagaraComponent>();
 	if (!Comp)
 	{
@@ -513,13 +514,14 @@ TSharedPtr<FJsonValue> FNiagaraHandlers::ReactivateNiagara(const TSharedPtr<FJso
 	auto Result = MCPSuccess();
 	MCPSetUpdated(Result);
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	return MCPResult(Result);
 }
 
 TSharedPtr<FJsonValue> FNiagaraHandlers::SetNiagaraParameter(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;
 
 	FString ParameterName;
 	if (auto Err = RequireString(Params, TEXT("parameterName"), ParameterName)) return Err;
@@ -528,11 +530,10 @@ TSharedPtr<FJsonValue> FNiagaraHandlers::SetNiagaraParameter(const TSharedPtr<FJ
 
 	REQUIRE_EDITOR_WORLD(World);
 
-	AActor* FoundActor = FindActorByLabel(World, ActorLabel);
-	if (!FoundActor)
-	{
-		return MCPError(FString::Printf(TEXT("Actor not found with label: %s"), *ActorLabel));
-	}
+	TSharedPtr<FJsonValue> ActorErr;
+	AActor* FoundActor = MCPResolveActor(World, Params, ActorErr);
+	if (!FoundActor) return ActorErr;
+	ActorLabel = FoundActor->GetActorLabel();
 
 	// Get Niagara component from the actor
 	UNiagaraComponent* NiagaraComp = FoundActor->FindComponentByClass<UNiagaraComponent>();
@@ -589,6 +590,7 @@ TSharedPtr<FJsonValue> FNiagaraHandlers::SetNiagaraParameter(const TSharedPtr<FJ
 
 	MCPSetUpdated(Result);
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), FoundActor->GetPathName());
 	Result->SetStringField(TEXT("parameterName"), ParameterName);
 	Result->SetStringField(TEXT("parameterType"), ParameterType);
 	// No rollback: runtime niagara parameter overrides are ephemeral; replaying is safe.
@@ -1329,7 +1331,7 @@ namespace
 		return Src ? Src->NodeGraph : nullptr;
 	}
 
-	TSharedPtr<FJsonObject> PinToJson(const UEdGraphPin* Pin)
+	TSharedPtr<FJsonObject> NiagaraPinToJson(const UEdGraphPin* Pin)
 	{
 		TSharedPtr<FJsonObject> O = MakeShared<FJsonObject>();
 		O->SetStringField(TEXT("name"), Pin->PinName.ToString());
@@ -1518,8 +1520,8 @@ TSharedPtr<FJsonValue> FNiagaraHandlers::ListModuleInputs(const TSharedPtr<FJson
 			for (UEdGraphPin* Pin : FC->Pins)
 			{
 				if (!Pin) continue;
-				if (Pin->Direction == EGPD_Input)  SwitchPins.Add(MakeShared<FJsonValueObject>(PinToJson(Pin)));
-				if (Pin->Direction == EGPD_Output) Outputs.Add(MakeShared<FJsonValueObject>(PinToJson(Pin)));
+				if (Pin->Direction == EGPD_Input)  SwitchPins.Add(MakeShared<FJsonValueObject>(NiagaraPinToJson(Pin)));
+				if (Pin->Direction == EGPD_Output) Outputs.Add(MakeShared<FJsonValueObject>(NiagaraPinToJson(Pin)));
 			}
 			ModObj->SetArrayField(TEXT("inputs"), Inputs);
 			ModObj->SetNumberField(TEXT("inputCount"), Inputs.Num());

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

@@ -2,6 +2,7 @@
 #include "HandlerRegistry.h"
 #include "HandlerUtils.h"
 #include "HandlerAssetCreate.h"
+#include "HandlerJsonProperty.h"
 #include "VolumeHelpers_Internal.h"
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "AssetToolsModule.h"
@@ -54,148 +55,6 @@
 
 namespace
 {
-	// #149: recursive JSON→FProperty setter used by set_pcg_node_settings.
-	// Handles TArray, TSet, nested structs (JSON objects), UObject/Class refs
-	// from string paths, and soft references. Falls back to ImportText for scalars.
-	static bool SetJsonOnProperty(FProperty* Prop, void* ValueAddr, const TSharedPtr<FJsonValue>& Value, FString& OutError)
-	{
-		if (!Prop || !Value.IsValid() || !ValueAddr) { OutError = TEXT("null property/value/addr"); return false; }
-
-		// TArray
-		if (FArrayProperty* ArrProp = CastField<FArrayProperty>(Prop))
-		{
-			const TArray<TSharedPtr<FJsonValue>>* Items = nullptr;
-			if (!Value->TryGetArray(Items) || !Items) { OutError = TEXT("expected JSON array"); return false; }
-			FScriptArrayHelper H(ArrProp, ValueAddr);
-			H.Resize(Items->Num());
-			for (int32 i = 0; i < Items->Num(); ++i)
-			{
-				FString E;
-				if (!SetJsonOnProperty(ArrProp->Inner, H.GetRawPtr(i), (*Items)[i], E))
-				{
-					OutError = FString::Printf(TEXT("[%d]: %s"), i, *E); return false;
-				}
-			}
-			return true;
-		}
-
-		// TSet
-		if (FSetProperty* SetProp = CastField<FSetProperty>(Prop))
-		{
-			const TArray<TSharedPtr<FJsonValue>>* Items = nullptr;
-			if (!Value->TryGetArray(Items) || !Items) { OutError = TEXT("expected JSON array for TSet"); return false; }
-			FScriptSetHelper H(SetProp, ValueAddr);
-			H.EmptyElements();
-			for (const TSharedPtr<FJsonValue>& V : *Items)
-			{
-				const int32 Idx = H.AddDefaultValue_Invalid_NeedsRehash();
-				uint8* ElemAddr = H.GetElementPtr(Idx);
-				FString E;
-				if (!SetJsonOnProperty(SetProp->ElementProp, ElemAddr, V, E)) { OutError = E; return false; }
-			}
-			H.Rehash();
-			return true;
-		}
-
-		// Struct: recurse on JSON object fields; otherwise fall through to ImportText
-		if (FStructProperty* StructProp = CastField<FStructProperty>(Prop))
-		{
-			const TSharedPtr<FJsonObject>* SubObj = nullptr;
-			if (Value->TryGetObject(SubObj) && SubObj && (*SubObj).IsValid())
-			{
-				for (const auto& Pair : (*SubObj)->Values)
-				{
-					FProperty* SubProp = StructProp->Struct->FindPropertyByName(FName(*Pair.Key));
-					if (!SubProp) { OutError = FString::Printf(TEXT("struct field '%s' not found"), *Pair.Key); return false; }
-					void* SubAddr = SubProp->ContainerPtrToValuePtr<void>(ValueAddr);
-					FString E;
-					if (!SetJsonOnProperty(SubProp, SubAddr, Pair.Value, E))
-					{
-						OutError = FString::Printf(TEXT("%s.%s: %s"), *StructProp->GetName(), *Pair.Key, *E); return false;
-					}
-				}
-				return true;
-			}
-		}
-
-		// Hard UObject ref - accept asset path
-		if (FObjectProperty* ObjProp = CastField<FObjectProperty>(Prop))
-		{
-			FString Path;
-			if (Value->TryGetString(Path) && !Path.IsEmpty())
-			{
-				UObject* Loaded = StaticLoadObject(ObjProp->PropertyClass, nullptr, *Path);
-				if (!Loaded) { OutError = FString::Printf(TEXT("asset not found: %s"), *Path); return false; }
-				ObjProp->SetObjectPropertyValue(ValueAddr, Loaded);
-				return true;
-			}
-		}
-
-		// Hard UClass ref - accept class path
-		if (FClassProperty* ClassProp = CastField<FClassProperty>(Prop))
-		{
-			FString Path;
-			if (Value->TryGetString(Path) && !Path.IsEmpty())
-			{
-				UClass* Loaded = LoadClass<UObject>(nullptr, *Path);
-				if (!Loaded) { OutError = FString::Printf(TEXT("class not found: %s"), *Path); return false; }
-				ClassProp->SetObjectPropertyValue(ValueAddr, Loaded);
-				return true;
-			}
-		}
-
-		// Soft object / soft class - accept path string
-		if (FSoftObjectProperty* SoftObjProp = CastField<FSoftObjectProperty>(Prop))
-		{
-			FString Path;
-			if (Value->TryGetString(Path))
-			{
-				FSoftObjectPath PathObj(Path);
-				FSoftObjectPtr Ptr(PathObj);
-				SoftObjProp->SetPropertyValue(ValueAddr, Ptr);
-				return true;
-			}
-		}
-
-		// Fallback: coerce JSON to string, run ImportText_Direct
-		FString Str;
-		if (Value->TryGetString(Str)) {}
-		else if (Value->Type == EJson::Number) Str = FString::SanitizeFloat(Value->AsNumber());
-		else if (Value->Type == EJson::Boolean) Str = Value->AsBool() ? TEXT("true") : TEXT("false");
-		else Str = Value->AsString();
-
-		const TCHAR* R = Prop->ImportText_Direct(*Str, ValueAddr, nullptr, PPF_None);
-		if (R == nullptr) { OutError = FString::Printf(TEXT("ImportText failed for '%s'"), *Str); return false; }
-		return true;
-	}
-
-	// #149: walk dotted property names into nested structs before assigning.
-	// Enables "SplineMeshDescriptor.StaticMesh" style keys.
-	static bool SetDottedPropertyFromJson(UObject* Owner, const FString& DottedName, const TSharedPtr<FJsonValue>& Value, FString& OutError)
-	{
-		TArray<FString> Parts;
-		DottedName.ParseIntoArray(Parts, TEXT("."));
-		if (Parts.Num() == 0) { OutError = TEXT("empty property name"); return false; }
-
-		void* Container = Owner;
-		UStruct* ContainerStruct = Owner->GetClass();
-		FProperty* Prop = nullptr;
-		for (int32 i = 0; i < Parts.Num(); ++i)
-		{
-			Prop = ContainerStruct->FindPropertyByName(FName(*Parts[i]));
-			if (!Prop) { OutError = FString::Printf(TEXT("property '%s' not found at '%s'"), *Parts[i], *DottedName); return false; }
-			if (i < Parts.Num() - 1)
-			{
-				FStructProperty* SP = CastField<FStructProperty>(Prop);
-				if (!SP) { OutError = FString::Printf(TEXT("'%s' is not a struct - cannot descend"), *Parts[i]); return false; }
-				Container = SP->ContainerPtrToValuePtr<void>(Container);
-				ContainerStruct = SP->Struct;
-			}
-		}
-		void* ValueAddr = Prop->ContainerPtrToValuePtr<void>(Container);
-		return SetJsonOnProperty(Prop, ValueAddr, Value, OutError);
-	}
-
 	// #213: shared class lookup. Mirrors AddPCGNode's tolerant resolver - accepts
 	// short name, "/Script/PCG.X" path, or "U"-prefixed short name.
 	static UClass* FindPCGSettingsClass(const FString& ClassName)
@@ -212,7 +71,7 @@ namespace
 	}
 
 	// #213: locate a node by name within a graph, including Input/Output specials.
-	static UPCGNode* FindNodeByName(UPCGGraph* Graph, const FString& Name)
+	static UPCGNode* FindPCGNodeByName(UPCGGraph* Graph, const FString& Name)
 	{
 		if (!Graph || Name.IsEmpty()) return nullptr;
 		for (UPCGNode* Node : Graph->GetNodes())
@@ -226,7 +85,7 @@ namespace
 
 	// #213: structured property serializer used by export_pcg_graph. Emits every
 	// editable property recursively as JSON so the result round-trips through
-	// SetDottedPropertyFromJson on import. Mirrors the lambda in
+	// MCPJsonProperty::SetDottedPropertyFromJson on import. Mirrors the lambda in
 	// ReadPCGNodeSettings (#214/#215) but kept as a standalone function so both
 	// callers can share it without rebuilding the closure each call.
 	static TSharedPtr<FJsonValue> SerializePropForExport(FProperty* Prop, const void* Addr)
@@ -1014,7 +873,7 @@ TSharedPtr<FJsonValue> FPCGHandlers::SetPCGNodeSettings(const TSharedPtr<FJsonOb
 	for (const auto& Prop : PropertiesToSet)
 	{
 		FString SubErr;
-		if (SetDottedPropertyFromJson(Settings, Prop.Key, Prop.Value, SubErr))
+		if (MCPJsonProperty::SetDottedPropertyFromJson(Settings, Prop.Key, Prop.Value, SubErr))
 		{
 			SetResults->SetField(Prop.Key, Prop.Value);
 		}
@@ -1051,15 +910,14 @@ TSharedPtr<FJsonValue> FPCGHandlers::SetPCGNodeSettings(const TSharedPtr<FJsonOb
 TSharedPtr<FJsonValue> FPCGHandlers::ExecutePCGGraph(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* FoundActor = FindActorByLabel(World, ActorLabel);
-	if (!FoundActor)
-	{
-		return MCPError(FString::Printf(TEXT("Actor not found with label: %s"), *ActorLabel));
-	}
+	TSharedPtr<FJsonValue> ActorErr;
+	AActor* FoundActor = MCPResolveActor(World, Params, ActorErr);
+	if (!FoundActor) return ActorErr;
+	ActorLabel = FoundActor->GetActorLabel();
 
 	// Get PCG component from the actor
 	UPCGComponent* PCGComp = FoundActor->FindComponentByClass<UPCGComponent>();
@@ -1080,6 +938,7 @@ TSharedPtr<FJsonValue> FPCGHandlers::ExecutePCGGraph(const TSharedPtr<FJsonObjec
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), FoundActor->GetPathName());
 	Result->SetStringField(TEXT("componentName"), PCGComp->GetName());
 	if (PCGComp->GetGraph())
 	{
@@ -1349,15 +1208,14 @@ TSharedPtr<FJsonValue> FPCGHandlers::ReadPCGNodeSettings(const TSharedPtr<FJsonO
 TSharedPtr<FJsonValue> FPCGHandlers::GetPCGComponentDetails(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* FoundActor = FindActorByLabel(World, ActorLabel);
-	if (!FoundActor)
-	{
-		return MCPError(FString::Printf(TEXT("Actor not found with label: %s"), *ActorLabel));
-	}
+	TSharedPtr<FJsonValue> ActorErr;
+	AActor* FoundActor = MCPResolveActor(World, Params, ActorErr);
+	if (!FoundActor) return ActorErr;
+	ActorLabel = FoundActor->GetActorLabel();
 
 	// Get all PCG components on the actor
 	TArray<UPCGComponent*> PCGComps;
@@ -1370,6 +1228,7 @@ TSharedPtr<FJsonValue> FPCGHandlers::GetPCGComponentDetails(const TSharedPtr<FJs
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), FoundActor->GetPathName());
 	Result->SetStringField(TEXT("actorClass"), FoundActor->GetClass()->GetName());
 
 	TArray<TSharedPtr<FJsonValue>> ComponentsArray;
@@ -1525,7 +1384,10 @@ TSharedPtr<FJsonValue> FPCGHandlers::SetStaticMeshSpawnerMeshes(const TSharedPtr
 namespace
 {
 	// Locate a UPCGComponent by actor label. Returns error JsonValue on failure.
-	TSharedPtr<FJsonValue> FindPCGComponentByLabel(const FString& ActorLabel, UPCGComponent*& OutComp, AActor*& OutActor)
+	// #983: takes the parameter bag so it can read actorPath, and refuses a
+	// label that names more than one actor rather than regenerating whichever
+	// PCG volume the iterator reached first.
+	TSharedPtr<FJsonValue> FindPCGComponentByLabel(const TSharedPtr<FJsonObject>& Params, UPCGComponent*& OutComp, AActor*& OutActor)
 	{
 		OutComp = nullptr;
 		OutActor = nullptr;
@@ -1537,8 +1399,10 @@ namespace
 		}
 		if (!World) return MCPError(TEXT("Editor world not available"));
 
-		OutActor = FindActorByLabel(World, ActorLabel);
-		if (!OutActor) return MCPError(FString::Printf(TEXT("Actor not found with label: %s"), *ActorLabel));
+		TSharedPtr<FJsonValue> ActorErr;
+		OutActor = MCPResolveActor(World, Params, ActorErr);
+		if (!OutActor) return ActorErr;
+		const FString ActorLabel = OutActor->GetActorLabel();
 		OutComp = OutActor->FindComponentByClass<UPCGComponent>();
 		if (!OutComp) return MCPError(FString::Printf(TEXT("No PCGComponent on actor: %s"), *ActorLabel));
 		return nullptr;
@@ -1553,10 +1417,11 @@ namespace
 TSharedPtr<FJsonValue> FPCGHandlers::ForceRegeneratePCG(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;
 
 	UPCGComponent* PCGComp = nullptr; AActor* Actor = nullptr;
-	if (auto Err = FindPCGComponentByLabel(ActorLabel, PCGComp, Actor)) return Err;
+	if (auto Err = FindPCGComponentByLabel(Params, PCGComp, Actor)) return Err;
+	ActorLabel = Actor->GetActorLabel();
 
 	UPCGGraph* OriginalGraph = PCGComp->GetGraph();
 	if (!OriginalGraph)
@@ -1573,6 +1438,7 @@ TSharedPtr<FJsonValue> FPCGHandlers::ForceRegeneratePCG(const TSharedPtr<FJsonOb
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("componentName"), PCGComp->GetName());
 	Result->SetStringField(TEXT("graphName"), OriginalGraph->GetName());
 	Result->SetStringField(TEXT("graphPath"), OriginalGraph->GetPathName());
@@ -1583,16 +1449,18 @@ TSharedPtr<FJsonValue> FPCGHandlers::ForceRegeneratePCG(const TSharedPtr<FJsonOb
 TSharedPtr<FJsonValue> FPCGHandlers::CleanupPCG(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;
 
 	UPCGComponent* PCGComp = nullptr; AActor* Actor = nullptr;
-	if (auto Err = FindPCGComponentByLabel(ActorLabel, PCGComp, Actor)) return Err;
+	if (auto Err = FindPCGComponentByLabel(Params, PCGComp, Actor)) return Err;
+	ActorLabel = Actor->GetActorLabel();
 
 	const bool bRemoveComponents = OptionalBool(Params, TEXT("removeComponents"), true);
 	PCGComp->Cleanup(bRemoveComponents);
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("componentName"), PCGComp->GetName());
 	Result->SetBoolField(TEXT("removeComponents"), bRemoveComponents);
 	Result->SetBoolField(TEXT("cleaned"), true);
@@ -1602,10 +1470,11 @@ TSharedPtr<FJsonValue> FPCGHandlers::CleanupPCG(const TSharedPtr<FJsonObject>& P
 TSharedPtr<FJsonValue> FPCGHandlers::ToggleGraphPCG(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;
 
 	UPCGComponent* PCGComp = nullptr; AActor* Actor = nullptr;
-	if (auto Err = FindPCGComponentByLabel(ActorLabel, PCGComp, Actor)) return Err;
+	if (auto Err = FindPCGComponentByLabel(Params, PCGComp, Actor)) return Err;
+	ActorLabel = Actor->GetActorLabel();
 
 	// If the caller supplies graphPath, load and use that; otherwise re-apply the current graph.
 	FString GraphPath;
@@ -1626,6 +1495,7 @@ TSharedPtr<FJsonValue> FPCGHandlers::ToggleGraphPCG(const TSharedPtr<FJsonObject
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("componentName"), PCGComp->GetName());
 	Result->SetStringField(TEXT("graphName"), TargetGraph->GetName());
 	Result->SetStringField(TEXT("graphPath"), TargetGraph->GetPathName());
@@ -1758,7 +1628,7 @@ TSharedPtr<FJsonValue> FPCGHandlers::ImportGraph(const TSharedPtr<FJsonObject>&
 			{
 				const FString SettingName(*Pair.Key);
 				FString SubErr;
-				if (SetDottedPropertyFromJson(DefaultSettings, SettingName, Pair.Value, SubErr))
+				if (MCPJsonProperty::SetDottedPropertyFromJson(DefaultSettings, SettingName, Pair.Value, SubErr))
 				{
 					++SettingsApplied;
 				}
@@ -1788,7 +1658,7 @@ TSharedPtr<FJsonValue> FPCGHandlers::ImportGraph(const TSharedPtr<FJsonObject>&
 		auto Resolve = [&](const FString& Name) -> UPCGNode*
 		{
 			if (UPCGNode** Found = ByLocalName.Find(Name); Found && *Found) return *Found;
-			return FindNodeByName(Graph, Name);
+			return FindPCGNodeByName(Graph, Name);
 		};
 
 		auto FirstOutputPin = [](UPCGNode* N) -> FName

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

@@ -67,18 +67,17 @@ namespace
 TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollisionProfile(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;
 
 	FString ProfileName;
 	if (auto Err = RequireString(Params, TEXT("profileName"), ProfileName)) 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();
 
 	// Capture previous profile from first component (for rollback)
 	TArray<UPrimitiveComponent*> PrimitiveComponents;
@@ -95,6 +94,7 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollisionProfile(const TSharedPtr<FJ
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("profileName"), ProfileName);
 
 	if (bAllAlreadyMatch)
@@ -135,7 +135,7 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollisionProfile(const TSharedPtr<FJ
 TSharedPtr<FJsonValue> FPhysicsHandlers::SetPhysicsEnabled(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;
 
 	// #721: the published TS schema names this parameter "simulate" while the
 	// handler historically read only "enabled", so a schema-conformant call
@@ -150,11 +150,10 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetPhysicsEnabled(const TSharedPtr<FJso
 
 	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();
 
 	// Capture previous state for rollback / idempotency check
 	TArray<UPrimitiveComponent*> PrimitiveComponents;
@@ -172,6 +171,7 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetPhysicsEnabled(const TSharedPtr<FJso
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetBoolField(TEXT("enabled"), bEnabled);
 
 	if (bAllAlready)
@@ -212,7 +212,7 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetPhysicsEnabled(const TSharedPtr<FJso
 TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollisionEnabled(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;
 
 	FString CollisionType;
 	if (auto Err = RequireString(Params, TEXT("collisionType"), CollisionType)) return Err;
@@ -242,11 +242,10 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollisionEnabled(const TSharedPtr<FJ
 
 	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();
 
 	// Capture previous state
 	TArray<UPrimitiveComponent*> PrimitiveComponents;
@@ -264,6 +263,7 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollisionEnabled(const TSharedPtr<FJ
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("collisionType"), CollisionType);
 
 	if (bAllAlready)
@@ -350,12 +350,15 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollision(const TSharedPtr<FJsonObje
 		Targets.Add(Prim);
 		TargetDesc = FString::Printf(TEXT("%s:%s"), *AssetPath, *ComponentName);
 	}
-	else if (Params->TryGetStringField(TEXT("actorLabel"), ActorLabel) && !ActorLabel.IsEmpty())
+	else if ((Params->TryGetStringField(TEXT("actorLabel"), ActorLabel) && !ActorLabel.IsEmpty())
+		|| Params->HasField(TEXT("actorPath")))
 	{
 		UWorld* World = GetEditorWorld();
 		if (!World) return MCPError(TEXT("No editor world available"));
-		Actor = FindActorByLabel(World, ActorLabel);
-		if (!Actor) return MCPError(FString::Printf(TEXT("Actor not found: %s"), *ActorLabel));
+		TSharedPtr<FJsonValue> ActorErr;
+		Actor = MCPResolveActor(World, Params, ActorErr);
+		if (!Actor) return ActorErr;
+		ActorLabel = Actor->GetActorLabel();
 
 		TArray<UPrimitiveComponent*> AllPrims;
 		Actor->GetComponents<UPrimitiveComponent>(AllPrims);
@@ -479,15 +482,14 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetCollision(const TSharedPtr<FJsonObje
 TSharedPtr<FJsonValue> FPhysicsHandlers::SetBodyProperties(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();
 
 	// Get all PrimitiveComponents
 	int32 ComponentsModified = 0;
@@ -580,6 +582,7 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetBodyProperties(const TSharedPtr<FJso
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetArrayField(TEXT("propertiesSet"), PropsArray);
 	Result->SetNumberField(TEXT("componentsModified"), ComponentsModified);
 	Result->SetBoolField(TEXT("success"), ComponentsModified > 0);
@@ -610,14 +613,19 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::SetBodyProperties(const TSharedPtr<FJso
 TSharedPtr<FJsonValue> FPhysicsHandlers::AddImpulse(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;
 
 	const FString WorldScope = OptionalString(Params, TEXT("world"), TEXT("auto"));
 	UWorld* World = ResolveWorldFromParams(Params, *WorldScope);
 	if (!World) return MCPError(TEXT("World not available"));
 
-	AActor* Actor = FindActorByLabelNameOrPath(World, ActorLabel);
-	if (!Actor) return MCPError(FString::Printf(TEXT("Actor not found: %s"), *ActorLabel));
+	FMCPActorSelector ActorSel;
+	ActorSel.Match = EMCPActorMatch::LabelNameOrPath;
+	ActorSel.WorldLabel = World->IsGameWorld() ? TEXT("PIE") : TEXT("editor");
+	TSharedPtr<FJsonValue> ActorErr;
+	AActor* Actor = MCPResolveActor(World, Params, ActorErr, ActorSel);
+	if (!Actor) return ActorErr;
+	ActorLabel = Actor->GetActorLabel();
 
 	// Resolve the primitive component: named, or the root.
 	const FString ComponentName = OptionalString(Params, TEXT("componentName"));
@@ -669,6 +677,7 @@ TSharedPtr<FJsonValue> FPhysicsHandlers::AddImpulse(const TSharedPtr<FJsonObject
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), Actor->GetActorLabel());
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("component"), Prim->GetName());
 	Result->SetStringField(TEXT("mode"), Mode);
 	Result->SetObjectField(TEXT("vector"), MCPVec3ToJsonObject(Vec));