flockbay 0.10.20 → 0.10.22

package/scripts/claude_version_utils.cjs

@@ -11,7 +11,7 @@
  *    - Windows CMD: curl -fsSL https://claude.ai/install.cmd | cmd
  */
 
-const { execSync } = require('child_process');
+const { execSync, execFileSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
@@ -258,19 +258,53 @@ function findLatestVersionBinary(versionsDir, binaryName = null) {
  * @returns {{path: string, source: string}|null} Path and source, or null if not found
  */
 function findGlobalClaudeCliPath() {
-    // Check npm global first (highest priority)
+    const candidates = [];
+
     const npmPath = findNpmGlobalCliPath();
-    if (npmPath) return { path: npmPath, source: 'npm' };
+    if (npmPath) candidates.push({ path: npmPath, source: 'npm', priority: 3 });
 
-    // Check Homebrew installation
     const homebrewPath = findHomebrewCliPath();
-    if (homebrewPath) return { path: homebrewPath, source: 'Homebrew' };
+    if (homebrewPath) candidates.push({ path: homebrewPath, source: 'Homebrew', priority: 2 });
 
-    // Check native installer
     const nativePath = findNativeInstallerCliPath();
-    if (nativePath) return { path: nativePath, source: 'native installer' };
+    if (nativePath) candidates.push({ path: nativePath, source: 'native installer', priority: 1 });
 
-    return null;
+    if (candidates.length === 0) return null;
+
+    // Prefer the newest version across installs when we can determine it.
+    // If versions are missing/unparseable, fall back to the legacy priority ordering.
+    let best = null;
+    for (const c of candidates) {
+        const version = getVersion(c.path);
+        const parsed = parseSemver3(version);
+        const score = parsed ? parsed : null;
+
+        if (!best) {
+            best = { ...c, version, score };
+            continue;
+        }
+
+        if (best.score && score) {
+            if (compareVersions(version, best.version) > 0) {
+                best = { ...c, version, score };
+            }
+            continue;
+        }
+
+        // If one has a parseable version and the other doesn't, prefer the parseable one.
+        if (!best.score && score) {
+            best = { ...c, version, score };
+            continue;
+        }
+        if (best.score && !score) continue;
+
+        // Neither has a version: use priority.
+        if ((c.priority || 0) > (best.priority || 0)) {
+            best = { ...c, version, score };
+        }
+    }
+
+    return best ? { path: best.path, source: best.source } : candidates[0];
 }
 
 /**
@@ -280,15 +314,35 @@ function findGlobalClaudeCliPath() {
  */
 function getVersion(cliPath) {
     try {
-        const pkgPath = path.join(path.dirname(cliPath), 'package.json');
-        if (fs.existsSync(pkgPath)) {
-            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-            return pkg.version;
+        const isJsFile = cliPath.endsWith('.js') || cliPath.endsWith('.cjs');
+        if (isJsFile) {
+            const pkgPath = path.join(path.dirname(cliPath), 'package.json');
+            if (fs.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+                return pkg.version;
+            }
+            return null;
         }
+
+        // Binary install: try to ask it.
+        const out = execFileSync(cliPath, ['--version'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const m = out.match(/(\d+\.\d+\.\d+)/);
+        return m ? m[1] : null;
     } catch (e) {}
     return null;
 }
 
+function parseSemver3(v) {
+    if (!v || typeof v !== 'string') return null;
+    const m = v.trim().match(/^(\d+)\.(\d+)\.(\d+)/);
+    if (!m) return null;
+    const a = Number(m[1]);
+    const b = Number(m[2]);
+    const c = Number(m[3]);
+    if (!Number.isFinite(a) || !Number.isFinite(b) || !Number.isFinite(c)) return null;
+    return [a, b, c];
+}
+
 /**
  * Compare semver versions
  * @param {string} a - First version

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

@@ -27,6 +27,8 @@
 #include "Components/StaticMeshComponent.h"
 #include "Materials/MaterialInterface.h"
 #include "Sound/SoundWave.h"
+#include "IImageWrapper.h"
+#include "IImageWrapperModule.h"
 #include "EditorSubsystem.h"
 #include "Subsystems/EditorActorSubsystem.h"
 #include "Engine/Blueprint.h"
@@ -54,6 +56,31 @@
 #include "Components/SceneCaptureComponent2D.h"
 #include "Engine/TextureRenderTarget2D.h"
 
+static bool SavePngToFile(const FString& FilePath, int32 Width, int32 Height, const TArray<FColor>& Bitmap)
+{
+	IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>(FName("ImageWrapper"));
+	TSharedPtr<IImageWrapper> Wrapper = ImageWrapperModule.CreateImageWrapper(EImageFormat::PNG);
+	if (!Wrapper.IsValid())
+	{
+		return false;
+	}
+
+	if (!Wrapper->SetRaw(Bitmap.GetData(), Bitmap.Num() * sizeof(FColor), Width, Height, ERGBFormat::BGRA, 8))
+	{
+		return false;
+	}
+
+	const TArray64<uint8>& Compressed = Wrapper->GetCompressed(100);
+	if (Compressed.Num() <= 0 || Compressed.Num() > MAX_int32)
+	{
+		return false;
+	}
+
+	TArray<uint8> Out;
+	Out.Append(Compressed.GetData(), static_cast<int32>(Compressed.Num()));
+	return FFileHelper::SaveArrayToFile(Out, *FilePath);
+}
+
 FUnrealMCPEditorCommands::FUnrealMCPEditorCommands()
 {
 }
@@ -219,7 +246,7 @@ TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSaveAll(const TSharedPtr
     }
 
     TArray<UPackage*> DirtyBefore;
-    FEditorFileUtils::GetDirtyPackages(DirtyBefore, /*bIncludeMapPackages=*/true, /*bIncludeContentPackages=*/true);
+    FEditorFileUtils::GetDirtyPackages(DirtyBefore);
 
     TSet<FString> DirtyBeforeNames;
     for (UPackage* Pkg : DirtyBefore)
@@ -239,7 +266,7 @@ TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSaveAll(const TSharedPtr
     );
 
     TArray<UPackage*> DirtyAfter;
-    FEditorFileUtils::GetDirtyPackages(DirtyAfter, /*bIncludeMapPackages=*/true, /*bIncludeContentPackages=*/true);
+    FEditorFileUtils::GetDirtyPackages(DirtyAfter);
 
     TSet<FString> DirtyAfterNames;
     for (UPackage* Pkg : DirtyAfter)
@@ -293,8 +320,7 @@ TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleSaveAll(const TSharedPtr
         Details->SetArrayField(TEXT("stillDirtyPackages"), StillDirty);
 
         TSharedPtr<FJsonObject> ErrObj = FUnrealMCPCommonUtils::CreateErrorResponse(
-            TEXT("Some packages are still dirty after save_all. They may require manual Save As, source control checkout, or have save errors. Resolve in-editor and retry save_all."),
-        );
+            TEXT("Some packages are still dirty after save_all. They may require manual Save As, source control checkout, or have save errors. Resolve in-editor and retry save_all."));
         ErrObj->SetObjectField(TEXT("details"), Details);
         return ErrObj;
     }
@@ -2445,9 +2471,7 @@ TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleTakeScreenshot(const TSh
 
         CaptureActor->Destroy();
 
-        TArray<uint8> CompressedBitmap;
-        FImageUtils::CompressImageArray(Width, Height, Bitmap, CompressedBitmap);
-        if (!FFileHelper::SaveArrayToFile(CompressedBitmap, *FilePath))
+        if (!SavePngToFile(FilePath, Width, Height, Bitmap))
         {
             return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to save screenshot PNG to disk."));
         }
@@ -2472,10 +2496,7 @@ TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleTakeScreenshot(const TSh
 
         if (Viewport->ReadPixels(Bitmap, FReadSurfaceDataFlags(), ViewportRect))
         {
-            TArray<uint8> CompressedBitmap;
-            FImageUtils::CompressImageArray(ViewSize.X, ViewSize.Y, Bitmap, CompressedBitmap);
-
-            if (FFileHelper::SaveArrayToFile(CompressedBitmap, *FilePath))
+            if (SavePngToFile(FilePath, ViewSize.X, ViewSize.Y, Bitmap))
             {
                 TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
                 ResultObj->SetStringField(TEXT("filepath"), FilePath);

package/tools/unreal-mcp/upstream/MCPGameProject/Plugins/UnrealMCP/Source/UnrealMCP/UnrealMCP.Build.cs

@@ -45,6 +45,7 @@ public class UnrealMCP : ModuleRules
 				"EditorScriptingUtilities",
 				"EditorSubsystem",
 				"Landscape",
+				"ImageWrapper",
 				"Slate",
 				"SlateCore",
 				"MessageLog",