flockbay 0.10.19 → 0.10.20

package/dist/codex/flockbayMcpStdioBridge.cjs

@@ -614,6 +614,14 @@ async function main() {
     "Unreal Editor: Launch Project",
     "Launch Unreal Editor for a given .uproject (no auto-restart). If the editor later crashes or becomes unreachable, Flockbay will abort the current agent run and report it in the chat."
   );
+  forwardTool(
+    "unreal_editor_relaunch_last",
+    {
+      extraArgs: z.z.array(z.z.string()).optional().describe("Optional replacement UnrealEditor command-line args (advanced).")
+    },
+    "Unreal Editor: Relaunch Last Project",
+    "Relaunch the last Unreal project previously launched via unreal_editor_launch in this session (no auto-restart). Use this after a crash once you\u2019ve fixed files."
+  );
   forwardTool(
     "unreal_headless_screenshot",
     {

package/dist/codex/flockbayMcpStdioBridge.mjs

@@ -612,6 +612,14 @@ async function main() {
     "Unreal Editor: Launch Project",
     "Launch Unreal Editor for a given .uproject (no auto-restart). If the editor later crashes or becomes unreachable, Flockbay will abort the current agent run and report it in the chat."
   );
+  forwardTool(
+    "unreal_editor_relaunch_last",
+    {
+      extraArgs: z.array(z.string()).optional().describe("Optional replacement UnrealEditor command-line args (advanced).")
+    },
+    "Unreal Editor: Relaunch Last Project",
+    "Relaunch the last Unreal project previously launched via unreal_editor_launch in this session (no auto-restart). Use this after a crash once you\u2019ve fixed files."
+  );
   forwardTool(
     "unreal_headless_screenshot",
     {

package/dist/{index-5jfGXWTy.mjs → index-CX0Z8pmz.mjs}

@@ -1,14 +1,14 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir } from 'node:os';
 import { randomUUID, createCipheriv, randomBytes } from 'node:crypto';
-import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as readDaemonState, g as clearDaemonState, b as packageJson, r as readSettings, h as readCredentials, u as updateSettings, w as writeCredentials, i as unrealMcpPythonDir, j as acquireDaemonLock, k as writeDaemonState, m as ApiMachineClient, n as releaseDaemonLock, s as sendUnrealMcpTcpCommand, A as ApiClient, o as clearCredentials, q as clearMachineId, t as installUnrealMcpPluginToEngine, v as getLatestDaemonLog, x as normalizeServerUrlForNode } from './types-BQvaA3sv.mjs';
+import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as readDaemonState, g as clearDaemonState, b as packageJson, r as readSettings, h as readCredentials, u as updateSettings, w as writeCredentials, i as unrealMcpPythonDir, j as acquireDaemonLock, k as writeDaemonState, m as ApiMachineClient, n as releaseDaemonLock, s as sendUnrealMcpTcpCommand, A as ApiClient, o as clearCredentials, q as clearMachineId, t as installUnrealMcpPluginToEngine, v as getLatestDaemonLog, x as normalizeServerUrlForNode } from './types-C4QeUggl.mjs';
 import { spawn, execFileSync, execSync } from 'node:child_process';
 import path, { resolve, join, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
 import * as fs from 'node:fs';
 import fs__default, { existsSync, readFileSync, mkdirSync, readdirSync, accessSync, constants, statSync, createReadStream, writeFileSync, unlinkSync } from 'node:fs';
 import process$1 from 'node:process';
-import fs$1, { readFile, access as access$1, mkdir, stat, readdir } from 'node:fs/promises';
+import fs$1, { readFile, access as access$1, mkdir, readdir, stat } from 'node:fs/promises';
 import fs$2, { watch, access } from 'fs/promises';
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
@@ -7208,7 +7208,8 @@ async function startFlockbayServer(client, options) {
       lastReachableAtMs: 0,
       lastIssueAtMs: 0,
       lastIssueKey: "",
-      launched: null
+      launched: null,
+      lastLaunch: null
     };
     const emitIssue = (event) => {
       const key = `${event.kind}:${event.severity}:${event.message}`;
@@ -7233,6 +7234,93 @@ async function startFlockbayServer(client, options) {
         }
       }
     };
+    const tailText = (text, maxChars) => {
+      const t = String(text || "").trim();
+      if (!t) return "";
+      if (t.length <= maxChars) return t;
+      return t.slice(t.length - maxChars);
+    };
+    const findLatestFile = async (dir, filter) => {
+      try {
+        const entries = await readdir(dir);
+        let best = null;
+        for (const name of entries) {
+          if (!filter(name)) continue;
+          const full = path.join(dir, name);
+          let st;
+          try {
+            st = await stat(full);
+          } catch {
+            continue;
+          }
+          if (!st?.isFile?.()) continue;
+          const mtimeMs = Number(st.mtimeMs || 0);
+          if (!best || mtimeMs > best.mtimeMs) best = { path: full, mtimeMs };
+        }
+        return best?.path ?? null;
+      } catch {
+        return null;
+      }
+    };
+    const findLatestCrashDir = async (projectRoot) => {
+      const crashesDir = path.join(projectRoot, "Saved", "Crashes");
+      try {
+        const entries = await readdir(crashesDir);
+        let best = null;
+        for (const name of entries) {
+          const full = path.join(crashesDir, name);
+          let st;
+          try {
+            st = await stat(full);
+          } catch {
+            continue;
+          }
+          if (!st?.isDirectory?.()) continue;
+          const mtimeMs = Number(st.mtimeMs || 0);
+          if (!best || mtimeMs > best.mtimeMs) best = { path: full, mtimeMs };
+        }
+        return best?.path ?? null;
+      } catch {
+        return null;
+      }
+    };
+    const readFileTail = async (filePath, maxBytes) => {
+      try {
+        const buf = await readFile(filePath);
+        const slice = buf.length > maxBytes ? buf.subarray(buf.length - maxBytes) : buf;
+        return slice.toString("utf8");
+      } catch {
+        return null;
+      }
+    };
+    const gatherCrashDiagnosticsBestEffort = async (uprojectPath) => {
+      const projectRoot = path.dirname(uprojectPath);
+      const summary = [];
+      const detail = { uprojectPath, projectRoot };
+      const latestLog = await findLatestFile(path.join(projectRoot, "Saved", "Logs"), (n) => n.toLowerCase().endsWith(".log"));
+      if (latestLog) {
+        detail.projectLogPath = latestLog;
+        const tail = await readFileTail(latestLog, 24e3);
+        if (tail) {
+          detail.projectLogTail = tailText(tail, 12e3);
+          summary.push(`Latest log: ${latestLog}`);
+        }
+      }
+      const latestCrashDir = await findLatestCrashDir(projectRoot);
+      if (latestCrashDir) {
+        detail.latestCrashDir = latestCrashDir;
+        const crashContext = await findLatestFile(latestCrashDir, (n) => n.toLowerCase().includes("crashcontext") && n.toLowerCase().endsWith(".xml"));
+        if (crashContext) {
+          detail.crashContextPath = crashContext;
+          const tail = await readFileTail(crashContext, 24e3);
+          if (tail) {
+            detail.crashContextTail = tailText(tail, 12e3);
+            summary.push(`CrashContext: ${crashContext}`);
+          }
+        }
+      }
+      return { detail, summary };
+    };
     const getUnrealEditorExe = (engineRoot) => {
       const root = engineRoot.trim().replace(/[\\/]+$/, "");
       if (process.platform === "darwin") {
@@ -7288,7 +7376,7 @@ ${res.stderr}`;
         kind: "unreachable",
         severity: "warning",
         detectedAtMs: now,
-        message: "Unreal Editor is no longer reachable (it was reachable earlier). It may have crashed or been closed.",
+        message: "Unreal Editor is no longer reachable (it was reachable earlier). It may have crashed or been closed.\nNext: fix the issue, then relaunch via unreal_editor_relaunch_last (if you launched from this session) or unreal_editor_launch.",
         detail: {
           lastReachableAtMs: state.lastReachableAtMs
         }
@@ -7320,20 +7408,35 @@ ${res.stderr}`;
         engineRoot,
         startedAtMs: Date.now()
       };
+      state.lastLaunch = {
+        uprojectPath,
+        engineRoot,
+        extraArgs,
+        startedAtMs: Date.now()
+      };
       child.on("exit", (code, signal) => {
-        const now = Date.now();
-        const exitCode = typeof code === "number" ? code : null;
-        const sig = typeof signal === "string" ? signal : null;
-        const isCrash = sig !== null || exitCode !== null && exitCode !== 0;
-        state.launched = null;
-        if (!isCrash) return;
-        emitIssue({
-          kind: "process_exit",
-          severity: "crash",
-          detectedAtMs: now,
-          message: `Unreal Editor process exited unexpectedly (code=${exitCode ?? "null"} signal=${sig ?? "null"}).`,
-          detail: { exitCode, signal: sig, pid, uprojectPath }
-        });
+        void (async () => {
+          const now = Date.now();
+          const exitCode = typeof code === "number" ? code : null;
+          const sig = typeof signal === "string" ? signal : null;
+          const isCrash = sig !== null || exitCode !== null && exitCode !== 0;
+          state.launched = null;
+          if (!isCrash) return;
+          const diag = await gatherCrashDiagnosticsBestEffort(uprojectPath).catch(() => ({ detail: {}, summary: [] }));
+          const msgParts = [
+            `Unreal Editor process exited unexpectedly (code=${exitCode ?? "null"} signal=${sig ?? "null"}).`,
+            `Project: ${uprojectPath}`,
+            ...diag.summary,
+            `Next: fix the issue, then relaunch via unreal_editor_relaunch_last (or unreal_editor_launch).`
+          ];
+          emitIssue({
+            kind: "process_exit",
+            severity: "crash",
+            detectedAtMs: now,
+            message: msgParts.filter(Boolean).join("\n"),
+            detail: { exitCode, signal: sig, pid, uprojectPath, ...diag.detail }
+          });
+        })();
       });
       child.on("error", (err) => {
         const now = Date.now();
@@ -7342,7 +7445,9 @@ ${res.stderr}`;
           kind: "process_exit",
           severity: "crash",
           detectedAtMs: now,
-          message: `Failed to launch Unreal Editor: ${err instanceof Error ? err.message : String(err)}`,
+          message: `Failed to launch Unreal Editor: ${err instanceof Error ? err.message : String(err)}
+Project: ${uprojectPath}
+Next: fix the issue, then relaunch via unreal_editor_relaunch_last (or unreal_editor_launch).`,
           detail: { pid, uprojectPath }
         });
       });
@@ -7352,6 +7457,12 @@ ${res.stderr}`;
       noteUnrealActivity,
       noteUnrealReachable,
       launchEditor,
+      relaunchLast: async (extraArgs) => {
+        const last = state.lastLaunch;
+        if (!last) throw new Error("No known prior Unreal launch in this session. Use unreal_editor_launch with an explicit uprojectPath.");
+        const mergedArgs = Array.isArray(extraArgs) && extraArgs.length > 0 ? extraArgs.filter((a) => typeof a === "string" && a.trim()) : last.extraArgs;
+        return launchEditor({ uprojectPath: last.uprojectPath, engineRoot: last.engineRoot, extraArgs: mergedArgs });
+      },
       stop: () => {
         try {
           interval.unref();
@@ -8858,6 +8969,32 @@ ${String(st.stdout || "").trim()}`
       isError: false
     };
   }));
+  mcp.registerTool("unreal_editor_relaunch_last", {
+    title: "Unreal Editor: Relaunch Last Project",
+    description: "Relaunch the last Unreal project previously launched via unreal_editor_launch in this session (no auto-restart). Use this after a crash once you\u2019ve fixed files. If it crashes again, Flockbay will abort and report again.",
+    inputSchema: {
+      extraArgs: z.array(z.string()).optional().describe("Optional replacement UnrealEditor command-line args (advanced).")
+    }
+  }, async (args) => runWithMcpToolCard("unreal_editor_relaunch_last", args, async () => {
+    const extraArgs = Array.isArray(args?.extraArgs) ? args.extraArgs : void 0;
+    unrealEditorSupervisor.noteUnrealActivity();
+    try {
+      const launched = await unrealEditorSupervisor.relaunchLast(extraArgs);
+      return {
+        content: [
+          { type: "text", text: `Relaunched Unreal Editor (last project).` },
+          { type: "text", text: JSON.stringify({ pid: launched.pid, exePath: launched.exePath }, null, 2) },
+          { type: "text", text: "Next: wait for the editor to finish loading, then re-run UnrealMCP tools." }
+        ],
+        isError: false
+      };
+    } catch (err) {
+      return {
+        content: [{ type: "text", text: err instanceof Error ? err.message : String(err) }],
+        isError: true
+      };
+    }
+  }));
   mcp.registerTool("unreal_build_project", {
     title: "Unreal Build Project (UBT)",
     description: "Build the project via Unreal Build Tool (via Engine/Build/BatchFiles/Build.*). Returns structured errors (file/line) and a log path for deep debugging.",
@@ -10283,6 +10420,7 @@ Fix: ${res.hint}` : "";
       "unreal_headless_screenshot",
       "unreal_latest_screenshots",
       "unreal_editor_launch",
+      "unreal_editor_relaunch_last",
       "unreal_build_project",
       "unreal_mcp_command",
       "unreal_mcp_list_capabilities",
@@ -12064,7 +12202,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await import('./runCodex-DwsaTF4s.mjs');
+      const { runCodex } = await import('./runCodex-Biis9GFw.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -12159,7 +12297,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await import('./runGemini-qA5dD13X.mjs');
+      const { runGemini } = await import('./runGemini-BSH4b0wu.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {

package/dist/{index-BiUf5vLX.cjs → index-D_mglYG0.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-CL_3YyS9.cjs');
+var types = require('./types-BYHCKlu_.cjs');
 var node_child_process = require('node:child_process');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -1272,7 +1272,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-BiUf5vLX.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-D_mglYG0.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion(claudeExecutable) {
   try {
@@ -7230,7 +7230,8 @@ async function startFlockbayServer(client, options) {
       lastReachableAtMs: 0,
       lastIssueAtMs: 0,
       lastIssueKey: "",
-      launched: null
+      launched: null,
+      lastLaunch: null
     };
     const emitIssue = (event) => {
       const key = `${event.kind}:${event.severity}:${event.message}`;
@@ -7255,6 +7256,93 @@ async function startFlockbayServer(client, options) {
         }
       }
     };
+    const tailText = (text, maxChars) => {
+      const t = String(text || "").trim();
+      if (!t) return "";
+      if (t.length <= maxChars) return t;
+      return t.slice(t.length - maxChars);
+    };
+    const findLatestFile = async (dir, filter) => {
+      try {
+        const entries = await fs$2.readdir(dir);
+        let best = null;
+        for (const name of entries) {
+          if (!filter(name)) continue;
+          const full = path.join(dir, name);
+          let st;
+          try {
+            st = await fs$2.stat(full);
+          } catch {
+            continue;
+          }
+          if (!st?.isFile?.()) continue;
+          const mtimeMs = Number(st.mtimeMs || 0);
+          if (!best || mtimeMs > best.mtimeMs) best = { path: full, mtimeMs };
+        }
+        return best?.path ?? null;
+      } catch {
+        return null;
+      }
+    };
+    const findLatestCrashDir = async (projectRoot) => {
+      const crashesDir = path.join(projectRoot, "Saved", "Crashes");
+      try {
+        const entries = await fs$2.readdir(crashesDir);
+        let best = null;
+        for (const name of entries) {
+          const full = path.join(crashesDir, name);
+          let st;
+          try {
+            st = await fs$2.stat(full);
+          } catch {
+            continue;
+          }
+          if (!st?.isDirectory?.()) continue;
+          const mtimeMs = Number(st.mtimeMs || 0);
+          if (!best || mtimeMs > best.mtimeMs) best = { path: full, mtimeMs };
+        }
+        return best?.path ?? null;
+      } catch {
+        return null;
+      }
+    };
+    const readFileTail = async (filePath, maxBytes) => {
+      try {
+        const buf = await fs$2.readFile(filePath);
+        const slice = buf.length > maxBytes ? buf.subarray(buf.length - maxBytes) : buf;
+        return slice.toString("utf8");
+      } catch {
+        return null;
+      }
+    };
+    const gatherCrashDiagnosticsBestEffort = async (uprojectPath) => {
+      const projectRoot = path.dirname(uprojectPath);
+      const summary = [];
+      const detail = { uprojectPath, projectRoot };
+      const latestLog = await findLatestFile(path.join(projectRoot, "Saved", "Logs"), (n) => n.toLowerCase().endsWith(".log"));
+      if (latestLog) {
+        detail.projectLogPath = latestLog;
+        const tail = await readFileTail(latestLog, 24e3);
+        if (tail) {
+          detail.projectLogTail = tailText(tail, 12e3);
+          summary.push(`Latest log: ${latestLog}`);
+        }
+      }
+      const latestCrashDir = await findLatestCrashDir(projectRoot);
+      if (latestCrashDir) {
+        detail.latestCrashDir = latestCrashDir;
+        const crashContext = await findLatestFile(latestCrashDir, (n) => n.toLowerCase().includes("crashcontext") && n.toLowerCase().endsWith(".xml"));
+        if (crashContext) {
+          detail.crashContextPath = crashContext;
+          const tail = await readFileTail(crashContext, 24e3);
+          if (tail) {
+            detail.crashContextTail = tailText(tail, 12e3);
+            summary.push(`CrashContext: ${crashContext}`);
+          }
+        }
+      }
+      return { detail, summary };
+    };
     const getUnrealEditorExe = (engineRoot) => {
       const root = engineRoot.trim().replace(/[\\/]+$/, "");
       if (process.platform === "darwin") {
@@ -7310,7 +7398,7 @@ ${res.stderr}`;
         kind: "unreachable",
         severity: "warning",
         detectedAtMs: now,
-        message: "Unreal Editor is no longer reachable (it was reachable earlier). It may have crashed or been closed.",
+        message: "Unreal Editor is no longer reachable (it was reachable earlier). It may have crashed or been closed.\nNext: fix the issue, then relaunch via unreal_editor_relaunch_last (if you launched from this session) or unreal_editor_launch.",
         detail: {
           lastReachableAtMs: state.lastReachableAtMs
         }
@@ -7342,20 +7430,35 @@ ${res.stderr}`;
         engineRoot,
         startedAtMs: Date.now()
       };
+      state.lastLaunch = {
+        uprojectPath,
+        engineRoot,
+        extraArgs,
+        startedAtMs: Date.now()
+      };
       child.on("exit", (code, signal) => {
-        const now = Date.now();
-        const exitCode = typeof code === "number" ? code : null;
-        const sig = typeof signal === "string" ? signal : null;
-        const isCrash = sig !== null || exitCode !== null && exitCode !== 0;
-        state.launched = null;
-        if (!isCrash) return;
-        emitIssue({
-          kind: "process_exit",
-          severity: "crash",
-          detectedAtMs: now,
-          message: `Unreal Editor process exited unexpectedly (code=${exitCode ?? "null"} signal=${sig ?? "null"}).`,
-          detail: { exitCode, signal: sig, pid, uprojectPath }
-        });
+        void (async () => {
+          const now = Date.now();
+          const exitCode = typeof code === "number" ? code : null;
+          const sig = typeof signal === "string" ? signal : null;
+          const isCrash = sig !== null || exitCode !== null && exitCode !== 0;
+          state.launched = null;
+          if (!isCrash) return;
+          const diag = await gatherCrashDiagnosticsBestEffort(uprojectPath).catch(() => ({ detail: {}, summary: [] }));
+          const msgParts = [
+            `Unreal Editor process exited unexpectedly (code=${exitCode ?? "null"} signal=${sig ?? "null"}).`,
+            `Project: ${uprojectPath}`,
+            ...diag.summary,
+            `Next: fix the issue, then relaunch via unreal_editor_relaunch_last (or unreal_editor_launch).`
+          ];
+          emitIssue({
+            kind: "process_exit",
+            severity: "crash",
+            detectedAtMs: now,
+            message: msgParts.filter(Boolean).join("\n"),
+            detail: { exitCode, signal: sig, pid, uprojectPath, ...diag.detail }
+          });
+        })();
       });
       child.on("error", (err) => {
         const now = Date.now();
@@ -7364,7 +7467,9 @@ ${res.stderr}`;
           kind: "process_exit",
           severity: "crash",
           detectedAtMs: now,
-          message: `Failed to launch Unreal Editor: ${err instanceof Error ? err.message : String(err)}`,
+          message: `Failed to launch Unreal Editor: ${err instanceof Error ? err.message : String(err)}
+Project: ${uprojectPath}
+Next: fix the issue, then relaunch via unreal_editor_relaunch_last (or unreal_editor_launch).`,
           detail: { pid, uprojectPath }
         });
       });
@@ -7374,6 +7479,12 @@ ${res.stderr}`;
       noteUnrealActivity,
       noteUnrealReachable,
       launchEditor,
+      relaunchLast: async (extraArgs) => {
+        const last = state.lastLaunch;
+        if (!last) throw new Error("No known prior Unreal launch in this session. Use unreal_editor_launch with an explicit uprojectPath.");
+        const mergedArgs = Array.isArray(extraArgs) && extraArgs.length > 0 ? extraArgs.filter((a) => typeof a === "string" && a.trim()) : last.extraArgs;
+        return launchEditor({ uprojectPath: last.uprojectPath, engineRoot: last.engineRoot, extraArgs: mergedArgs });
+      },
       stop: () => {
         try {
           interval.unref();
@@ -8880,6 +8991,32 @@ ${String(st.stdout || "").trim()}`
       isError: false
     };
   }));
+  mcp.registerTool("unreal_editor_relaunch_last", {
+    title: "Unreal Editor: Relaunch Last Project",
+    description: "Relaunch the last Unreal project previously launched via unreal_editor_launch in this session (no auto-restart). Use this after a crash once you\u2019ve fixed files. If it crashes again, Flockbay will abort and report again.",
+    inputSchema: {
+      extraArgs: z.z.array(z.z.string()).optional().describe("Optional replacement UnrealEditor command-line args (advanced).")
+    }
+  }, async (args) => runWithMcpToolCard("unreal_editor_relaunch_last", args, async () => {
+    const extraArgs = Array.isArray(args?.extraArgs) ? args.extraArgs : void 0;
+    unrealEditorSupervisor.noteUnrealActivity();
+    try {
+      const launched = await unrealEditorSupervisor.relaunchLast(extraArgs);
+      return {
+        content: [
+          { type: "text", text: `Relaunched Unreal Editor (last project).` },
+          { type: "text", text: JSON.stringify({ pid: launched.pid, exePath: launched.exePath }, null, 2) },
+          { type: "text", text: "Next: wait for the editor to finish loading, then re-run UnrealMCP tools." }
+        ],
+        isError: false
+      };
+    } catch (err) {
+      return {
+        content: [{ type: "text", text: err instanceof Error ? err.message : String(err) }],
+        isError: true
+      };
+    }
+  }));
   mcp.registerTool("unreal_build_project", {
     title: "Unreal Build Project (UBT)",
     description: "Build the project via Unreal Build Tool (via Engine/Build/BatchFiles/Build.*). Returns structured errors (file/line) and a log path for deep debugging.",
@@ -10305,6 +10442,7 @@ Fix: ${res.hint}` : "";
       "unreal_headless_screenshot",
       "unreal_latest_screenshots",
       "unreal_editor_launch",
+      "unreal_editor_relaunch_last",
       "unreal_build_project",
       "unreal_mcp_command",
       "unreal_mcp_list_capabilities",
@@ -12086,7 +12224,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-Bh3-ebwT.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CXJW0tzo.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -12181,7 +12319,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-hXryGqFd.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-FOBXtEU6.cjs'); });
       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-BiUf5vLX.cjs');
-require('./types-CL_3YyS9.cjs');
+require('./index-D_mglYG0.cjs');
+require('./types-BYHCKlu_.cjs');
 require('zod');
 require('node:child_process');
 require('node:fs');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-5jfGXWTy.mjs';
-import './types-BQvaA3sv.mjs';
+import './index-CX0Z8pmz.mjs';
+import './types-C4QeUggl.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:fs';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-CL_3YyS9.cjs');
+var types = require('./types-BYHCKlu_.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-BQvaA3sv.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-C4QeUggl.mjs';
 import 'axios';
 import 'node:fs';
 import 'node:os';

package/dist/{runCodex-DwsaTF4s.mjs → runCodex-Biis9GFw.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, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-BQvaA3sv.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-C4QeUggl.mjs';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { z } from 'zod';
@@ -10,7 +10,7 @@ import fs__default from 'node:fs';
 import os from 'node:os';
 import path, { resolve, join } from 'node:path';
 import { spawnSync } from 'node:child_process';
-import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, 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, e as detectUnrealProject, g as buildProjectCapsule, t as trimIdent, j as autoFinalizeCoordinationWorkItem, k as detectScreenshotsForGate, l as applyCoordinationSideEffectsFromMcpToolResult, m as stopCaffeinate } from './index-5jfGXWTy.mjs';
+import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, 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, e as detectUnrealProject, g as buildProjectCapsule, t as trimIdent, j as autoFinalizeCoordinationWorkItem, k as detectScreenshotsForGate, l as applyCoordinationSideEffectsFromMcpToolResult, m as stopCaffeinate } from './index-CX0Z8pmz.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';
@@ -2587,7 +2587,8 @@ async function runCodex(opts) {
       const push = (role, text) => {
         const t = String(text || "").trim();
         if (!t) return;
-        lines.push(`${role === "user" ? "User" : "Assistant"}: ${t}`);
+        const label = role === "user" ? "User" : role === "assistant" ? "Assistant" : "System";
+        lines.push(`${label}: ${t}`);
       };
       for (const row of rows.slice(-80)) {
         const content = row?.content;
@@ -2611,6 +2612,11 @@ async function runCodex(opts) {
               if (txt) push("assistant", txt);
             }
           }
+        } else if (payload.type === "event") {
+          const data = payload.data;
+          if (data && typeof data === "object" && data.type === "message" && typeof data.message === "string") {
+            push("system", data.message);
+          }
         } else if (payload.type === "codex") {
           const data = payload.data;
           if (data && typeof data === "object" && data.type === "message" && typeof data.message === "string") {

package/dist/{runCodex-Bh3-ebwT.cjs → runCodex-CXJW0tzo.cjs}

@@ -2,7 +2,7 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-CL_3YyS9.cjs');
+var types = require('./types-BYHCKlu_.cjs');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var stdio_js = require('@modelcontextprotocol/sdk/client/stdio.js');
 var z = require('zod');
@@ -12,7 +12,7 @@ var fs = require('node:fs');
 var os = require('node:os');
 var path = require('node:path');
 var node_child_process = require('node:child_process');
-var index = require('./index-BiUf5vLX.cjs');
+var index = require('./index-D_mglYG0.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
@@ -2589,7 +2589,8 @@ async function runCodex(opts) {
       const push = (role, text) => {
         const t = String(text || "").trim();
         if (!t) return;
-        lines.push(`${role === "user" ? "User" : "Assistant"}: ${t}`);
+        const label = role === "user" ? "User" : role === "assistant" ? "Assistant" : "System";
+        lines.push(`${label}: ${t}`);
       };
       for (const row of rows.slice(-80)) {
         const content = row?.content;
@@ -2613,6 +2614,11 @@ async function runCodex(opts) {
               if (txt) push("assistant", txt);
             }
           }
+        } else if (payload.type === "event") {
+          const data = payload.data;
+          if (data && typeof data === "object" && data.type === "message" && typeof data.message === "string") {
+            push("system", data.message);
+          }
         } else if (payload.type === "codex") {
           const data = payload.data;
           if (data && typeof data === "object" && data.type === "message" && typeof data.message === "string") {

package/dist/{runGemini-qA5dD13X.mjs → runGemini-BSH4b0wu.mjs}

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

package/dist/{runGemini-hXryGqFd.cjs → runGemini-FOBXtEU6.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-CL_3YyS9.cjs');
-var index = require('./index-BiUf5vLX.cjs');
+var types = require('./types-BYHCKlu_.cjs');
+var index = require('./index-D_mglYG0.cjs');
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var fs = require('fs');

package/dist/{types-CL_3YyS9.cjs → types-BYHCKlu_.cjs}

@@ -42,7 +42,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "flockbay";
-var version = "0.10.19";
+var version = "0.10.20";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -770,7 +770,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-CL_3YyS9.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-BYHCKlu_.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;

package/dist/{types-BQvaA3sv.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.19";
+var version = "0.10.20";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flockbay",
-  "version": "0.10.19",
+  "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."));
 }