More handler work

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/AnimBlueprint_Create.h

@@ -18,7 +18,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_AnimBlueprint_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/AnimBlueprint_ListSlotNames.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_AnimBlueprint_ListSlotNames : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/AnimBlueprint_ListSyncGroups.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_AnimBlueprint_ListSyncGroups : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/AnimBlueprint_SetBlendSpaceSamples.h

@@ -30,7 +30,7 @@ struct FBlendSpaceSampleEntry
 	float Y = 0.0f;
 };
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_AnimBlueprint_SetBlendSpaceSamples : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/BlendSpace_Create.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_BlendSpace_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/BlueprintGraph_Create.h

@@ -18,7 +18,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_BlueprintGraph_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/BlueprintGraph_Delete.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_BlueprintGraph_Delete : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/BlueprintGraph_Rename.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_BlueprintGraph_Rename : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_AddComponent.h

@@ -16,7 +16,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_AddComponent : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_AddEventDispatcher.h

@@ -32,7 +32,7 @@ struct FDispatcherParamEntry
 	FString Type;
 };
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_AddEventDispatcher : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_AddFunctionParameter.h

@@ -20,7 +20,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_AddFunctionParameter : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_AddInterface.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_AddInterface : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_AddVariable.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_AddVariable : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_ChangeFunctionParameterType.h

@@ -20,7 +20,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_ChangeFunctionParameterType : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_ChangeVariableType.h

@@ -17,7 +17,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_ChangeVariableType : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_Compile.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_Compile : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_Create.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_Diff.h

@@ -16,7 +16,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_Diff : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_Dump.h

@@ -18,7 +18,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_Dump : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_ListComponents.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_ListComponents : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_ListEventDispatchers.h

@@ -19,7 +19,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_ListEventDispatchers : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_ListInterfaces.h

@@ -13,7 +13,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_ListInterfaces : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_RefreshAllNodes.h

@@ -17,7 +17,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_RefreshAllNodes : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_RemoveComponent.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_RemoveComponent : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_RemoveFunctionParameter.h

@@ -16,7 +16,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_RemoveFunctionParameter : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_RemoveInterface.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_RemoveInterface : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_RemoveVariable.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_RemoveVariable : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_Reparent.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_Reparent : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_Search.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_Search : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Blueprint_SearchContents.h

@@ -22,7 +22,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Blueprint_SearchContents : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Class_Search.h

@@ -16,7 +16,7 @@
 // HandleListClasses — discover available UClasses
 // ============================================================
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Class_Search : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Class_ShowProperties.h

@@ -12,7 +12,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Class_ShowProperties : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Enum_Create.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Enum_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/MaterialFunction_Create.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_MaterialFunction_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Material_Compile.h

@@ -13,7 +13,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Material_Compile : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Material_Create.h

@@ -15,7 +15,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Material_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Material_DumpParameters.h

@@ -13,7 +13,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Material_DumpParameters : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/StateMachine_AddState.h

@@ -19,7 +19,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_StateMachine_AddState : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/StateMachine_AddTransition.h

@@ -17,7 +17,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_StateMachine_AddTransition : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/StateMachine_RemoveState.h

@@ -17,7 +17,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_StateMachine_RemoveState : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/StateMachine_SetAnimation.h

@@ -20,7 +20,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_StateMachine_SetAnimation : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/StateMachine_SetBlendSpace.h

@@ -23,7 +23,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_StateMachine_SetBlendSpace : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/StateMachine_SetTransitionRule.h

@@ -16,7 +16,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_StateMachine_SetTransitionRule : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked/Struct_Create.h

@@ -30,7 +30,7 @@ struct FStructPropertyEntry
 	FString Type;
 };
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Struct_Create : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Asset_Delete.h

@@ -9,6 +9,7 @@
 #include "AssetRegistry/IAssetRegistry.h"
 #include "HAL/FileManager.h"
 #include "UObject/LinkerLoad.h"
+#include "UObject/Package.h"
 #include "Asset_Delete.generated.h"
 
 
@@ -16,7 +17,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Asset_Delete : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()
@@ -77,34 +78,32 @@ public:
 			UMCPServer::Printf(TEXT("WARNING: Force-deleting despite %d referencer(s).\n"), Referencers.Num());
 		}
 
-		if (Force)
+		// Mark the package, and all the objects in it, as NOT
+		// GC Roots.  Also, make them undiscoverable. 
+		UPackage* Package = FindPackage(nullptr, *Asset);
+		if (Package)
 		{
-			UPackage* Package = FindPackage(nullptr, *Asset);
+			// Collect all objects in this package
-			if (Package)
+			TArray<UObject*> ObjectsInPackage;
+			GetObjectsWithPackage(Package, ObjectsInPackage);
+
+			// Clear flags and remove from root to allow GC
+			for (UObject* Obj : ObjectsInPackage)
 			{
-				// Collect all objects in this package
+				if (Obj)
-				TArray<UObject*> ObjectsInPackage;
-				GetObjectsWithPackage(Package, ObjectsInPackage);
-
-				// Clear flags and remove from root to allow GC
-				for (UObject* Obj : ObjectsInPackage)
 				{
-					if (Obj)
+					Obj->ClearFlags(RF_Standalone | RF_Public);
-					{
+					Obj->RemoveFromRoot();
-						Obj->ClearFlags(RF_Standalone | RF_Public);
-						Obj->RemoveFromRoot();
-					}
 				}
-				Package->ClearFlags(RF_Standalone | RF_Public);
-				Package->RemoveFromRoot();
-
-				// Reset loaders to release file handles
-				ResetLoaders(Package);
-				// Force garbage collection to free the objects
-				CollectGarbage(GARBAGE_COLLECTION_KEEPFLAGS);
 			}
+			Package->ClearFlags(RF_Standalone | RF_Public);
+			Package->RemoveFromRoot();
 		}
 
+		// The loader that loaded the package might still
+		// have a file lock on it.  Unlock the file.
+		ResetLoaders(Package);
+
 		// Delete the file on disk
 		bool bDeleted = IFileManager::Get().Delete(*PackageFilename, false, true);
 

Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Asset_FindReferences.h

@@ -13,7 +13,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Asset_FindReferences : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/Asset_Rename.h

@@ -14,7 +14,7 @@
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 
-UCLASS(meta=(HalfBaked))
+UCLASS()
 class UMCP_Asset_Rename : public UObject, public IMCPHandler
 {
 	GENERATED_BODY()

Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers/ShowCommands.h

@@ -53,7 +53,8 @@ public:
 
 		for (UClass* Class : MCPUtils::CollectHandlerClasses())
 		{
-			if (Class->HasMetaData(TEXT("HalfBaked")) != bHalfBaked)
+			bool bIsHalfBaked = Class->GetMetaData(TEXT("ModuleRelativePath")).StartsWith(TEXT("HalfBaked/"));
+			if (bIsHalfBaked != bHalfBaked)
 				continue;
 
 			FString ToolName = MCPUtils::GetHandlerName(Class);

tools/clangd-diag-all-source.py

@@ -19,6 +19,7 @@ SOURCE_DIRS = [
     "Plugins/BlueprintMCP/Source/BlueprintMCP/Public",
     "Plugins/BlueprintMCP/Source/BlueprintMCP/Private",
     "Plugins/BlueprintMCP/Source/BlueprintMCP/Handlers",
+    "Plugins/BlueprintMCP/Source/BlueprintMCP/HalfBaked",
 ]
 
 # Files to skip (relative to project root).