flockbay 0.10.45 → 0.10.46

package/dist/{index-CpdfIEVW.cjs → index-BsespsLC.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-AsI7cuLg.cjs');
+var types = require('./types-CziwW90U.cjs');
 var node_child_process = require('node:child_process');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -1316,7 +1316,7 @@ function buildDaemonSafeEnv(baseEnv, binPath) {
   env[pathKey] = [...prepend, ...existingParts].join(pathSep);
   return env;
 }
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-CpdfIEVW.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-BsespsLC.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion(claudeExecutable) {
   try {
@@ -15139,7 +15139,7 @@ async function authAndSetupMachineIfNeeded() {
         process.exit(1);
       }
       try {
-        const { migrateUnrealMcpToFlockbayMcp } = await Promise.resolve().then(function () { return require('./migratePlugin--pdww8Jg.cjs'); });
+        const { migrateUnrealMcpToFlockbayMcp } = await Promise.resolve().then(function () { return require('./migratePlugin-B2SM0IhP.cjs'); });
         const result = migrateUnrealMcpToFlockbayMcp({
           engineRoot,
           projectUprojectPath: project || void 0,
@@ -15278,7 +15278,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-t2FSXDl4.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-Rx9uhhBt.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -15380,7 +15380,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-D__vNNGK.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-BEFeFruX.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {

package/dist/{index-BRx_RPRT.mjs → index-CNHBXWGe.mjs}

@@ -2,7 +2,7 @@ import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(im
 import * as os from 'node:os';
 import os__default, { homedir } from 'node:os';
 import { randomUUID, createCipheriv, randomBytes, createHash as createHash$1 } from 'node:crypto';
-import { l as logger, b as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as readDaemonState, g as clearDaemonState, p as packageJson, r as readSettings, h as readCredentials, u as updateSettings, o as openBrowser, w as writeCredentials, j as unrealMcpPythonDir, k as acquireDaemonLock, m as writeDaemonState, n as ApiMachineClient, q as releaseDaemonLock, s as sendUnrealMcpTcpCommand, A as ApiClient, v as validatePath, t as run, x as run$1, y as buildShellInvocation, z as clearCredentials, B as clearMachineId, C as authenticateCodex, D as syncCodexCliAuth, E as authenticateClaude, F as authenticateGemini, i as installUnrealMcpPluginToEngine, G as buildAndInstallUnrealMcpPlugin, H as installUnrealMcpPluginToProject, I as getLatestDaemonLog, J as normalizeServerUrlForNode } from './types-Cq5rjOkx.mjs';
+import { l as logger, b as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as readDaemonState, g as clearDaemonState, p as packageJson, r as readSettings, h as readCredentials, u as updateSettings, o as openBrowser, w as writeCredentials, j as unrealMcpPythonDir, k as acquireDaemonLock, m as writeDaemonState, n as ApiMachineClient, q as releaseDaemonLock, s as sendUnrealMcpTcpCommand, A as ApiClient, v as validatePath, t as run, x as run$1, y as buildShellInvocation, z as clearCredentials, B as clearMachineId, C as authenticateCodex, D as syncCodexCliAuth, E as authenticateClaude, F as authenticateGemini, i as installUnrealMcpPluginToEngine, G as buildAndInstallUnrealMcpPlugin, H as installUnrealMcpPluginToProject, I as getLatestDaemonLog, J as normalizeServerUrlForNode } from './types-H7oBEqpR.mjs';
 import { spawn, execFileSync, execSync } from 'node:child_process';
 import * as path from 'node:path';
 import path__default, { resolve, join, dirname } from 'node:path';
@@ -15117,7 +15117,7 @@ async function authAndSetupMachineIfNeeded() {
         process.exit(1);
       }
       try {
-        const { migrateUnrealMcpToFlockbayMcp } = await import('./migratePlugin-JesDYgpP.mjs');
+        const { migrateUnrealMcpToFlockbayMcp } = await import('./migratePlugin-CcRAl4zO.mjs');
         const result = migrateUnrealMcpToFlockbayMcp({
           engineRoot,
           projectUprojectPath: project || void 0,
@@ -15256,7 +15256,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await import('./runCodex-DeNgXSEc.mjs');
+      const { runCodex } = await import('./runCodex-b9J0CZko.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -15358,7 +15358,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await import('./runGemini-X5dTcwGa.mjs');
+      const { runGemini } = await import('./runGemini-C3cdyIH7.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-CpdfIEVW.cjs');
-require('./types-AsI7cuLg.cjs');
+require('./index-BsespsLC.cjs');
+require('./types-CziwW90U.cjs');
 require('zod');
 require('node:child_process');
 require('node:fs');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-BRx_RPRT.mjs';
-import './types-Cq5rjOkx.mjs';
+import './index-CNHBXWGe.mjs';
+import './types-H7oBEqpR.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:fs';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-AsI7cuLg.cjs');
+var types = require('./types-CziwW90U.cjs');
 require('axios');
 require('node:fs');
 require('node:os');

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-Cq5rjOkx.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-H7oBEqpR.mjs';
 import 'axios';
 import 'node:fs';
 import 'node:os';

package/dist/{migratePlugin--pdww8Jg.cjs → migratePlugin-B2SM0IhP.cjs}

@@ -2,7 +2,7 @@
 
 var fs = require('node:fs');
 var path = require('node:path');
-var types = require('./types-AsI7cuLg.cjs');
+var types = require('./types-CziwW90U.cjs');
 require('axios');
 require('node:os');
 require('node:events');

package/dist/{migratePlugin-JesDYgpP.mjs → migratePlugin-CcRAl4zO.mjs}

@@ -1,6 +1,6 @@
 import fs__default from 'node:fs';
 import path__default from 'node:path';
-import { i as installUnrealMcpPluginToEngine } from './types-Cq5rjOkx.mjs';
+import { i as installUnrealMcpPluginToEngine } from './types-H7oBEqpR.mjs';
 import 'axios';
 import 'node:os';
 import 'node:events';

package/dist/{runCodex-t2FSXDl4.cjs → runCodex-Rx9uhhBt.cjs}

@@ -2,7 +2,7 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-AsI7cuLg.cjs');
+var types = require('./types-CziwW90U.cjs');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var z = require('zod');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
@@ -16,7 +16,7 @@ var process$1 = require('node:process');
 var node_stream = require('node:stream');
 var stdio_js$1 = require('@modelcontextprotocol/sdk/client/stdio.js');
 var stdio_js = require('@modelcontextprotocol/sdk/shared/stdio.js');
-var index = require('./index-CpdfIEVW.cjs');
+var index = require('./index-BsespsLC.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');

package/dist/{runCodex-DeNgXSEc.mjs → runCodex-b9J0CZko.mjs}

@@ -1,6 +1,6 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { l as logger, A as ApiClient, p as packageJson, c as configuration, r as readSettings, b as projectPath } from './types-Cq5rjOkx.mjs';
+import { l as logger, A as ApiClient, p as packageJson, c as configuration, r as readSettings, b as projectPath } from './types-H7oBEqpR.mjs';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { z } from 'zod';
 import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
@@ -14,7 +14,7 @@ import process$1 from 'node:process';
 import { PassThrough } from 'node:stream';
 import { getDefaultEnvironment } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { ReadBuffer, serializeMessage } from '@modelcontextprotocol/sdk/shared/stdio.js';
-import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, e as enforceCliVersionPolicy, i as initialMachineMetadata, E as ElicitationHub, n as notifyDaemonSessionStarted, M as MessageQueue2, P as PLATFORM_SYSTEM_PROMPT, a as setLatestUserImages, w as withUserImagesMarker, r as registerKillSessionHandler, b as MessageBuffer, d as startFlockbayServer, g as buildProjectCapsule, t as trimIdent, j as autoFinalizeCoordinationWorkItem, k as detectScreenshotsForGate, l as applyCoordinationSideEffectsFromMcpToolResult, m as stopCaffeinate } from './index-BRx_RPRT.mjs';
+import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, e as enforceCliVersionPolicy, i as initialMachineMetadata, E as ElicitationHub, n as notifyDaemonSessionStarted, M as MessageQueue2, P as PLATFORM_SYSTEM_PROMPT, a as setLatestUserImages, w as withUserImagesMarker, r as registerKillSessionHandler, b as MessageBuffer, d as startFlockbayServer, g as buildProjectCapsule, t as trimIdent, j as autoFinalizeCoordinationWorkItem, k as detectScreenshotsForGate, l as applyCoordinationSideEffectsFromMcpToolResult, m as stopCaffeinate } from './index-CNHBXWGe.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';

package/dist/{runGemini-D__vNNGK.cjs → runGemini-BEFeFruX.cjs}

@@ -6,8 +6,8 @@ var node_crypto = require('node:crypto');
 var os = require('node:os');
 var path = require('node:path');
 var fs$2 = require('node:fs/promises');
-var types = require('./types-AsI7cuLg.cjs');
-var index = require('./index-CpdfIEVW.cjs');
+var types = require('./types-CziwW90U.cjs');
+var index = require('./index-BsespsLC.cjs');
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var fs = require('fs');

package/dist/{runGemini-X5dTcwGa.mjs → runGemini-C3cdyIH7.mjs}

@@ -4,8 +4,8 @@ import { randomUUID, createHash } from 'node:crypto';
 import os__default from 'node:os';
 import path__default, { resolve, join as join$1, basename } from 'node:path';
 import { mkdir, writeFile, readFile } from 'node:fs/promises';
-import { l as logger, p as packageJson, A as ApiClient, c as configuration, r as readSettings, b as projectPath } from './types-Cq5rjOkx.mjs';
-import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, e as enforceCliVersionPolicy, i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, g as buildProjectCapsule, a as setLatestUserImages, b as MessageBuffer, w as withUserImagesMarker, r as registerKillSessionHandler, d as startFlockbayServer, o as extractUserImagesMarker, p as getLatestUserImages, P as PLATFORM_SYSTEM_PROMPT, j as autoFinalizeCoordinationWorkItem, E as ElicitationHub, k as detectScreenshotsForGate, m as stopCaffeinate } from './index-BRx_RPRT.mjs';
+import { l as logger, p as packageJson, A as ApiClient, c as configuration, r as readSettings, b as projectPath } from './types-H7oBEqpR.mjs';
+import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, e as enforceCliVersionPolicy, i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, g as buildProjectCapsule, a as setLatestUserImages, b as MessageBuffer, w as withUserImagesMarker, r as registerKillSessionHandler, d as startFlockbayServer, o as extractUserImagesMarker, p as getLatestUserImages, P as PLATFORM_SYSTEM_PROMPT, j as autoFinalizeCoordinationWorkItem, E as ElicitationHub, k as detectScreenshotsForGate, m as stopCaffeinate } from './index-CNHBXWGe.mjs';
 import { spawn, spawnSync } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';

package/dist/{types-AsI7cuLg.cjs → types-CziwW90U.cjs}

@@ -44,7 +44,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "flockbay";
-var version = "0.10.45";
+var version = "0.10.46";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -832,7 +832,7 @@ class RpcHandlerManager {
   }
 }
 
-const __dirname$1 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-AsI7cuLg.cjs', document.baseURI).href))));
+const __dirname$1 = path$1.dirname(url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('types-CziwW90U.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -3836,7 +3836,7 @@ exitCode: ${exitCode}
       buildLogPath,
       errorMessage: `Failed to build the Flockbay MCP plugin.
 Log: ${buildLogPath}
-Make sure your compiler tools are installed (Xcode on macOS, Visual Studio Build Tools on Windows).`
+Open the log to see the exact failure (missing compiler toolchain vs plugin compile errors).`
     };
   }
   const resolved = resolvePackagedPluginDir(packageDir);

package/dist/{types-Cq5rjOkx.mjs → types-H7oBEqpR.mjs}

@@ -23,7 +23,7 @@ import { createServer } from 'http';
 import open$2 from 'open';
 
 var name = "flockbay";
-var version = "0.10.45";
+var version = "0.10.46";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -3815,7 +3815,7 @@ exitCode: ${exitCode}
       buildLogPath,
       errorMessage: `Failed to build the Flockbay MCP plugin.
 Log: ${buildLogPath}
-Make sure your compiler tools are installed (Xcode on macOS, Visual Studio Build Tools on Windows).`
+Open the log to see the exact failure (missing compiler toolchain vs plugin compile errors).`
     };
   }
   const resolved = resolvePackagedPluginDir(packageDir);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flockbay",
-  "version": "0.10.45",
+  "version": "0.10.46",
   "description": "Flockbay CLI (local agent + daemon)",
   "author": "Eduardo Orellana",
   "license": "UNLICENSED",

package/tools/unreal-mcp/upstream/MCPGameProject/Plugins/FlockbayMCP/Source/FlockbayMCP/Private/Commands/UnrealMCPBlueprintCommands.cpp

@@ -16,6 +16,7 @@
 #include "Engine/SCS_Node.h"
 #include "UObject/Field.h"
 #include "UObject/FieldPath.h"
+#include "UObject/UObjectGlobals.h"
 #include "EditorAssetLibrary.h"
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "MessageLogModule.h"
@@ -23,6 +24,20 @@
 #include "GameFramework/Actor.h"
 #include "GameFramework/Pawn.h"
 
+static UClass* FindMcpClassByName(const TCHAR* ClassName)
+{
+#if defined(ANY_PACKAGE)
+    return FindObject<UClass>(ANY_PACKAGE, ClassName);
+#else
+    return FindFirstObject<UClass>(ClassName);
+#endif
+}
+
+static UClass* FindMcpClassByName(const FString& ClassName)
+{
+    return FindMcpClassByName(*ClassName);
+}
+
 FUnrealMCPBlueprintCommands::FUnrealMCPBlueprintCommands()
 {
 }
@@ -249,26 +264,26 @@ TSharedPtr<FJsonObject> FUnrealMCPBlueprintCommands::HandleAddComponentToBluepri
     UClass* ComponentClass = nullptr;
 
     // Try to find the class with exact name first
-    ComponentClass = FindObject<UClass>(ANY_PACKAGE, *ComponentType);
+    ComponentClass = FindMcpClassByName(ComponentType);
     
     // If not found, try with "Component" suffix
     if (!ComponentClass && !ComponentType.EndsWith(TEXT("Component")))
     {
         FString ComponentTypeWithSuffix = ComponentType + TEXT("Component");
-        ComponentClass = FindObject<UClass>(ANY_PACKAGE, *ComponentTypeWithSuffix);
+        ComponentClass = FindMcpClassByName(ComponentTypeWithSuffix);
     }
     
     // If still not found, try with "U" prefix
     if (!ComponentClass && !ComponentType.StartsWith(TEXT("U")))
     {
         FString ComponentTypeWithPrefix = TEXT("U") + ComponentType;
-        ComponentClass = FindObject<UClass>(ANY_PACKAGE, *ComponentTypeWithPrefix);
+        ComponentClass = FindMcpClassByName(ComponentTypeWithPrefix);
         
         // Try with both prefix and suffix
         if (!ComponentClass && !ComponentType.EndsWith(TEXT("Component")))
         {
             FString ComponentTypeWithBoth = TEXT("U") + ComponentType + TEXT("Component");
-            ComponentClass = FindObject<UClass>(ANY_PACKAGE, *ComponentTypeWithBoth);
+            ComponentClass = FindMcpClassByName(ComponentTypeWithBoth);
         }
     }
     

package/tools/unreal-mcp/upstream/MCPGameProject/Plugins/FlockbayMCP/Source/FlockbayMCP/Private/Commands/UnrealMCPBlueprintNodeCommands.cpp

@@ -17,11 +17,26 @@
 #include "Kismet/GameplayStatics.h"
 #include "EdGraphSchema_K2.h"
 #include "UObject/UObjectIterator.h"
+#include "UObject/UObjectGlobals.h"
 #include "Kismet/BlueprintFunctionLibrary.h"
 
 // Declare the log category
 DEFINE_LOG_CATEGORY_STATIC(LogUnrealMCP, Log, All);
 
+static UClass* FindMcpClassByName(const TCHAR* ClassName)
+{
+#if defined(ANY_PACKAGE)
+    return FindObject<UClass>(ANY_PACKAGE, ClassName);
+#else
+    return FindFirstObject<UClass>(ClassName);
+#endif
+}
+
+static UClass* FindMcpClassByName(const FString& ClassName)
+{
+    return FindMcpClassByName(*ClassName);
+}
+
 FUnrealMCPBlueprintNodeCommands::FUnrealMCPBlueprintNodeCommands()
 {
 }
@@ -413,7 +428,7 @@ TSharedPtr<FJsonObject> FUnrealMCPBlueprintNodeCommands::HandleAddBlueprintFunct
         UClass* TargetClass = nullptr;
         
         // First try without a prefix
-        TargetClass = FindObject<UClass>(ANY_PACKAGE, *Target);
+        TargetClass = FindMcpClassByName(Target);
         UE_LOG(LogTemp, Display, TEXT("Tried to find class '%s': %s"), 
                *Target, TargetClass ? TEXT("Found") : TEXT("Not found"));
         
@@ -421,7 +436,7 @@ TSharedPtr<FJsonObject> FUnrealMCPBlueprintNodeCommands::HandleAddBlueprintFunct
         if (!TargetClass && !Target.StartsWith(TEXT("U")))
         {
             FString TargetWithPrefix = FString(TEXT("U")) + Target;
-            TargetClass = FindObject<UClass>(ANY_PACKAGE, *TargetWithPrefix);
+            TargetClass = FindMcpClassByName(TargetWithPrefix);
             UE_LOG(LogTemp, Display, TEXT("Tried to find class '%s': %s"), 
                    *TargetWithPrefix, TargetClass ? TEXT("Found") : TEXT("Not found"));
         }
@@ -436,7 +451,7 @@ TSharedPtr<FJsonObject> FUnrealMCPBlueprintNodeCommands::HandleAddBlueprintFunct
             
             for (const FString& ClassName : PossibleClassNames)
             {
-                TargetClass = FindObject<UClass>(ANY_PACKAGE, *ClassName);
+                TargetClass = FindMcpClassByName(ClassName);
                 if (TargetClass)
                 {
                     UE_LOG(LogTemp, Display, TEXT("Found class using alternative name '%s'"), *ClassName);
@@ -449,7 +464,7 @@ TSharedPtr<FJsonObject> FUnrealMCPBlueprintNodeCommands::HandleAddBlueprintFunct
         if (!TargetClass && Target == TEXT("UGameplayStatics"))
         {
             // For UGameplayStatics, use a direct reference to known class
-            TargetClass = FindObject<UClass>(ANY_PACKAGE, TEXT("UGameplayStatics"));
+            TargetClass = FindMcpClassByName(TEXT("UGameplayStatics"));
             if (!TargetClass)
             {
                 // Try loading it from its known package
@@ -594,7 +609,7 @@ TSharedPtr<FJsonObject> FUnrealMCPBlueprintNodeCommands::HandleAddBlueprintFunct
                             const FString& ClassName = StringVal;
                             
                             // TODO: This likely won't work in UE5.5+, so don't rely on it.
-                            UClass* Class = FindObject<UClass>(ANY_PACKAGE, *ClassName);
+                            UClass* Class = FindMcpClassByName(ClassName);
 
                             if (!Class)
                             {
@@ -796,18 +811,18 @@ static UClass* ResolveClassBestEffort(const FString& Target)
         return LoadObject<UClass>(nullptr, *T);
     }
 
-    UClass* Found = FindObject<UClass>(ANY_PACKAGE, *T);
+    UClass* Found = FindMcpClassByName(T);
     if (!Found && !T.StartsWith(TEXT("U")))
     {
-        Found = FindObject<UClass>(ANY_PACKAGE, *(FString(TEXT("U")) + T));
+        Found = FindMcpClassByName(FString(TEXT("U")) + T);
     }
     if (!Found && !T.EndsWith(TEXT("Library")))
     {
-        Found = FindObject<UClass>(ANY_PACKAGE, *(FString(TEXT("U")) + T + TEXT("Library")));
+        Found = FindMcpClassByName(FString(TEXT("U")) + T + TEXT("Library"));
     }
     if (!Found && !T.EndsWith(TEXT("Component")))
     {
-        Found = FindObject<UClass>(ANY_PACKAGE, *(FString(TEXT("U")) + T + TEXT("Component")));
+        Found = FindMcpClassByName(FString(TEXT("U")) + T + TEXT("Component"));
     }
     return Found;
 }

package/tools/unreal-mcp/upstream/MCPGameProject/Plugins/FlockbayMCP/Source/FlockbayMCP/Private/Commands/UnrealMCPEditorCommands.cpp

@@ -44,6 +44,7 @@
 #include "AssetRegistry/AssetRegistryModule.h"
 #include "UObject/SoftObjectPath.h"
 #include "UObject/Package.h"
+#include "UObject/UObjectGlobals.h"
 #include "FileHelpers.h"
 #include "MessageLogModule.h"
 #include "IMessageLogListing.h"
@@ -56,6 +57,20 @@
 #include "Components/SceneCaptureComponent2D.h"
 #include "Engine/TextureRenderTarget2D.h"
 
+static UClass* FindMcpClassByName(const TCHAR* ClassName)
+{
+#if defined(ANY_PACKAGE)
+    return FindObject<UClass>(ANY_PACKAGE, ClassName);
+#else
+    return FindFirstObject<UClass>(ClassName);
+#endif
+}
+
+static UClass* FindMcpClassByName(const FString& ClassName)
+{
+    return FindMcpClassByName(*ClassName);
+}
+
 static bool SavePngToFile(const FString& FilePath, int32 Width, int32 Height, TArray<FColor>& Bitmap)
 {
 	IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>(FName("ImageWrapper"));
@@ -560,10 +575,10 @@ static bool TryResolveAssetClassFilter(const TSharedPtr<FJsonObject>& Params, FA
         }
         else
         {
-            Class = FindObject<UClass>(ANY_PACKAGE, *ClassName);
+            Class = FindMcpClassByName(ClassName);
             if (!Class && !ClassName.StartsWith(TEXT("U")))
             {
-                Class = FindObject<UClass>(ANY_PACKAGE, *(TEXT("U") + ClassName));
+                Class = FindMcpClassByName(TEXT("U") + ClassName);
             }
         }
 

package/tools/unreal-mcp/upstream/MCPGameProject/Plugins/FlockbayMCP/Source/FlockbayMCP/Private/MCPServerRunnable.cpp

@@ -12,7 +12,7 @@
 #include "HAL/PlatformTime.h"
 
 // Buffer size for receiving data
-const int32 BufferSize = 8192;
+const int32 RecvBufferSizeBytes = 8192;
 
 static bool SendAll(FSocket* Socket, const uint8* Data, int32 TotalBytes, int32& OutTotalBytesSent)
 {
@@ -102,7 +102,7 @@ uint32 FMCPServerRunnable::Run()
                 ClientSocket->SetSendBufferSize(SocketBufferSize, SocketBufferSize);
                 ClientSocket->SetReceiveBufferSize(SocketBufferSize, SocketBufferSize);
                 
-                uint8 Buffer[8192 + 1];
+                uint8 Buffer[RecvBufferSizeBytes + 1];
                 while (bRunning)
                 {
                     int32 BytesRead = 0;
@@ -116,7 +116,7 @@ uint32 FMCPServerRunnable::Run()
 
                         // Convert received data to string
                         // Null-terminate safely (Recv can fill the entire buffer).
-                        const int32 SafeIndex = FMath::Clamp(BytesRead, 0, 8192);
+                        const int32 SafeIndex = FMath::Clamp(BytesRead, 0, RecvBufferSizeBytes);
                         Buffer[SafeIndex] = '\0';
                         FString ReceivedText = UTF8_TO_TCHAR(Buffer);
                         UE_LOG(LogTemp, Display, TEXT("MCPServerRunnable: Received: %s"), *ReceivedText);