flockbay 0.10.17 → 0.10.20

package/dist/{types-DuhcLxar.mjs → types-C4QeUggl.mjs}

@@ -21,7 +21,7 @@ import net from 'node:net';
 import { spawn as spawn$1 } from 'node:child_process';
 
 var name = "flockbay";
-var version = "0.10.17";
+var version = "0.10.20";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -245,7 +245,7 @@ class Configuration {
       }
     } catch {
     }
-    const rawServerUrl = process.env.FLOCKBAY_SERVER_URL || persistedSettings?.serverUrl || "https://api-internal.flockbay.com";
+    const rawServerUrl = process.env.FLOCKBAY_SERVER_URL || persistedSettings?.serverUrl || "https://api.flockbay.com";
     this.serverUrl = normalizeServerUrlForNode(rawServerUrl);
     this.webappUrl = process.env.FLOCKBAY_WEBAPP_URL || persistedSettings?.webappUrl || "https://flockbay.com";
     this.isExperimentalEnabled = ["true", "1", "yes"].includes(
@@ -3774,4 +3774,4 @@ const RawJSONLinesSchema = z$1.discriminatedUnion("type", [
   }).passthrough()
 ]);
 
-export { ApiClient as A, RawJSONLinesSchema as R, ApiSessionClient as a, packageJson as b, configuration as c, backoff as d, delay as e, readDaemonState as f, clearDaemonState as g, readCredentials as h, unrealMcpPythonDir as i, acquireDaemonLock as j, writeDaemonState as k, logger as l, ApiMachineClient as m, releaseDaemonLock as n, clearCredentials as o, projectPath as p, clearMachineId as q, readSettings as r, sendUnrealMcpTcpCommand as s, installUnrealMcpPluginToEngine as t, updateSettings as u, getLatestDaemonLog as v, writeCredentials as w };
+export { ApiClient as A, RawJSONLinesSchema as R, ApiSessionClient as a, packageJson as b, configuration as c, backoff as d, delay as e, readDaemonState as f, clearDaemonState as g, readCredentials as h, unrealMcpPythonDir as i, acquireDaemonLock as j, writeDaemonState as k, logger as l, ApiMachineClient as m, releaseDaemonLock as n, clearCredentials as o, projectPath as p, clearMachineId as q, readSettings as r, sendUnrealMcpTcpCommand as s, installUnrealMcpPluginToEngine as t, updateSettings as u, getLatestDaemonLog as v, writeCredentials as w, normalizeServerUrlForNode as x };

package/package.json

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

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

@@ -360,6 +360,16 @@ static TMap<FString, FUnrealMCPCommandSchema> BuildSchemas()
 
 	{
 		TArray<FUnrealMCPParamSchema> P;
+		AddEnumParam(
+			P,
+			TEXT("source"),
+			false,
+			TEXT("Capture source: auto picks PIE when playing, otherwise editor viewport."),
+			{TEXT("auto"), TEXT("pie"), TEXT("editor")},
+			{TEXT("mode")},
+			{{TEXT("play"), TEXT("pie")}, {TEXT("game"), TEXT("pie")}, {TEXT("viewport"), TEXT("editor")}});
+		AddNumberParam(P, TEXT("width"), false, TEXT("Optional output width (defaults to game viewport size or 1280)."), {TEXT("resX"), TEXT("w")});
+		AddNumberParam(P, TEXT("height"), false, TEXT("Optional output height (defaults to game viewport size or 720)."), {TEXT("resY"), TEXT("h")});
 		AddStringParam(P, TEXT("filepath"), false, TEXT("Output path. If omitted, defaults to <Project>/Saved/Screenshots/Flockbay/."), {TEXT("path"), TEXT("file_path")});
 		AddStringParam(P, TEXT("filename"), false, TEXT("Optional file name (auto-generated if omitted)."));
 		AddSimpleCommand(TEXT("take_screenshot"), TEXT("Take Screenshot"), TEXT("Capture a screenshot from the editor or PIE."), P, nullptr);

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

@@ -49,6 +49,10 @@
 #include "Engine/EngineTypes.h"
 #include "GameFramework/PlayerController.h"
 #include "Camera/PlayerCameraManager.h"
+#include "Engine/LocalPlayer.h"
+#include "Engine/SceneCapture2D.h"
+#include "Components/SceneCaptureComponent2D.h"
+#include "Engine/TextureRenderTarget2D.h"
 
 FUnrealMCPEditorCommands::FUnrealMCPEditorCommands()
 {
@@ -2295,26 +2299,193 @@ TSharedPtr<FJsonObject> FUnrealMCPEditorCommands::HandleTakeScreenshot(const TSh
         FilePath += TEXT(".png");
     }
 
-    // Get the active viewport
+    FString Source = TEXT("auto");
+    if (Params->TryGetStringField(TEXT("source"), Source))
+    {
+        Source = Source.TrimStartAndEnd().ToLower();
+        if (Source.IsEmpty())
+        {
+            Source = TEXT("auto");
+        }
+    }
+
+    double WidthNum = 0.0;
+    double HeightNum = 0.0;
+    int32 RequestedWidth = 0;
+    int32 RequestedHeight = 0;
+    if (Params->TryGetNumberField(TEXT("width"), WidthNum))
+    {
+        RequestedWidth = static_cast<int32>(WidthNum);
+    }
+    else if (Params->TryGetNumberField(TEXT("resX"), WidthNum))
+    {
+        RequestedWidth = static_cast<int32>(WidthNum);
+    }
+
+    if (Params->TryGetNumberField(TEXT("height"), HeightNum))
+    {
+        RequestedHeight = static_cast<int32>(HeightNum);
+    }
+    else if (Params->TryGetNumberField(TEXT("resY"), HeightNum))
+    {
+        RequestedHeight = static_cast<int32>(HeightNum);
+    }
+
+    const bool bPieRunning = (GEditor && GEditor->PlayWorld);
+    const bool bWantsPie = (Source == TEXT("pie"));
+    const bool bWantsEditor = (Source == TEXT("editor"));
+    const bool bAuto = (Source == TEXT("auto"));
+    if (!bWantsPie && !bWantsEditor && !bAuto)
+    {
+        return FUnrealMCPCommonUtils::CreateErrorResponse(FString::Printf(TEXT("Invalid screenshot source: %s (expected: auto|pie|editor)"), *Source));
+    }
+
+    const bool bUsePieCapture = bWantsPie || (bAuto && bPieRunning);
+    if (bUsePieCapture)
+    {
+        if (!bPieRunning)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("PIE is not running (PlayWorld is null)."));
+        }
+
+        UWorld* PlayWorld = GEditor->PlayWorld;
+        APlayerController* PC = PlayWorld ? PlayWorld->GetFirstPlayerController() : nullptr;
+        if (!PC)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to find PlayerController in PlayWorld."));
+        }
+
+        APlayerCameraManager* PCM = PC->PlayerCameraManager;
+        if (!PCM)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to find PlayerCameraManager (PlayerController.PlayerCameraManager is null)."));
+        }
+
+        int32 Width = RequestedWidth;
+        int32 Height = RequestedHeight;
+        if (Width <= 0 || Height <= 0)
+        {
+            if (ULocalPlayer* LocalPlayer = PC->GetLocalPlayer())
+            {
+                if (LocalPlayer->ViewportClient && LocalPlayer->ViewportClient->Viewport)
+                {
+                    const FIntPoint ViewSize = LocalPlayer->ViewportClient->Viewport->GetSizeXY();
+                    if (ViewSize.X > 0 && ViewSize.Y > 0)
+                    {
+                        if (Width <= 0)
+                        {
+                            Width = ViewSize.X;
+                        }
+                        if (Height <= 0)
+                        {
+                            Height = ViewSize.Y;
+                        }
+                    }
+                }
+            }
+        }
+
+        if (Width <= 0 || Height <= 0)
+        {
+            Width = 1280;
+            Height = 720;
+        }
+
+        const FVector CamLocation = PCM->GetCameraLocation();
+        const FRotator CamRotation = PCM->GetCameraRotation();
+
+        FActorSpawnParameters SpawnParams;
+        SpawnParams.ObjectFlags |= RF_Transient;
+        SpawnParams.SpawnCollisionHandlingOverride = ESpawnActorCollisionHandlingMethod::AlwaysSpawn;
+
+        ASceneCapture2D* CaptureActor = PlayWorld->SpawnActor<ASceneCapture2D>(ASceneCapture2D::StaticClass(), CamLocation, CamRotation, SpawnParams);
+        if (!CaptureActor)
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to spawn ASceneCapture2D for PIE screenshot capture."));
+        }
+
+        USceneCaptureComponent2D* CaptureComp = CaptureActor->GetCaptureComponent2D();
+        if (!CaptureComp)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get SceneCaptureComponent2D from ASceneCapture2D."));
+        }
+
+        UTextureRenderTarget2D* RenderTarget = NewObject<UTextureRenderTarget2D>(CaptureComp);
+        if (!RenderTarget)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to create UTextureRenderTarget2D."));
+        }
+        RenderTarget->InitCustomFormat(Width, Height, PF_B8G8R8A8, /*bForceLinearGamma*/ false);
+        RenderTarget->ClearColor = FLinearColor::Black;
+        RenderTarget->UpdateResourceImmediate(true);
+
+        CaptureComp->TextureTarget = RenderTarget;
+        CaptureComp->bCaptureEveryFrame = false;
+        CaptureComp->bCaptureOnMovement = false;
+        CaptureComp->CaptureSource = ESceneCaptureSource::SCS_FinalColorLDR;
+        CaptureComp->FOVAngle = PCM->GetFOVAngle();
+
+        CaptureComp->CaptureScene();
+
+        FTextureRenderTargetResource* RenderResource = RenderTarget->GameThread_GetRenderTargetResource();
+        if (!RenderResource)
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to get render target resource for PIE screenshot capture."));
+        }
+
+        TArray<FColor> Bitmap;
+        if (!RenderResource->ReadPixels(Bitmap))
+        {
+            CaptureActor->Destroy();
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to read pixels from PIE render target."));
+        }
+
+        CaptureActor->Destroy();
+
+        TArray<uint8> CompressedBitmap;
+        FImageUtils::CompressImageArray(Width, Height, Bitmap, CompressedBitmap);
+        if (!FFileHelper::SaveArrayToFile(CompressedBitmap, *FilePath))
+        {
+            return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to save screenshot PNG to disk."));
+        }
+
+        TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
+        ResultObj->SetStringField(TEXT("filepath"), FilePath);
+        ResultObj->SetStringField(TEXT("source"), TEXT("pie"));
+        ResultObj->SetNumberField(TEXT("width"), Width);
+        ResultObj->SetNumberField(TEXT("height"), Height);
+        return ResultObj;
+    }
+
+    // Editor viewport screenshot (can be stale if the OS window is not focused; prefer PIE capture when playing).
     if (GEditor && GEditor->GetActiveViewport())
     {
+        GEditor->RedrawAllViewports(/*bInvalidateHitProxies*/ true);
+
         FViewport* Viewport = GEditor->GetActiveViewport();
+        const FIntPoint ViewSize = Viewport->GetSizeXY();
         TArray<FColor> Bitmap;
-        FIntRect ViewportRect(0, 0, Viewport->GetSizeXY().X, Viewport->GetSizeXY().Y);
-        
+        FIntRect ViewportRect(0, 0, ViewSize.X, ViewSize.Y);
+
         if (Viewport->ReadPixels(Bitmap, FReadSurfaceDataFlags(), ViewportRect))
         {
             TArray<uint8> CompressedBitmap;
-            FImageUtils::CompressImageArray(Viewport->GetSizeXY().X, Viewport->GetSizeXY().Y, Bitmap, CompressedBitmap);
-            
+            FImageUtils::CompressImageArray(ViewSize.X, ViewSize.Y, Bitmap, CompressedBitmap);
+
             if (FFileHelper::SaveArrayToFile(CompressedBitmap, *FilePath))
             {
                 TSharedPtr<FJsonObject> ResultObj = MakeShared<FJsonObject>();
                 ResultObj->SetStringField(TEXT("filepath"), FilePath);
+                ResultObj->SetStringField(TEXT("source"), TEXT("editor"));
+                ResultObj->SetNumberField(TEXT("width"), ViewSize.X);
+                ResultObj->SetNumberField(TEXT("height"), ViewSize.Y);
                 return ResultObj;
             }
         }
     }
-    
-    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to take screenshot"));
+
+    return FUnrealMCPCommonUtils::CreateErrorResponse(TEXT("Failed to take screenshot."));
 }