ultimate-unreal-engine-mcp 0.1.3 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultimate-unreal-engine-mcp",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "MCP server giving AI assistants full access to Unreal Engine 5.7 projects",
   "type": "module",
   "engines": {

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/{Optional/MCPAICommands.cpp.disabled → MCPAICommands.cpp}

@@ -1,4 +1,4 @@
-// MCPAICommands.cpp (Plan 22-01)
+// MCPAICommands.cpp (Plan 33-04)
 // Implements five AI system inspection command handlers for the MCP bridge:
 //   ai.behaviorTree  -- inspect Behavior Tree node hierarchy, decorators, services (AI-01)
 //   ai.stateTree     -- read State Tree states, transitions, and tasks (AI-02)
@@ -11,31 +11,31 @@
 // asset_path is validated to start with "/Game/" or "/Engine/" before any
 // StaticLoadObject call to prevent path traversal (T-22-01).
 // Behavior Tree recursion is capped at 100 levels to prevent DoS (T-22-02).
+//
+// Reflection-based: only ai.stateTree removes StateTree.h and StateTreeTypes.h.
+// BehaviorTree/Blackboard/EQS/NavMesh handlers KEEP their direct core module includes.
 
 #include "MCPAICommands.h"
+#include "ReflectionHelpers.h"
 
-// Behavior Tree headers
+// Behavior Tree headers (AIModule -- in Build.cs, always available)
 #include "BehaviorTree/BehaviorTree.h"
 #include "BehaviorTree/BTCompositeNode.h"
 #include "BehaviorTree/BTDecorator.h"
 #include "BehaviorTree/BTService.h"
 #include "BehaviorTree/BTTaskNode.h"
 
-// Blackboard headers
+// Blackboard headers (AIModule -- in Build.cs)
 #include "BehaviorTree/BlackboardData.h"
 #include "BehaviorTree/Blackboard/BlackboardKeyType.h"
 
-// State Tree headers
-#include "StateTree.h"
-#include "StateTreeTypes.h"
-
-// EQS headers
+// EQS headers (AIModule -- in Build.cs)
 #include "EnvironmentQuery/EnvQuery.h"
 #include "EnvironmentQuery/EnvQueryOption.h"
 #include "EnvironmentQuery/EnvQueryGenerator.h"
 #include "EnvironmentQuery/EnvQueryTest.h"
 
-// Navigation System headers
+// Navigation System headers (NavigationSystem -- in Build.cs)
 #include "NavigationSystem.h"
 #include "NavigationData.h"
 #include "NavMesh/RecastNavMesh.h"
@@ -90,7 +90,7 @@ static FString BuildAIErrorResponse(const FString& CorrId, const FString& Error)
  * Validate that asset_path starts with "/Game/" or "/Engine/" to prevent
  * path traversal attacks (T-22-01).
  */
-static bool IsValidAssetPath(const FString& AssetPath)
+static bool IsValidAIAssetPath(const FString& AssetPath)
 {
 	return AssetPath.StartsWith(TEXT("/Game/")) || AssetPath.StartsWith(TEXT("/Engine/"));
 }
@@ -164,20 +164,6 @@ static TSharedPtr<FJsonObject> BuildBTCompositeNodeJson(UBTCompositeNode* Compos
 					ChildrenArray.Add(MakeShared<FJsonValueObject>(ChildJson));
 				}
 			}
-
-			// Each child slot may also have decorators attached to the child edge.
-			for (UBTDecorator* ChildDecorator : ChildInfo.Decorators)
-			{
-				if (!ChildDecorator)
-				{
-					continue;
-				}
-				TSharedPtr<FJsonObject> DecObj = MakeShared<FJsonObject>();
-				DecObj->SetStringField(TEXT("node_name"), ChildDecorator->GetNodeName());
-				DecObj->SetStringField(TEXT("node_class"), ChildDecorator->GetClass()->GetName());
-				DecObj->SetStringField(TEXT("node_type"), TEXT("Decorator"));
-				// Edge decorators are reported as children of the composite for context.
-			}
 		}
 	}
 	else
@@ -250,6 +236,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 	// Returns: asset_path, root_node (recursive tree with node_name, node_class,
 	//   node_type, decorators[], services[], children[]).
 	// Recursion limited to 100 levels (T-22-02).
+	// Uses core AIModule types -- direct includes (in Build.cs).
 	// -----------------------------------------------------------------------
 	Router.RegisterHandler(TEXT("ai.behaviorTree"), [](TSharedPtr<FJsonObject> Cmd, FMCPResponseSender SendResponse)
 	{
@@ -271,7 +258,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 		}
 
 		// Validate path prefix (T-22-01).
-		if (!IsValidAssetPath(AssetPath))
+		if (!IsValidAIAssetPath(AssetPath))
 		{
 			SendResponse(BuildAIErrorResponse(CorrId, TEXT("invalid_asset_path")) + TEXT("\n"));
 			return;
@@ -316,15 +303,29 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 	// Required payload field: asset_path (must start with /Game/ or /Engine/).
 	// Returns: asset_path, states[] (name, type, parent_state, tasks[], transitions[]).
 	//
-	// UE 5.7 API Note: UStateTree stores its states in FStateTreeEditorData
-	// (accessible via StateTree->EditorData when WITH_EDITORONLY_DATA is defined).
-	// In compiled/cooked form the states are baked into FStateTreeStateHandle arrays.
-	// We use EditorData here since this handler runs in the editor context only.
+	// REFLECTION-BASED: StateTree.h and StateTreeTypes.h are NOT included.
+	// UStateTree is located at runtime via FindObject<UClass>.
+	// Returns module_not_available when StateTreeModule is not loaded.
 	// -----------------------------------------------------------------------
 	Router.RegisterHandler(TEXT("ai.stateTree"), [](TSharedPtr<FJsonObject> Cmd, FMCPResponseSender SendResponse)
 	{
 		const FString CorrId = Cmd->GetStringField(TEXT("correlationId"));
 
+		// Runtime check: StateTreeModule must be loaded.
+		if (!MCPReflect::CheckModuleLoaded(TEXT("StateTreeModule")))
+		{
+			MCPReflect::SendModuleNotAvailable(SendResponse, CorrId, TEXT("StateTreeModule"));
+			return;
+		}
+
+		// Find UStateTree class via reflection.
+		UClass* StateTreeClass = FindObject<UClass>(nullptr, TEXT("/Script/StateTreeModule.StateTree"));
+		if (!StateTreeClass)
+		{
+			SendResponse(BuildAIErrorResponse(CorrId, TEXT("StateTree_class_not_found")) + TEXT("\n"));
+			return;
+		}
+
 		// Extract payload.
 		TSharedPtr<FJsonObject> Payload;
 		const TSharedPtr<FJsonValue>* PayloadVal = Cmd->Values.Find(TEXT("payload"));
@@ -341,14 +342,14 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 		}
 
 		// Validate path prefix (T-22-01).
-		if (!IsValidAssetPath(AssetPath))
+		if (!IsValidAIAssetPath(AssetPath))
 		{
 			SendResponse(BuildAIErrorResponse(CorrId, TEXT("invalid_asset_path")) + TEXT("\n"));
 			return;
 		}
 
-		// Load the StateTree asset.
-		UStateTree* StateTree = Cast<UStateTree>(StaticLoadObject(UStateTree::StaticClass(), nullptr, *AssetPath));
+		// Load the StateTree asset as UObject (no direct class cast needed).
+		UObject* StateTree = StaticLoadObject(StateTreeClass, nullptr, *AssetPath);
 		if (!StateTree)
 		{
 			SendResponse(BuildAIErrorResponse(CorrId, TEXT("state_tree_not_found")) + TEXT("\n"));
@@ -356,19 +357,16 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 		}
 
 		// Access states via EditorData (editor-only property, available in editor context).
-		// UStateTree exposes EditorData as a UObject* property; cast to UStateTreeEditorData
-		// to get the States array. If EditorData is not available (cooked build), fall back
-		// to reporting only the asset name and state count from the baked structure.
+		// UStateTree exposes EditorData as a UObject* property.
 		TArray<TSharedPtr<FJsonValue>> StatesArray;
 
 #if WITH_EDITORONLY_DATA
-		if (StateTree->EditorData)
-		{
-			// UStateTreeEditorData stores states in a TArray<FStateTreeStateBase*> or
-			// TArray<FStateTreeEditorState>. Access via reflection to remain resilient
-			// to minor API changes across UE 5.x point releases.
-			UObject* EditorDataObj = StateTree->EditorData;
+		// Access EditorData via FProperty reflection.
+		FObjectProperty* EditorDataProp = CastField<FObjectProperty>(StateTree->GetClass()->FindPropertyByName(TEXT("EditorData")));
+		UObject* EditorDataObj = EditorDataProp ? EditorDataProp->GetObjectPropertyValue_InContainer(StateTree) : nullptr;
 
+		if (EditorDataObj)
+		{
 			// Walk the states using the property system to remain compatible with
 			// UE 5.7 API changes. Look for an array property named "States" on EditorData.
 			FArrayProperty* StatesProp = nullptr;
@@ -455,15 +453,14 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 							FStructProperty* TaskElemProp = CastField<FStructProperty>(TasksProp->Inner);
 							for (int32 j = 0; j < TasksHelper.Num(); ++j)
 							{
-								void* TaskPtr = TasksHelper.GetRawPtr(j);
 								FString TaskClass = TEXT("UnknownTask");
 								if (TaskElemProp)
 								{
-									// Try to get the task class name from the Instance property.
-									FStructProperty* InstanceProp = CastField<FStructProperty>(TaskElemProp->Struct->FindPropertyByName(TEXT("Node")));
-									if (InstanceProp)
+									// Try to get the task class name from the Node property.
+									FStructProperty* NodeProp = CastField<FStructProperty>(TaskElemProp->Struct->FindPropertyByName(TEXT("Node")));
+									if (NodeProp)
 									{
-										TaskClass = InstanceProp->Struct->GetName();
+										TaskClass = NodeProp->Struct->GetName();
 									}
 									else
 									{
@@ -541,12 +538,6 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 		// If we couldn't extract states via EditorData, report what we can.
 		if (StatesArray.IsEmpty())
 		{
-			// UStateTree baked data: StateTree->NumStates (available at runtime).
-			// Report state count as the only available info without editor data.
-			int32 NumStates = 0;
-#if WITH_EDITORONLY_DATA
-			// Already attempted above; fall through.
-#endif
 			UE_LOG(LogTemp, Warning, TEXT("[MCPBridge] ai.stateTree: No editor state data available for '%s'."), *AssetPath);
 		}
 
@@ -562,6 +553,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 	// Lists Blackboard keys with their types and instance-sync flags.
 	// Required payload field: asset_path (must start with /Game/ or /Engine/).
 	// Returns: asset_path, keys[] (key_name, key_type, instance_synced), parent_asset.
+	// Uses core AIModule types -- direct includes (in Build.cs).
 	// -----------------------------------------------------------------------
 	Router.RegisterHandler(TEXT("ai.blackboard"), [](TSharedPtr<FJsonObject> Cmd, FMCPResponseSender SendResponse)
 	{
@@ -583,7 +575,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 		}
 
 		// Validate path prefix (T-22-01).
-		if (!IsValidAssetPath(AssetPath))
+		if (!IsValidAIAssetPath(AssetPath))
 		{
 			SendResponse(BuildAIErrorResponse(CorrId, TEXT("invalid_asset_path")) + TEXT("\n"));
 			return;
@@ -646,6 +638,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 	// Inspects an EQS query template: options, generators, tests, scoring.
 	// Required payload field: asset_path (must start with /Game/ or /Engine/).
 	// Returns: asset_path, options[] (generator_class, generator_name, tests[]).
+	// Uses core AIModule types -- direct includes (in Build.cs).
 	// -----------------------------------------------------------------------
 	Router.RegisterHandler(TEXT("ai.eqs"), [](TSharedPtr<FJsonObject> Cmd, FMCPResponseSender SendResponse)
 	{
@@ -667,7 +660,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 		}
 
 		// Validate path prefix (T-22-01).
-		if (!IsValidAssetPath(AssetPath))
+		if (!IsValidAIAssetPath(AssetPath))
 		{
 			SendResponse(BuildAIErrorResponse(CorrId, TEXT("invalid_asset_path")) + TEXT("\n"));
 			return;
@@ -754,7 +747,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 	// Returns: build_status, bounds {min, max}, nav_data_class, agent_radius,
 	//   agent_height, and optionally reachability {is_reachable, path_length, path_cost}.
 	// Single synchronous path query only (T-22-03); no batch queries.
-	// NavMesh data is editor-only and not sensitive (T-22-04, accepted).
+	// Uses core NavigationSystem types -- direct includes (in Build.cs).
 	// -----------------------------------------------------------------------
 	Router.RegisterHandler(TEXT("ai.navmesh"), [](TSharedPtr<FJsonObject> Cmd, FMCPResponseSender SendResponse)
 	{
@@ -838,7 +831,6 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 			NavDataClass = NavData->GetClass()->GetName();
 
 			// Determine build status from the nav data.
-			// UNavigationSystemV1 tracks build status per data actor.
 			BuildStatus = NavData->IsRegistered() ? TEXT("built") : TEXT("not_built");
 
 			// Get bounds from the nav data's runtime bounding box.

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/{Optional/MCPAICommands.h.disabled → MCPAICommands.h}

@@ -1,9 +1,15 @@
-// MCPAICommands.h (Plan 22-01)
+// MCPAICommands.h (Plan 33-04)
 // Declares the registration function for all AI system inspection MCP command handlers.
 // Handlers: ai.behaviorTree, ai.stateTree, ai.blackboard, ai.eqs, ai.navmesh
 //
 // Call RegisterAICommands(*Router) in MCPBridgeSubsystem::Initialize()
 // BEFORE the TCP server starts accepting connections.
+//
+// All handlers compile without optional plugin headers.
+// ai.behaviorTree, ai.blackboard, ai.eqs, ai.navmesh use direct includes
+// from the core AIModule and NavigationSystem modules (in Build.cs).
+// ai.stateTree uses runtime reflection to locate StateTree types and returns
+// "module_not_available" when the StateTreeModule is not loaded.
 
 #pragma once