ue-mcp 1.2.4 → 1.3.0

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

@@ -152,6 +152,22 @@ void FGameplayHandlers::RegisterHandlers(FMCPHandlerRegistry& Registry)
 	// New handlers
 	Registry.RegisterHandler(TEXT("get_behavior_tree_info"), &GetBehaviorTreeInfo);
 	Registry.RegisterHandler(TEXT("read_behavior_tree_graph"), &ReadBehaviorTreeGraph);
+	// #919: pick BT nodes and read only their own UPROPERTY values.
+	Registry.RegisterHandler(TEXT("read_bt_node_properties"), &ReadBTNodeProperties);
+	// #940: inventory BTTask nodes, FilterClass included.
+	Registry.RegisterHandler(TEXT("list_bt_tasks"), &ListBTTasks);
+	// #919/#940: one scoped write onto an owned BT node subobject. Registered
+	// under both names because a caller reaching for the task-specific one
+	// should not have to know it is the general node setter.
+	Registry.RegisterHandler(TEXT("set_bt_node_property"), &SetBTNodeProperty);
+	Registry.RegisterHandler(TEXT("set_bt_task_property"), &SetBTNodeProperty);
+	// #889/#947: author the BT editor graph and recompile it into the runnable
+	// tree. Reading and writing node properties only reaches nodes that already
+	// exist; these are what put nodes there, reconnect them and reorder them.
+	Registry.RegisterHandler(TEXT("list_bt_graph_nodes"), &ListBTGraphNodes);
+	Registry.RegisterHandler(TEXT("add_bt_node"), &AddBTNode);
+	Registry.RegisterHandler(TEXT("move_bt_node"), &MoveBTNode);
+	Registry.RegisterHandler(TEXT("remove_bt_node"), &RemoveBTNode);
 	Registry.RegisterHandler(TEXT("add_perception_component"), &AddPerceptionComponent);
 	Registry.RegisterHandler(TEXT("configure_ai_perception_sense"), &ConfigureAiPerceptionSense);
 	Registry.RegisterHandler(TEXT("add_state_tree_component"), &AddStateTreeComponent);
@@ -877,13 +893,18 @@ TSharedPtr<FJsonValue> FGameplayHandlers::CreateStateTree(const TSharedPtr<FJson
 TSharedPtr<FJsonValue> FGameplayHandlers::GetStateTreeRuntime(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("pie"));
 	UWorld* World = ResolveWorldFromParams(Params, *WorldScope);
 	if (!World) return MCPError(FString::Printf(TEXT("World not available for scope '%s'"), *WorldScope));
 
-	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();
 
 	// Find a component that carries StateTree runtime data (by having an
 	// InstanceData property of type FStateTreeInstanceData + a StateTreeRef).
@@ -1232,7 +1253,18 @@ TSharedPtr<FJsonValue> FGameplayHandlers::FindNavPath(const TSharedPtr<FJsonObje
 	// matching navigation filter / agent.
 	AActor* Context = nullptr;
 	FString ContextLabel = OptionalString(Params, TEXT("pathfindingContext"));
-	if (!ContextLabel.IsEmpty()) Context = FindActorByLabel(World, ContextLabel);
+	if (!ContextLabel.IsEmpty() || Params->HasField(TEXT("pathfindingContextPath")))
+	{
+		// #983: the context actor decides which navigation filter and agent
+		// answer the query, so picking the wrong namesake changes the path.
+		FMCPActorSelector ContextSel;
+		ContextSel.LabelKey = TEXT("pathfindingContext");
+		ContextSel.PathKey = TEXT("pathfindingContextPath");
+		ContextSel.Match = EMCPActorMatch::LabelNameOrPath;
+		TSharedPtr<FJsonValue> ContextErr;
+		Context = MCPResolveActor(World, Params, ContextErr, ContextSel);
+		if (!Context && MCPIsAmbiguousActorError(ContextErr)) return ContextErr;
+	}
 
 	UNavigationPath* Path = NavSys->FindPathToLocationSynchronously(World, Start, End, Context);
 	auto Result = MCPSuccess();
@@ -1815,72 +1847,9 @@ TSharedPtr<FJsonValue> FGameplayHandlers::SetBehaviorTreeBlackboard(const TShare
 	return MCPResult(Result);
 }
 
-TSharedPtr<FJsonValue> FGameplayHandlers::GetBehaviorTreeInfo(const TSharedPtr<FJsonObject>& Params)
-{
-	FString AssetPath;
-	if (auto Err = RequireStringAlt(Params, TEXT("assetPath"), TEXT("path"), AssetPath)) return Err;
-
-	UObject* Asset = UEditorAssetLibrary::LoadAsset(AssetPath);
-	if (!Asset)
-	{
-		return MCPError(FString::Printf(TEXT("BehaviorTree not found: %s"), *AssetPath));
-	}
-
-	auto Result = MCPSuccess();
-	Result->SetStringField(TEXT("path"), AssetPath);
-	Result->SetStringField(TEXT("name"), Asset->GetName());
-	Result->SetStringField(TEXT("className"), Asset->GetClass()->GetName());
-
-	// Try to read blackboard asset
-	FProperty* BBProp = Asset->GetClass()->FindPropertyByName(TEXT("BlackboardAsset"));
-	if (BBProp)
-	{
-		FObjectProperty* ObjProp = CastField<FObjectProperty>(BBProp);
-		if (ObjProp)
-		{
-			UObject* BB = ObjProp->GetObjectPropertyValue(BBProp->ContainerPtrToValuePtr<void>(Asset));
-			if (BB)
-			{
-				Result->SetStringField(TEXT("blackboardAsset"), BB->GetPathName());
-
-				// Try to read blackboard keys
-				TArray<TSharedPtr<FJsonValue>> KeysArray;
-				FProperty* KeysProp = BB->GetClass()->FindPropertyByName(TEXT("Keys"));
-				if (KeysProp)
-				{
-					FArrayProperty* ArrProp = CastField<FArrayProperty>(KeysProp);
-					if (ArrProp)
-					{
-						FScriptArrayHelper ArrayHelper(ArrProp, ArrProp->ContainerPtrToValuePtr<void>(BB));
-						for (int32 i = 0; i < ArrayHelper.Num(); i++)
-						{
-							TSharedPtr<FJsonObject> KeyObj = MakeShared<FJsonObject>();
-							UObject* KeyEntry = *reinterpret_cast<UObject**>(ArrayHelper.GetRawPtr(i));
-							if (KeyEntry)
-							{
-								FProperty* NameProp = KeyEntry->GetClass()->FindPropertyByName(TEXT("EntryName"));
-								if (NameProp)
-								{
-									FString EntryName;
-									NameProp->ExportTextItem_Direct(EntryName, NameProp->ContainerPtrToValuePtr<void>(KeyEntry), nullptr, KeyEntry, PPF_None);
-									KeyObj->SetStringField(TEXT("name"), EntryName);
-								}
-								else
-								{
-									KeyObj->SetStringField(TEXT("name"), KeyEntry->GetName());
-								}
-							}
-							KeysArray.Add(MakeShared<FJsonValueObject>(KeyObj));
-						}
-					}
-				}
-				Result->SetArrayField(TEXT("blackboardKeys"), KeysArray);
-			}
-		}
-	}
-
-	return MCPResult(Result);
-}
+// get_behavior_tree_info and read_behavior_tree_graph moved to
+// GameplayHandlers_BehaviorTree.cpp, alongside the node-level BT reads and
+// writes they now share their walker and property reflection with.
 
 TSharedPtr<FJsonValue> FGameplayHandlers::AddPerceptionComponent(const TSharedPtr<FJsonObject>& Params)
 {
@@ -2256,97 +2225,6 @@ TSharedPtr<FJsonValue> FGameplayHandlers::AddSmartObjectComponent(const TSharedP
 
 	return MCPResult(Result);
 }
-TSharedPtr<FJsonValue> FGameplayHandlers::ReadBehaviorTreeGraph(const TSharedPtr<FJsonObject>& Params)
-{
-	FString AssetPath;
-	if (auto Err = RequireStringAlt(Params, TEXT("assetPath"), TEXT("path"), AssetPath)) return Err;
-
-	UBehaviorTree* BT = LoadObject<UBehaviorTree>(nullptr, *AssetPath);
-	if (!BT) return MCPError(FString::Printf(TEXT("BehaviorTree not found: %s"), *AssetPath));
-
-	TFunction<TSharedPtr<FJsonObject>(UBTNode*)> Walk;
-	Walk = [&](UBTNode* Node) -> TSharedPtr<FJsonObject>
-	{
-		if (!Node) return nullptr;
-		TSharedPtr<FJsonObject> NObj = MakeShared<FJsonObject>();
-		NObj->SetStringField(TEXT("class"), Node->GetClass()->GetName());
-		NObj->SetStringField(TEXT("name"), Node->GetName());
-		FProperty* NameProp = Node->GetClass()->FindPropertyByName(TEXT("NodeName"));
-		if (NameProp)
-		{
-			FString NodeDisplay;
-			NameProp->ExportText_Direct(NodeDisplay, NameProp->ContainerPtrToValuePtr<void>(Node), nullptr, Node, PPF_None);
-			NObj->SetStringField(TEXT("nodeName"), NodeDisplay);
-		}
-
-		if (UBTCompositeNode* Comp = Cast<UBTCompositeNode>(Node))
-		{
-			NObj->SetStringField(TEXT("kind"), TEXT("composite"));
-
-			TArray<TSharedPtr<FJsonValue>> ChildrenArr;
-			for (const FBTCompositeChild& Child : Comp->Children)
-			{
-				TSharedPtr<FJsonObject> ChildEntry = MakeShared<FJsonObject>();
-				if (Child.ChildComposite)
-					ChildEntry->SetObjectField(TEXT("child"), Walk(Child.ChildComposite));
-				else if (Child.ChildTask)
-					ChildEntry->SetObjectField(TEXT("child"), Walk(Child.ChildTask));
-
-				TArray<TSharedPtr<FJsonValue>> Decs;
-				for (UBTDecorator* D : Child.Decorators)
-				{
-					if (!D) continue;
-					TSharedPtr<FJsonObject> DObj = MakeShared<FJsonObject>();
-					DObj->SetStringField(TEXT("class"), D->GetClass()->GetName());
-					DObj->SetStringField(TEXT("name"), D->GetName());
-					Decs.Add(MakeShared<FJsonValueObject>(DObj));
-				}
-				ChildEntry->SetArrayField(TEXT("decorators"), Decs);
-				ChildrenArr.Add(MakeShared<FJsonValueObject>(ChildEntry));
-			}
-			NObj->SetArrayField(TEXT("children"), ChildrenArr);
-
-			TArray<TSharedPtr<FJsonValue>> Services;
-			for (UBTService* S : Comp->Services)
-			{
-				if (!S) continue;
-				TSharedPtr<FJsonObject> SObj = MakeShared<FJsonObject>();
-				SObj->SetStringField(TEXT("class"), S->GetClass()->GetName());
-				SObj->SetStringField(TEXT("name"), S->GetName());
-				Services.Add(MakeShared<FJsonValueObject>(SObj));
-			}
-			NObj->SetArrayField(TEXT("services"), Services);
-		}
-		else if (Cast<UBTTaskNode>(Node))
-		{
-			NObj->SetStringField(TEXT("kind"), TEXT("task"));
-		}
-		return NObj;
-	};
-
-	auto Result = MCPSuccess();
-	Result->SetStringField(TEXT("assetPath"), AssetPath);
-	Result->SetStringField(TEXT("name"), BT->GetName());
-	if (BT->BlackboardAsset)
-	{
-		Result->SetStringField(TEXT("blackboardAsset"), BT->BlackboardAsset->GetPathName());
-	}
-	if (BT->RootNode)
-	{
-		Result->SetObjectField(TEXT("root"), Walk(BT->RootNode));
-	}
-	TArray<TSharedPtr<FJsonValue>> RootDecs;
-	for (UBTDecorator* D : BT->RootDecorators)
-	{
-		if (!D) continue;
-		TSharedPtr<FJsonObject> DObj = MakeShared<FJsonObject>();
-		DObj->SetStringField(TEXT("class"), D->GetClass()->GetName());
-		DObj->SetStringField(TEXT("name"), D->GetName());
-		RootDecs.Add(MakeShared<FJsonValueObject>(DObj));
-	}
-	Result->SetArrayField(TEXT("rootDecorators"), RootDecs);
-	return MCPResult(Result);
-}
 
 // ─────────────────────────────────────────────────────────────
 // #163  get_navmesh_details - Detailed ARecastNavMesh configuration

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

@@ -4,11 +4,55 @@
 #include "Dom/JsonValue.h"
 #include "Dom/JsonObject.h"
 
+class UBehaviorTree;
+class UBlackboardData;
+class UBTNode;
+
 class FGameplayHandlers
 {
 public:
 	static void RegisterHandlers(class FMCPHandlerRegistry& Registry);
 
+	// BehaviorTree introspection primitives, shared by the BT handlers and
+	// exercised directly by the automation tests in Private/Tests, which build
+	// nodes in memory rather than round-tripping an asset through disk.
+	// Definitions live in GameplayHandlers_BehaviorTree.cpp.
+
+	/** Every key on a Blackboard asset: name, type, sync flag, description. */
+	static TArray<TSharedPtr<FJsonValue>> DescribeBlackboardKeys(const UBlackboardData* Blackboard);
+
+	/** One BT node as JSON: identity, decorator configuration (#888), and the
+	 *  node's own UPROPERTY values when asked for (#919). PropertyFilter holds
+	 *  lowercased property names; empty means "everything the node class adds". */
+	static TSharedPtr<FJsonObject> DescribeBTNode(
+		UBTNode* Node,
+		const FString& NodePath,
+		const FString& ParentPath,
+		bool bIncludeProperties,
+		bool bIncludeInherited,
+		const TSet<FString>& PropertyFilter);
+
+	/** Read one dotted/indexed property path off a BT node. A UE 5.8
+	 *  FValueOrBBKey_* field comes back unpacked into defaultValue + key. */
+	static TSharedPtr<FJsonValue> ReadBTNodeProperty(UBTNode* Node, const FString& PropertyPath, FString& OutError);
+
+	/** Write one dotted/indexed property path on a BT node. A scalar aimed at a
+	 *  FValueOrBBKey_* field lands on its DefaultValue; a class-valued leaf
+	 *  accepts a short name, a /Script path or a Blueprint asset path. */
+	static bool WriteBTNodeProperty(UBTNode* Node, const FString& PropertyPath, const TSharedPtr<FJsonValue>& Value, FString& OutError);
+
+	/** Load a BehaviorTree from a caller-supplied asset path, or null. */
+	static UBehaviorTree* LoadBehaviorTree(const FString& AssetPath);
+
+	/** Every runtime node in a compiled tree, keyed by the structural address
+	 *  the read surface reports ("Root.Children[0].Decorators[1]").
+	 *
+	 *  #889 authoring addresses editor-graph nodes by guid, but a caller who
+	 *  just read the tree holds these addresses instead, so both surfaces walk
+	 *  this one map rather than growing a second scheme. Defined next to the
+	 *  walker it wraps in GameplayHandlers_BehaviorTree.cpp. */
+	static void MapBTNodeAddresses(UBehaviorTree* Tree, TMap<UBTNode*, FString>& OutAddresses);
+
 private:
 	static TSharedPtr<FJsonValue> CreateSmartObjectDefinition(const TSharedPtr<FJsonObject>& Params);
 	// #778: per-player Enhanced Input applied mapping contexts, per PIE world.
@@ -77,9 +121,30 @@ private:
 	// Helper to create a blueprint with a given parent class
 	static TSharedPtr<FJsonValue> CreateBlueprintWithParent(const FString& Name, const FString& PackagePath, const FString& ParentClassPath, const FString& FriendlyTypeName);
 
-	// v0.7.11 - BT graph traversal (#124)
+	// v0.7.11 - BT graph traversal (#124), decorator configuration added (#888)
 	static TSharedPtr<FJsonValue> ReadBehaviorTreeGraph(const TSharedPtr<FJsonObject>& Params);
 
+	// #919: pick BT nodes by class/name/path/kind and return their UPROPERTY
+	// values, instead of an unfiltered whole-asset property dump.
+	static TSharedPtr<FJsonValue> ReadBTNodeProperties(const TSharedPtr<FJsonObject>& Params);
+
+	// #940: inventory BTTask nodes across one asset or a directory, including
+	// the UE 5.8 FValueOrBBKey_Class shape of BTTask_MoveTo::FilterClass.
+	static TSharedPtr<FJsonValue> ListBTTasks(const TSharedPtr<FJsonObject>& Params);
+
+	// #919/#940: scoped nested write onto one owned BT node subobject.
+	// Registered as both set_bt_node_property and set_bt_task_property.
+	static TSharedPtr<FJsonValue> SetBTNodeProperty(const TSharedPtr<FJsonObject>& Params);
+
+	// #889/#947: BehaviorTree editor-graph authoring. These drive
+	// UBehaviorTreeGraph and its node classes, then recompile the graph into
+	// the runnable UBTCompositeNode tree, which is the step no reflected
+	// runtime API can perform. Definitions in GameplayHandlers_BTAuthoring.cpp.
+	static TSharedPtr<FJsonValue> ListBTGraphNodes(const TSharedPtr<FJsonObject>& Params);
+	static TSharedPtr<FJsonValue> AddBTNode(const TSharedPtr<FJsonObject>& Params);
+	static TSharedPtr<FJsonValue> MoveBTNode(const TSharedPtr<FJsonObject>& Params);
+	static TSharedPtr<FJsonValue> RemoveBTNode(const TSharedPtr<FJsonObject>& Params);
+
 	// #163 - detailed navmesh configuration
 	static TSharedPtr<FJsonValue> GetNavmeshDetails(const TSharedPtr<FJsonObject>& Params);