ue-mcp 1.2.4 → 1.3.0

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

@@ -13,6 +13,7 @@
 
 #include "HandlerRegistry.h"
 #include "HandlerUtils.h"
+#include "HandlerFunctionCall.h"
 #include "HandlerJsonProperty.h"
 #include "HandlerPropertyText.h"
 #include "JsonSerializer.h"
@@ -278,6 +279,37 @@ namespace
 		// down the world and collects garbage, and CallTarget is read again
 		// below to export out params.
 		FGCObjectScopeGuard TargetGuard(CallTarget);
+
+		// #973: read the callspace BEFORE the guard opens. That is the only
+		// moment it is observable: inside the guard
+		// GAllowActorScriptExecutionInEditor makes AActor::GetFunctionCallspace
+		// answer Local in its first branch, so a UFUNCTION(Server) runs its
+		// implementation on this copy instead of being sent.
+		FString NaturalCallspace;
+		const bool bCallspaceForcedLocal =
+			MCPFunctionCall::WouldForceNetCallspaceLocal(CallTarget, Func, NaturalCallspace);
+
+		// The opt-in escape from that override: queued for the next engine tick,
+		// the send happens after the guard's scope has ended and the call routes
+		// the way it would from game code. Nothing can be read back, because the
+		// response is written before the call runs.
+		if (OptionalBool(Params, TEXT("deferToNextTick"), false))
+		{
+			Result->SetStringField(TEXT("functionName"), FunctionName);
+			Result->SetBoolField(TEXT("deferred"), true);
+			if (!NaturalCallspace.IsEmpty())
+			{
+				Result->SetStringField(TEXT("netCallspace"), NaturalCallspace);
+			}
+			Result->SetStringField(TEXT("note"), TEXT(
+				"Queued for the next engine tick, outside the editor script-execution guard, so a replicated function "
+				"routes through GetFunctionCallspace normally instead of being forced to Local. Return and out "
+				"parameters are not reported: the response is written before the call runs. Read the effect back "
+				"afterwards with editor(get_object_properties) or editor(get_runtime_values)."));
+			MCPFunctionCall::DeferProcessEventToNextTick(CallTarget, Func, MoveTemp(ParamBuf));
+			return MCPResult(Result);
+		}
+
 		// #806: an actor whose world never initialised for play (every editor
 		// world) silently skips ProcessEvent unless the function is marked
 		// CallInEditor, leaving the zeroed frame to be exported as the result.
@@ -286,44 +318,26 @@ namespace
 			FEditorScriptExecutionGuard ScriptGuard;
 			CallTarget->ProcessEvent(Func, ParamBuf.GetData());
 		}
+
+		if (bCallspaceForcedLocal)
+		{
+			Result->SetStringField(TEXT("netCallspace"), NaturalCallspace);
+			Result->SetBoolField(TEXT("callspaceForcedLocal"), true);
+			Result->SetStringField(TEXT("warning"),
+				MCPFunctionCall::DescribeForcedLocalCallspace(FunctionName, NaturalCallspace));
+		}
 		// NOTE: UObject* out-params live in ParamBuf, which is raw bytes and
 		// invisible to GC. Guarding them after the fact cannot help - by then a
 		// collection has already happened - so out-param objects are validated
 		// with IsValid() at export time instead.
 
+		// #885: containers come back as real JSON, scalars and structs keep
+		// their export-text spelling, and an object out-param the call
+		// destroyed is reported as such rather than dereferenced. All three
+		// live in MCPFunctionCall so the wire format cannot diverge between
+		// the call actions.
 		TSharedPtr<FJsonObject> OutVals = MakeShared<FJsonObject>();
-		for (TFieldIterator<FProperty> It(Func); It && (It->PropertyFlags & CPF_Parm); ++It)
-		{
-			FProperty* P = *It;
-			if (P->PropertyFlags & (CPF_ReturnParm | CPF_OutParm))
-			{
-				// An object out-param may have been collected during the call:
-				// ParamBuf is raw bytes and invisible to GC, so exporting it
-				// would dereference freed memory. Check first, then export
-				// through the same path as every other property so the wire
-				// format does not diverge between call actions.
-				if (FObjectPropertyBase* OP = CastField<FObjectPropertyBase>(P))
-				{
-					UObject* Out = OP->GetObjectPropertyValue(OP->ContainerPtrToValuePtr<void>(ParamBuf.GetData()));
-					if (!Out)
-					{
-						OutVals->SetStringField(P->GetName(), TEXT("None"));
-						continue;
-					}
-					if (!IsValid(Out))
-					{
-						// Distinct from "None": the call returned an object and
-						// then something destroyed it. Reporting an empty string
-						// for both would read as a null return.
-						OutVals->SetStringField(P->GetName(), TEXT("(collected during the call)"));
-						continue;
-					}
-				}
-				FString S;
-				P->ExportTextItem_Direct(S, P->ContainerPtrToValuePtr<void>(ParamBuf.GetData()), nullptr, CallTarget, PPF_None);
-				OutVals->SetStringField(P->GetName(), S);
-			}
-		}
+		MCPFunctionCall::WriteOutputs(OutVals, Func, ParamBuf.GetData(), CallTarget);
 		Cleanup();
 
 		Result->SetStringField(TEXT("functionName"), FunctionName);
@@ -652,13 +666,15 @@ TSharedPtr<FJsonValue> FEditorHandlers::ReadBoneTransforms(const TSharedPtr<FJso
 	if (!World) return MCPError(TEXT("No world available"));
 
 	FString ActorLabel;
-	if (auto Err = RequireString(Params, TEXT("actorLabel"), ActorLabel)) return Err;
+	if (auto Err = RequireStringAlt(Params, TEXT("actorLabel"), TEXT("actorPath"), ActorLabel)) return Err;
 
-	AActor* Actor = FindActorByLabelNameOrPath(World, ActorLabel);
-	if (!Actor)
-	{
-		return MCPError(FString::Printf(TEXT("Actor not found (by label, name or path): %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();
 
 	const FString ComponentName = OptionalString(Params, TEXT("componentName"));
 	USkeletalMeshComponent* Mesh = nullptr;
@@ -866,6 +882,7 @@ TSharedPtr<FJsonValue> FEditorHandlers::ReadBoneTransforms(const TSharedPtr<FJso
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("component"), Mesh->GetName());
 	Result->SetStringField(TEXT("space"), bRelative ? TEXT("relative") : (bComponentSpace ? TEXT("component") : TEXT("world")));
 	if (bRelative) Result->SetStringField(TEXT("relativeTo"), RelativeTo);
@@ -891,13 +908,15 @@ TSharedPtr<FJsonValue> FEditorHandlers::TeleportRuntimeActor(const TSharedPtr<FJ
 	if (!World) return MCPError(TEXT("PIE is not running - teleport_runtime_actor targets a live world"));
 
 	FString ActorLabel;
-	if (auto Err = RequireString(Params, TEXT("actorLabel"), ActorLabel)) return Err;
+	if (auto Err = RequireStringAlt(Params, TEXT("actorLabel"), TEXT("actorPath"), ActorLabel)) return Err;
 
-	AActor* Actor = FindActorByLabelNameOrPath(World, ActorLabel);
-	if (!Actor)
-	{
-		return MCPError(FString::Printf(TEXT("Actor not found in the live world (by label, name or path): %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();
 
 	const FVector StartLocation = Actor->GetActorLocation();
 	const FVector Location = Params->HasField(TEXT("location"))
@@ -937,6 +956,7 @@ TSharedPtr<FJsonValue> FEditorHandlers::TeleportRuntimeActor(const TSharedPtr<FJ
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("world"), World->GetPathName());
 	Result->SetStringField(TEXT("netMode"), DescribePIENetMode(World));
 	Result->SetBoolField(TEXT("teleported"), bMoved);
@@ -973,13 +993,15 @@ TSharedPtr<FJsonValue> FEditorHandlers::SetMovementMode(const TSharedPtr<FJsonOb
 	if (!World) return MCPError(TEXT("PIE is not running - set_movement_mode targets a live world"));
 
 	FString ActorLabel;
-	if (auto Err = RequireString(Params, TEXT("actorLabel"), ActorLabel)) return Err;
+	if (auto Err = RequireStringAlt(Params, TEXT("actorLabel"), TEXT("actorPath"), ActorLabel)) return Err;
 
-	AActor* Actor = FindActorByLabelNameOrPath(World, ActorLabel);
-	if (!Actor)
-	{
-		return MCPError(FString::Printf(TEXT("Actor not found in the live world (by label, name or path): %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();
 
 	UCharacterMovementComponent* Movement = Actor->FindComponentByClass<UCharacterMovementComponent>();
 	if (!Movement)
@@ -1055,6 +1077,7 @@ TSharedPtr<FJsonValue> FEditorHandlers::SetMovementMode(const TSharedPtr<FJsonOb
 
 	auto Result = MCPSuccess();
 	Result->SetStringField(TEXT("actorLabel"), ActorLabel);
+	Result->SetStringField(TEXT("actorPath"), Actor->GetPathName());
 	Result->SetStringField(TEXT("component"), Movement->GetName());
 	Result->SetStringField(TEXT("world"), World->GetPathName());
 	Result->SetStringField(TEXT("netMode"), DescribePIENetMode(World));