ultimate-unreal-engine-mcp 0.1.1 → 0.1.2

package/package.json

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

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/MCPBridgeEditor.Build.cs

@@ -27,6 +27,7 @@ public class MCPBridgeEditor : ModuleRules
             "Kismet",
             "BlueprintGraph",
             "AssetRegistry",
+            "InputCore",
             "EnhancedInput",
             "LevelEditor",
             "SlateCore",
@@ -41,10 +42,12 @@ public class MCPBridgeEditor : ModuleRules
             "AnimGraphRuntime",
             "IKRig",
             "WorldPartitionEditor",
+            "DataLayerEditor",
             "PhysicsCore",
             "MetasoundEngine",
             "MetasoundFrontend",
             "InterchangeEngine",
+            "InterchangeCore",              // UInterchangeSourceData
             "InterchangePipelines",
             "AIModule",
             "StateTreeModule",
@@ -53,13 +56,15 @@ public class MCPBridgeEditor : ModuleRules
             "GameplayTags",             // Phase 25 - GAS
             "GameplayTasks",            // Phase 25 - GAS
             "GeometryCollectionEngine", // Phase 26 - Chaos destruction (UGeometryCollectionComponent)
+            "Chaos",                    // Phase 26 - FManagedArrayCollection, FTransformCollection
+            "ClothingSystemRuntimeCommon", // Phase 26 - UClothingAssetCommon
             "ChaosCloth",               // Phase 26 - Chaos cloth simulation parameters
             "LiveLinkInterface",        // Phase 27 - ILiveLinkClient, FLiveLinkSubjectKey, FLiveLinkSubjectFrameData
             "LiveLink",                 // Phase 27 - ULiveLinkSubjectSettings for per-subject enabled state control
-            "AvalancheRundown",         // Phase 28 - Motion Design Scene State machines (experimental)
             "AvalancheTransition",      // Phase 28 - Motion Design Transition Logic trees (experimental)
             "RemoteControl",            // Phase 28 - Remote Control preset read/write
             "MovieRenderPipelineCore",  // Phase 29 - UMoviePipelineQueue, UMoviePipelineExecutorJob, config/settings types
+            "MovieRenderPipelineSettings", // Phase 29 - UMoviePipelineBurnInSetting
             "MovieRenderPipelineEditor", // Phase 29 - UMoviePipelineQueueSubsystem
             "OnlineSubsystem",          // Phase 30 - IOnlineSubsystem, IOnlineSession, FOnlineSessionSettings
             "OnlineSubsystemUtils",     // Phase 30 - Online subsystem helper utilities

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPAICommands.cpp

@@ -112,19 +112,22 @@ static TSharedPtr<FJsonObject> BuildBTCompositeNodeJson(UBTCompositeNode* Compos
 	NodeObj->SetStringField(TEXT("node_class"), Composite->GetClass()->GetName());
 	NodeObj->SetStringField(TEXT("node_type"), TEXT("Composite"));
 
-	// Build decorators array.
+	// Build decorators array from all children's decorators.
 	TArray<TSharedPtr<FJsonValue>> DecoratorsArray;
-	for (UBTDecorator* Decorator : Composite->Decorators)
+	for (const FBTCompositeChild& Child : Composite->Children)
 	{
-		if (!Decorator)
+		for (UBTDecorator* Decorator : Child.Decorators)
 		{
-			continue;
+			if (!Decorator)
+			{
+				continue;
+			}
+			TSharedPtr<FJsonObject> DecObj = MakeShared<FJsonObject>();
+			DecObj->SetStringField(TEXT("node_name"), Decorator->GetNodeName());
+			DecObj->SetStringField(TEXT("node_class"), Decorator->GetClass()->GetName());
+			DecObj->SetStringField(TEXT("node_type"), TEXT("Decorator"));
+			DecoratorsArray.Add(MakeShared<FJsonValueObject>(DecObj));
 		}
-		TSharedPtr<FJsonObject> DecObj = MakeShared<FJsonObject>();
-		DecObj->SetStringField(TEXT("node_name"), Decorator->GetNodeName());
-		DecObj->SetStringField(TEXT("node_class"), Decorator->GetClass()->GetName());
-		DecObj->SetStringField(TEXT("node_type"), TEXT("Decorator"));
-		DecoratorsArray.Add(MakeShared<FJsonValueObject>(DecObj));
 	}
 	NodeObj->SetArrayField(TEXT("decorators"), DecoratorsArray);
 
@@ -680,7 +683,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 
 		// Iterate the Options array.
 		TArray<TSharedPtr<FJsonValue>> OptionsArray;
-		for (UEnvQueryOption* Option : Query->Options)
+		for (UEnvQueryOption* Option : Query->GetOptions())
 		{
 			if (!Option)
 			{
@@ -821,7 +824,7 @@ void RegisterAICommands(FMCPCommandRouter& Router)
 		}
 
 		// Get the main navigation data (e.g., RecastNavMesh).
-		ANavigationData* NavData = NavSys->GetMainNavData();
+		ANavigationData* NavData = NavSys->GetDefaultNavDataInstance(FNavigationSystem::DontCreate);
 
 		FString BuildStatus = TEXT("not_built");
 		FString NavDataClass = TEXT("None");

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPActorCommands.cpp

@@ -177,10 +177,10 @@ void RegisterActorCommands(FMCPCommandRouter& Router)
 		}
 
 		// Find actor class by name; try exact name then A-prefixed name.
-		UClass* ActorClass = FindObject<UClass>(ANY_PACKAGE, *ClassName);
+		UClass* ActorClass = FindFirstObject<UClass>( *ClassName);
 		if (!ActorClass)
 		{
-			ActorClass = FindObject<UClass>(ANY_PACKAGE, *(TEXT("A") + ClassName));
+			ActorClass = FindFirstObject<UClass>( *(TEXT("A") + ClassName));
 		}
 		if (!ActorClass)
 		{

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPAnimationCommands.cpp

@@ -17,11 +17,14 @@
 #include "Animation/AnimBlueprint.h"
 #include "Animation/AnimMontage.h"
 #include "Animation/BlendSpace.h"
+#include "Animation/BlendSpace1D.h"
 #include "Animation/AnimSequence.h"
 
 // AnimGraph headers for state machine node access
 #include "AnimGraphNode_StateMachine.h"
+#include "AnimationStateMachineGraph.h"
 #include "AnimStateNode.h"
+#include "AnimStateTransitionNode.h"
 
 // Asset Registry
 #include "AssetRegistry/AssetRegistryModule.h"
@@ -30,6 +33,7 @@
 // IKRetargeter -- from IKRig plugin
 #if WITH_EDITOR
 #include "Retargeter/IKRetargeter.h"
+#include "Retargeter/IKRetargetChainMapping.h"
 #endif
 
 // JSON
@@ -268,8 +272,8 @@ void RegisterAnimationCommands(FMCPCommandRouter& Router)
 				TArray<TSharedPtr<FJsonValue>> StatesArray;
 				TArray<TSharedPtr<FJsonValue>> TransitionsArray;
 
-				// The state machine graph is referenced by BoundGraph.
-				UEdGraph* SMGraph = SMNode->GetBoundGraph();
+				// The state machine graph is referenced by EditorStateMachineGraph.
+				UEdGraph* SMGraph = Cast<UEdGraph>(SMNode->EditorStateMachineGraph.Get());
 				if (SMGraph)
 				{
 					for (UEdGraphNode* SMSubNode : SMGraph->Nodes)
@@ -427,9 +431,9 @@ void RegisterAnimationCommands(FMCPCommandRouter& Router)
 		for (const FCompositeSection& Section : Montage->CompositeSections)
 		{
 			FString LinkedSequenceName;
-			if (Section.LinkedSequence)
+			if (Section.GetLinkedSequence())
 			{
-				LinkedSequenceName = Section.LinkedSequence->GetPathName();
+				LinkedSequenceName = Section.GetLinkedSequence()->GetPathName();
 			}
 
 			TSharedPtr<FJsonObject> SectionObj = MakeShared<FJsonObject>();
@@ -536,7 +540,7 @@ void RegisterAnimationCommands(FMCPCommandRouter& Router)
 		const int32 NumAxes = bIs1D ? 1 : 2; // 1D uses 1 axis, 2D uses 2 axes (index 0 and 1).
 		for (int32 i = 0; i < NumAxes; ++i)
 		{
-			const FBlendParameter& Param = BlendSpace->BlendParameters[i];
+			const FBlendParameter& Param = BlendSpace->GetBlendParameter(i);
 			TSharedPtr<FJsonObject> AxisObj = MakeShared<FJsonObject>();
 			AxisObj->SetStringField(TEXT("name"), Param.DisplayName);
 			AxisObj->SetNumberField(TEXT("min"), static_cast<double>(Param.Min));
@@ -547,7 +551,7 @@ void RegisterAnimationCommands(FMCPCommandRouter& Router)
 
 		// Build samples array from SampleData.
 		TArray<TSharedPtr<FJsonValue>> SamplesArray;
-		for (const FBlendSample& Sample : BlendSpace->SampleData)
+		for (const FBlendSample& Sample : BlendSpace->GetBlendSamples())
 		{
 			FString AnimPath;
 			if (Sample.Animation)
@@ -617,13 +621,13 @@ void RegisterAnimationCommands(FMCPCommandRouter& Router)
 		FString SourceRigPath;
 		FString TargetRigPath;
 
-		const UIKRigDefinition* SourceRig = Retargeter->GetSourceIKRig();
+		const UIKRigDefinition* SourceRig = Retargeter->GetIKRig(ERetargetSourceOrTarget::Source);
 		if (SourceRig)
 		{
 			SourceRigPath = SourceRig->GetPathName();
 		}
 
-		const UIKRigDefinition* TargetRig = Retargeter->GetTargetIKRig();
+		const UIKRigDefinition* TargetRig = Retargeter->GetIKRig(ERetargetSourceOrTarget::Target);
 		if (TargetRig)
 		{
 			TargetRigPath = TargetRig->GetPathName();
@@ -631,11 +635,14 @@ void RegisterAnimationCommands(FMCPCommandRouter& Router)
 
 		// Collect chain mappings.
 		TArray<TSharedPtr<FJsonValue>> ChainMappingsArray;
-		for (const FRetargetChainMap& ChainMap : Retargeter->GetChainMapping())
+		PRAGMA_DISABLE_DEPRECATION_WARNINGS
+		const TArray<FRetargetChainPair>& ChainPairs = Retargeter->GetChainMapping().GetChainPairs();
+		PRAGMA_ENABLE_DEPRECATION_WARNINGS
+		for (const FRetargetChainPair& ChainPair : ChainPairs)
 		{
 			TSharedPtr<FJsonObject> MappingObj = MakeShared<FJsonObject>();
-			MappingObj->SetStringField(TEXT("source_chain"), ChainMap.SourceChain.ToString());
-			MappingObj->SetStringField(TEXT("target_chain"), ChainMap.TargetChain.ToString());
+			MappingObj->SetStringField(TEXT("source_chain"), ChainPair.SourceChainName.ToString());
+			MappingObj->SetStringField(TEXT("target_chain"), ChainPair.TargetChainName.ToString());
 			ChainMappingsArray.Add(MakeShared<FJsonValueObject>(MappingObj));
 		}
 

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPAudioCommands.cpp

@@ -287,7 +287,7 @@ void RegisterAudioCommands(FMCPCommandRouter& Router)
 					AssetObj->SetNumberField(TEXT("sample_rate"),  static_cast<double>(SoundWave->GetSampleRateForCurrentPlatform()));
 					AssetObj->SetNumberField(TEXT("num_channels"), static_cast<double>(SoundWave->NumChannels));
 					// Compression name from the compression format enum via Audio::ToName().
-					const FName CompressionFName = Audio::ToName(SoundWave->GetSoundCompressionType());
+					const FName CompressionFName = Audio::ToName(SoundWave->GetSoundAssetCompressionType());
 					AssetObj->SetStringField(TEXT("compression_name"), CompressionFName.IsNone() ? TEXT("Unknown") : CompressionFName.ToString());
 				}
 				else

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPBlueprintHandlers.cpp

@@ -12,7 +12,7 @@
 
 // Blueprint APIs
 #include "Engine/Blueprint.h"
-#include "BlueprintEditorUtils.h"
+#include "Kismet2/BlueprintEditorUtils.h"
 #include "EdGraph/EdGraph.h"
 #include "EdGraph/EdGraphNode.h"
 #include "EdGraph/EdGraphPin.h"
@@ -28,7 +28,7 @@
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "AssetRegistry/IAssetRegistry.h"
 #include "AssetRegistry/AssetData.h"
-#include "Blueprint/BlueprintTags.h"
+#include "Blueprint/BlueprintSupport.h"
 
 // JSON APIs
 #include "Dom/JsonObject.h"

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPBlueprintWriteHandlers.cpp

@@ -31,6 +31,7 @@
 // Asset APIs
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "UObject/Package.h"
+#include "UObject/SavePackage.h"
 #include "Misc/PackageName.h"
 
 // JSON APIs
@@ -146,17 +147,17 @@ void RegisterBlueprintWriteHandlers(FMCPCommandRouter& Router)
 
 		// T-10-01: Validate the asset path is a well-formed long package name.
 		// Rejects path traversal ("../") and bare filenames.
-		FString ValidationError;
+		FText ValidationError;
 		if (!FPackageName::IsValidLongPackageName(AssetPath, /*bIncludeReadOnlyRoots=*/false, &ValidationError))
 		{
 			UE_LOG(LogTemp, Warning, TEXT("[MCPBridge] blueprint.create: Invalid asset path '%s': %s"),
-				*AssetPath, *ValidationError);
+				*AssetPath, *ValidationError.ToString());
 			SendError(SendResponse, CorrelationId, TEXT("invalid_asset_path"));
 			return;
 		}
 
 		// Resolve the parent class by name (try short name first, then full path).
-		UClass* ParentClass = FindObject<UClass>(ANY_PACKAGE, *ParentClassName);
+		UClass* ParentClass = FindFirstObject<UClass>( *ParentClassName);
 		if (!ParentClass)
 		{
 			ParentClass = LoadObject<UClass>(nullptr, *ParentClassName);
@@ -214,8 +215,10 @@ void RegisterBlueprintWriteHandlers(FMCPCommandRouter& Router)
 		// Save the package to disk so the asset persists.
 		FString FilePath = FPackageName::LongPackageNameToFilename(
 			AssetPath, FPackageName::GetAssetPackageExtension());
-		UPackage::SavePackage(Pkg, NewBP, RF_Standalone, *FilePath,
-			GError, nullptr, false, true, SAVE_NoError);
+		FSavePackageArgs SaveArgs;
+		SaveArgs.TopLevelFlags = RF_Standalone;
+		SaveArgs.SaveFlags = SAVE_NoError;
+		UPackage::SavePackage(Pkg, NewBP, *FilePath, SaveArgs);
 
 		// Notify the Asset Registry so the asset appears in the Content Browser.
 		FAssetRegistryModule::AssetCreated(NewBP);
@@ -288,7 +291,7 @@ void RegisterBlueprintWriteHandlers(FMCPCommandRouter& Router)
 		}
 
 		// T-10-02: Resolve node class and validate it is a non-abstract UEdGraphNode subclass.
-		UClass* NodeClass = FindObject<UClass>(ANY_PACKAGE, *NodeType);
+		UClass* NodeClass = FindFirstObject<UClass>( *NodeType);
 		if (!NodeClass)
 		{
 			UE_LOG(LogTemp, Warning, TEXT("[MCPBridge] blueprint.addNode: Node type '%s' not found"), *NodeType);
@@ -649,9 +652,18 @@ void RegisterBlueprintWriteHandlers(FMCPCommandRouter& Router)
 				return;
 			}
 
-			// T-10-05: SetBlueprintVariableDefaultValue returns bool; use named error code on failure.
-			bool bSet = FBlueprintEditorUtils::SetBlueprintVariableDefaultValue(
-				BP, FName(*TargetName), DefaultValue);
+			// Find the variable in NewVariables and set its DefaultValue directly.
+			bool bSet = false;
+			const FName VarName(*TargetName);
+			for (FBPVariableDescription& VarDesc : BP->NewVariables)
+			{
+				if (VarDesc.VarName == VarName)
+				{
+					VarDesc.DefaultValue = DefaultValue;
+					bSet = true;
+					break;
+				}
+			}
 			if (!bSet)
 			{
 				UE_LOG(LogTemp, Warning, TEXT("[MCPBridge] blueprint.setDefault: Variable '%s' not found in '%s'"),

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPChaosCommands.cpp

@@ -399,10 +399,10 @@ void RegisterChaosCommands(FMCPCommandRouter& Router)
 		GeoComp->Modify();
 
 		// Reset to initial unfractured state.
-		// UGeometryCollectionComponent::SetSimulatePhysics(false) + SetSimulatePhysics(true)
-		// is the reliable fallback approach that works across UE 5.x versions.
+		// ResetDynamicCollection() is protected in UE 5.7, so we use
+		// SetSimulatePhysics(false) + RecreatePhysicsState() as the public alternative.
 		GeoComp->SetSimulatePhysics(false);
-		GeoComp->ResetDynamicCollection();
+		GeoComp->RecreatePhysicsState();
 
 		// Notify editor of the change.
 		GeoComp->PostEditChange();

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPCollisionPhysicsCommands.cpp

@@ -21,7 +21,7 @@
 #include "EngineUtils.h"
 #include "Components/PrimitiveComponent.h"
 #include "Engine/EngineTypes.h"
-#include "CollisionProfile.h"
+#include "Engine/CollisionProfile.h"
 #include "PhysicsEngine/BodyInstance.h"
 #include "PhysicalMaterials/PhysicalMaterial.h"
 #include "PhysicsEngine/PhysicsAsset.h"
@@ -118,7 +118,7 @@ static TArray<TSharedPtr<FJsonValue>> BuildCollisionResponseArray(UPrimitiveComp
 		if (Profile)
 		{
 			// GetChannelName returns the display name for a given channel index.
-			ChannelName = Profile->GetChannelName(Channel).ToString();
+			ChannelName = Profile->ReturnChannelNameFromContainerIndex(static_cast<int32>(Channel)).ToString();
 		}
 		if (ChannelName.IsEmpty())
 		{
@@ -148,7 +148,7 @@ static TSharedPtr<FJsonObject> BuildCollisionData(UPrimitiveComponent* Comp)
 	FString ObjectTypeName;
 	if (Profile)
 	{
-		ObjectTypeName = Profile->GetChannelName(ObjCh).ToString();
+		ObjectTypeName = Profile->ReturnChannelNameFromContainerIndex(static_cast<int32>(ObjCh)).ToString();
 	}
 	if (ObjectTypeName.IsEmpty())
 	{

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPEditorStateCommands.cpp

@@ -9,6 +9,7 @@
 #include "MCPEditorStateCommands.h"
 
 #include "Editor.h"
+#include "Selection.h"
 #include "EditorViewportClient.h"
 #include "LevelEditorViewport.h"
 #include "EngineUtils.h"

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPGASCommands.cpp

@@ -226,19 +226,35 @@ static void HandleGasAbilities(TSharedPtr<FJsonObject> Cmd, FMCPResponseSender S
 		AbilityObj->SetArrayField(TEXT("ability_tags"),
 			GameplayTagContainerToJsonArray(AbilityCDO->AbilityTags));
 
-		// Cancel / block tags
-		AbilityObj->SetArrayField(TEXT("cancel_abilities_with_tag"),
-			GameplayTagContainerToJsonArray(AbilityCDO->CancelAbilitiesWithTag));
-		AbilityObj->SetArrayField(TEXT("block_abilities_with_tag"),
-			GameplayTagContainerToJsonArray(AbilityCDO->BlockAbilitiesWithTag));
+		// Cancel / block tags (protected in UE 5.7, read via UE reflection)
+		{
+			TArray<TSharedPtr<FJsonValue>> CancelTagsArray;
+			TArray<TSharedPtr<FJsonValue>> BlockTagsArray;
+			if (FStructProperty* CancelProp = CastField<FStructProperty>(AbilityCDO->GetClass()->FindPropertyByName(TEXT("CancelAbilitiesWithTag"))))
+			{
+				const FGameplayTagContainer* CancelTags = CancelProp->ContainerPtrToValuePtr<FGameplayTagContainer>(AbilityCDO);
+				if (CancelTags)
+				{
+					CancelTagsArray = GameplayTagContainerToJsonArray(*CancelTags);
+				}
+			}
+			if (FStructProperty* BlockProp = CastField<FStructProperty>(AbilityCDO->GetClass()->FindPropertyByName(TEXT("BlockAbilitiesWithTag"))))
+			{
+				const FGameplayTagContainer* BlockTags = BlockProp->ContainerPtrToValuePtr<FGameplayTagContainer>(AbilityCDO);
+				if (BlockTags)
+				{
+					BlockTagsArray = GameplayTagContainerToJsonArray(*BlockTags);
+				}
+			}
+			AbilityObj->SetArrayField(TEXT("cancel_abilities_with_tag"), CancelTagsArray);
+			AbilityObj->SetArrayField(TEXT("block_abilities_with_tag"), BlockTagsArray);
+		}
 
 		// Cost and cooldown GE class references
-		FString CostGEName = AbilityCDO->CostGameplayEffectClass
-			? AbilityCDO->CostGameplayEffectClass->GetName()
-			: TEXT("None");
-		FString CooldownGEName = AbilityCDO->CooldownGameplayEffectClass
-			? AbilityCDO->CooldownGameplayEffectClass->GetName()
-			: TEXT("None");
+		UGameplayEffect* CostGE = AbilityCDO->GetCostGameplayEffect();
+		FString CostGEName = CostGE ? CostGE->GetClass()->GetName() : TEXT("None");
+		UGameplayEffect* CooldownGE = AbilityCDO->GetCooldownGameplayEffect();
+		FString CooldownGEName = CooldownGE ? CooldownGE->GetClass()->GetName() : TEXT("None");
 		AbilityObj->SetStringField(TEXT("cost_gameplay_effect_class"), CostGEName);
 		AbilityObj->SetStringField(TEXT("cooldown_gameplay_effect_class"), CooldownGEName);
 
@@ -415,13 +431,17 @@ static void HandleGasEffects(TSharedPtr<FJsonObject> Cmd, FMCPResponseSender Sen
 	Data->SetNumberField(TEXT("stack_limit_count"), (double)GEObj->StackLimitCount);
 
 	// Period interval (period is a FScalableFloat, extract base value)
-	float PeriodValue = 0.0f;
-	GEObj->Period.GetStaticValue(PeriodValue);
+	float PeriodValue = GEObj->Period.GetValue();
 	Data->SetNumberField(TEXT("period_interval"), (double)PeriodValue);
 
-	// Gameplay Cue tags
+	// Gameplay Cue tags (collected from all FGameplayEffectCue entries)
+	FGameplayTagContainer AllCueTags;
+	for (const FGameplayEffectCue& Cue : GEObj->GameplayCues)
+	{
+		AllCueTags.AppendTags(Cue.GameplayCueTags);
+	}
 	Data->SetArrayField(TEXT("gameplay_cue_tags"),
-		GameplayTagContainerToJsonArray(GEObj->GameplayCueTags));
+		GameplayTagContainerToJsonArray(AllCueTags));
 
 	SendResponse(BuildGASSuccessResponse(CorrId, Data) + TEXT("\n"));
 }

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPImportExportCommands.cpp

@@ -21,14 +21,17 @@
 #include "AssetToolsModule.h"
 #include "IAssetTools.h"
 #include "AssetImportTask.h"
-#include "PackageName.h"
+#include "Misc/PackageName.h"
 
 // FBX Factory and Export
 #include "Factories/FbxFactory.h"
+#include "Factories/FbxImportUI.h"
+#include "Factories/FbxStaticMeshImportData.h"
 #include "Exporters/FbxExportOption.h"
 
 // Interchange (USD import)
 #include "InterchangeManager.h"
+#include "InterchangeSourceData.h"
 
 // Mesh types
 #include "Engine/StaticMesh.h"
@@ -209,9 +212,9 @@ void RegisterImportExportCommands(FMCPCommandRouter& Router)
 			if (FbxFactory->ImportUI)
 			{
 				FbxFactory->ImportUI->bImportMaterials = bImportMaterials;
-				FbxFactory->ImportUI->bCombineMeshes = bCombineMeshes;
 				if (FbxFactory->ImportUI->StaticMeshImportData)
 				{
+					FbxFactory->ImportUI->StaticMeshImportData->bCombineMeshes = bCombineMeshes;
 					FbxFactory->ImportUI->StaticMeshImportData->ImportUniformScale = static_cast<float>(ScaleFactor);
 				}
 			}
@@ -301,12 +304,11 @@ void RegisterImportExportCommands(FMCPCommandRouter& Router)
 
 			if (GEditor && FModuleManager::Get().IsModuleLoaded(TEXT("InterchangeEngine")))
 			{
-				UInterchangeManager* InterchangeManager = UInterchangeManager::GetInterchangeManager();
-				if (InterchangeManager)
+				UInterchangeManager& InterchangeManager = UInterchangeManager::GetInterchangeManager();
+				if (true) // InterchangeManager is always valid when module is loaded
 				{
-					// Use Interchange to import the USD file.
 					// Set up import parameters with the destination path.
-					UE::Interchange::FImportAssetParameters Params;
+					FImportAssetParameters Params;
 					Params.bIsAutomated = true;
 
 					// Determine content path for Interchange. Normalize dest_path to directory.
@@ -320,9 +322,12 @@ void RegisterImportExportCommands(FMCPCommandRouter& Router)
 							ContentDir = FPackageName::GetLongPackagePath(ContentDir);
 						}
 					}
-					Params.OverrideDestinationPath = ContentDir;
 
-					InterchangeManager->ImportAsset(SourceFile, Params);
+					// Create UInterchangeSourceData from the source file path.
+					UInterchangeSourceData* SourceData = NewObject<UInterchangeSourceData>(GetTransientPackage());
+					SourceData->SetFilename(SourceFile);
+
+					InterchangeManager.ImportAsset(ContentDir, SourceData, Params);
 
 					// Interchange is async; we report success with empty assets list.
 					// The engine will place assets at ContentDir when complete.

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPInputHandlers.cpp

@@ -23,6 +23,9 @@
 // Asset Registry APIs
 #include "AssetRegistry/AssetRegistryModule.h"
 
+// Package saving
+#include "UObject/SavePackage.h"
+
 // UObject/Package APIs
 #include "UObject/Package.h"
 #include "Misc/PackageName.h"
@@ -177,11 +180,11 @@ void RegisterInputHandlers(FMCPCommandRouter& Router)
 
 		// T-14-01: Validate the asset path is a well-formed long package name.
 		// Rejects path traversal ("../") and bare filenames.
-		FString ValidationError;
+		FText ValidationError;
 		if (!FPackageName::IsValidLongPackageName(AssetPath, /*bIncludeReadOnlyRoots=*/false, &ValidationError))
 		{
 			UE_LOG(LogTemp, Warning, TEXT("[MCPBridge] input.createAction: Invalid asset path '%s': %s"),
-				*AssetPath, *ValidationError);
+				*AssetPath, *ValidationError.ToString());
 			SendError(SendResponse, CorrelationId, TEXT("invalid_asset_path"));
 			return;
 		}
@@ -227,8 +230,10 @@ void RegisterInputHandlers(FMCPCommandRouter& Router)
 		// Save the package to disk so the asset persists.
 		FString FilePath = FPackageName::LongPackageNameToFilename(
 			AssetPath, FPackageName::GetAssetPackageExtension());
-		UPackage::SavePackage(Pkg, Action, RF_Standalone, *FilePath,
-			GError, nullptr, false, true, SAVE_NoError);
+		FSavePackageArgs SaveArgs;
+		SaveArgs.TopLevelFlags = RF_Standalone;
+		SaveArgs.SaveFlags = SAVE_NoError;
+		UPackage::SavePackage(Pkg, Action, *FilePath, SaveArgs);
 
 		// Notify the Asset Registry so the asset appears in the Content Browser.
 		FAssetRegistryModule::AssetCreated(Action);
@@ -331,7 +336,7 @@ void RegisterInputHandlers(FMCPCommandRouter& Router)
 
 		// T-14-02: Validate that the key name resolves to a known FKey before calling MapKey.
 		// FKey constructor accepts any FName; IsValid() checks whether it is a registered key.
-		const FKey ResolvedKey(FName(*KeyName));
+		const FKey ResolvedKey = FKey(FName(*KeyName));
 		if (!ResolvedKey.IsValid())
 		{
 			UE_LOG(LogTemp, Warning, TEXT("[MCPBridge] input.addBinding: Key '%s' is not a valid FKey"), *KeyName);
@@ -369,8 +374,10 @@ void RegisterInputHandlers(FMCPCommandRouter& Router)
 		UPackage* Pkg = IMC->GetPackage();
 		FString FilePath = FPackageName::LongPackageNameToFilename(
 			AssetPath, FPackageName::GetAssetPackageExtension());
-		UPackage::SavePackage(Pkg, IMC, RF_Standalone, *FilePath,
-			GError, nullptr, false, true, SAVE_NoError);
+		FSavePackageArgs SaveArgs2;
+		SaveArgs2.TopLevelFlags = RF_Standalone;
+		SaveArgs2.SaveFlags = SAVE_NoError;
+		UPackage::SavePackage(Pkg, IMC, *FilePath, SaveArgs2);
 
 		TSharedPtr<FJsonObject> Data = MakeShared<FJsonObject>();
 		Data->SetBoolField(TEXT("bound"), true);

package/unreal-plugin/MCPBridge/Source/MCPBridgeEditor/Private/MCPLiveLinkCommands.cpp

@@ -206,7 +206,7 @@ void RegisterLiveLinkCommands(FMCPCommandRouter& Router)
 		ILiveLinkClient& Client = IModularFeatures::Get().GetModularFeature<ILiveLinkClient>(ILiveLinkClient::ModularFeatureName);
 
 		// Include disabled subjects so the full list is visible.
-		TArray<FLiveLinkSubjectKey> SubjectKeys = Client.GetSubjects(/*bIncludeDisabledSubjects=*/true);
+		TArray<FLiveLinkSubjectKey> SubjectKeys = Client.GetSubjects(/*bIncludeDisabledSubjects=*/true, /*bIncludeVirtualSubjects=*/true);
 
 		TArray<TSharedPtr<FJsonValue>> SubjectArray;
 		SubjectArray.Reserve(SubjectKeys.Num());
@@ -223,8 +223,8 @@ void RegisterLiveLinkCommands(FMCPCommandRouter& Router)
 			if (Settings)
 			{
 				RoleName = GetRoleFriendlyName(Settings->Role);
-				bEnabled = Settings->bEnabled;
 			}
+			bEnabled = Client.IsSubjectEnabled(SubjectKey, /*bForThisFrame=*/false);
 
 			TSharedPtr<FJsonObject> SubjectObj = MakeShared<FJsonObject>();
 			SubjectObj->SetStringField(TEXT("subject_name"), SubjectName);
@@ -278,7 +278,7 @@ void RegisterLiveLinkCommands(FMCPCommandRouter& Router)
 		ILiveLinkClient& Client = IModularFeatures::Get().GetModularFeature<ILiveLinkClient>(ILiveLinkClient::ModularFeatureName);
 
 		// T-27-01: Find subject by exact name match from GetSubjects() -- never use raw input as key.
-		TArray<FLiveLinkSubjectKey> SubjectKeys = Client.GetSubjects(/*bIncludeDisabledSubjects=*/true);
+		TArray<FLiveLinkSubjectKey> SubjectKeys = Client.GetSubjects(/*bIncludeDisabledSubjects=*/true, /*bIncludeVirtualSubjects=*/true);
 
 		bool bFound = false;
 		for (const FLiveLinkSubjectKey& SubjectKey : SubjectKeys)
@@ -294,7 +294,7 @@ void RegisterLiveLinkCommands(FMCPCommandRouter& Router)
 				}
 
 				// Toggle the enabled state (runtime-only; no Modify() needed for Live Link subject state).
-				Settings->bEnabled = bEnabled;
+				Client.SetSubjectEnabled(SubjectKey, bEnabled);
 
 				const FString StateMessage = bEnabled
 					? TEXT("Subject resumed")
@@ -349,7 +349,7 @@ void RegisterLiveLinkCommands(FMCPCommandRouter& Router)
 		ILiveLinkClient& Client = IModularFeatures::Get().GetModularFeature<ILiveLinkClient>(ILiveLinkClient::ModularFeatureName);
 
 		// T-27-01: Find subject by exact name match from GetSubjects() -- never use raw input as key.
-		TArray<FLiveLinkSubjectKey> SubjectKeys = Client.GetSubjects(/*bIncludeDisabledSubjects=*/true);
+		TArray<FLiveLinkSubjectKey> SubjectKeys = Client.GetSubjects(/*bIncludeDisabledSubjects=*/true, /*bIncludeVirtualSubjects=*/true);
 
 		bool bFound = false;
 		for (const FLiveLinkSubjectKey& SubjectKey : SubjectKeys)
@@ -374,7 +374,7 @@ void RegisterLiveLinkCommands(FMCPCommandRouter& Router)
 
 			// Retrieve the latest frame data.
 			FLiveLinkSubjectFrameData FrameData;
-			const bool bHasData = Client.EvaluateFrame_AnyThread(SubjectKey, RoleClass, FrameData);
+			const bool bHasData = Client.EvaluateFrame_AnyThread(SubjectKey.SubjectName, RoleClass, FrameData);
 
 			if (!bHasData || !FrameData.StaticData.IsValid() || !FrameData.FrameData.IsValid())
 			{