flockbay 0.10.19 → 0.10.21

package/dist/{index-5jfGXWTy.mjs → index-By332wvJ.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-mXJc7o0P.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';
@@ -1236,7 +1236,8 @@ function buildDaemonSafeEnv(baseEnv, binPath) {
     if (!p) return;
     if (!prepend.includes(p) && !existingParts.includes(p)) prepend.push(p);
   };
-  if (binPath && binPath.includes("/") && !binPath.startsWith("\\\\")) {
+  const isPathLike = typeof binPath === "string" && binPath.length > 0 && (binPath.includes("/") || binPath.includes("\\")) && !binPath.startsWith("\\\\");
+  if (isPathLike) {
     add(dirname(binPath));
   }
   add(dirname(process$1.execPath));
@@ -1255,7 +1256,7 @@ const __dirname$1 = join(__filename$1, "..");
 function getGlobalClaudeVersion(claudeExecutable) {
   try {
     const cleanEnv = buildDaemonSafeEnv(getCleanEnv(), claudeExecutable);
-    const output = claudeExecutable.includes("/") && !claudeExecutable.startsWith("\\\\") ? execFileSync(claudeExecutable, ["--version"], {
+    const output = (claudeExecutable.includes("/") || claudeExecutable.includes("\\")) && !claudeExecutable.startsWith("\\\\") ? execFileSync(claudeExecutable, ["--version"], {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"],
       cwd: homedir(),
@@ -1273,6 +1274,35 @@ function getGlobalClaudeVersion(claudeExecutable) {
     return null;
   }
 }
+function tryReadBundledClaudeVersion(nodeModulesCliPath) {
+  try {
+    const pkgPath = join(dirname(dirname(nodeModulesCliPath)), "package.json");
+    if (!existsSync(pkgPath)) return null;
+    const raw = readFileSync(pkgPath, "utf8");
+    const parsed = JSON.parse(raw);
+    const v = typeof parsed?.version === "string" ? parsed.version.trim() : "";
+    return v || null;
+  } catch {
+    return null;
+  }
+}
+function parseSemver3(v) {
+  const m = String(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];
+}
+function compareSemver(a, b) {
+  const pa = parseSemver3(a);
+  const pb = parseSemver3(b);
+  if (!pa || !pb) return null;
+  if (pa[0] !== pb[0]) return pa[0] - pb[0];
+  if (pa[1] !== pb[1]) return pa[1] - pb[1];
+  return pa[2] - pb[2];
+}
 function getCleanEnv() {
   const env = { ...process$1.env };
   const cwd = process$1.cwd();
@@ -1392,11 +1422,22 @@ function getDefaultClaudeCodePath() {
     return nodeModulesPath;
   }
   const globalVersion = getGlobalClaudeVersion(globalPath);
+  const bundledVersion = tryReadBundledClaudeVersion(nodeModulesPath);
   logger.debug(`[Claude SDK] Global version: ${globalVersion || "unknown"}`);
-  if (!globalVersion) {
+  logger.debug(`[Claude SDK] Bundled version: ${bundledVersion || "unknown"}`);
+  if (!globalVersion || !bundledVersion) {
     logger.debug(`[Claude SDK] Cannot compare versions, using global: ${globalPath}`);
     return globalPath;
   }
+  const cmp = compareSemver(bundledVersion, globalVersion);
+  if (cmp === null) {
+    logger.debug(`[Claude SDK] Cannot parse versions, using global: ${globalPath}`);
+    return globalPath;
+  }
+  if (cmp > 0) {
+    logger.debug(`[Claude SDK] Bundled Claude is newer (${bundledVersion} > ${globalVersion}), using bundled: ${nodeModulesPath}`);
+    return nodeModulesPath;
+  }
   return globalPath;
 }
 function logDebug(message) {
@@ -1671,8 +1712,9 @@ function query(config) {
     stdio: ["pipe", "pipe", "pipe"],
     signal: config.options?.abort,
     env: spawnEnv,
-    // Use shell on Windows for global binaries and command-only mode
-    shell: !isJsFile && process$1.platform === "win32"
+    // Only use a shell on Windows when spawning a bare command (e.g. "claude").
+    // Passing large `--allowedTools` lists through cmd.exe can hit the ~8k command line limit.
+    shell: isCommandOnly && process$1.platform === "win32"
   });
   let childStdin = null;
   if (typeof prompt === "string") {
@@ -2448,6 +2490,21 @@ async function consumeToolQuota(args) {
   return { ok: true, allowed: true, unlimited: true };
 }
 
+function canonicalizeToolNameForMatching(name) {
+  if (name === "ExitPlanMode") return "exit_plan_mode";
+  return name;
+}
+function stripUndefinedDeep(value) {
+  if (value === null || value === void 0) return value;
+  if (Array.isArray(value)) return value.map(stripUndefinedDeep);
+  if (typeof value !== "object") return value;
+  const out = {};
+  for (const [key, child] of Object.entries(value)) {
+    if (child === void 0) continue;
+    out[key] = stripUndefinedDeep(child);
+  }
+  return out;
+}
 class PermissionHandler {
   toolCalls = [];
   responses = /* @__PURE__ */ new Map();
@@ -2731,8 +2788,13 @@ ${next}`
     }
     let toolCallId = this.resolveToolCallId(toolName, input);
     if (!toolCallId) {
-      await delay(1e3);
-      toolCallId = this.resolveToolCallId(toolName, input);
+      const isPlanMode = toolName === "exit_plan_mode" || toolName === "ExitPlanMode";
+      const timeoutMs = isPlanMode ? 3e3 : 1e3;
+      const deadline = Date.now() + timeoutMs;
+      while (!toolCallId && Date.now() < deadline) {
+        await delay(100);
+        toolCallId = this.resolveToolCallId(toolName, input);
+      }
       if (!toolCallId) {
         throw new Error(`Could not resolve tool call ID for ${toolName}`);
       }
@@ -2813,9 +2875,12 @@ ${next}`
    * Resolves tool call ID based on tool name and input
    */
   resolveToolCallId(name, args) {
+    const normalizedName = canonicalizeToolNameForMatching(name);
+    const normalizedArgs = stripUndefinedDeep(args);
     for (let i = this.toolCalls.length - 1; i >= 0; i--) {
       const call = this.toolCalls[i];
-      if (call.name === name && deepEqual(call.input, args)) {
+      const callName = canonicalizeToolNameForMatching(call.name);
+      if (callName === normalizedName && deepEqual(stripUndefinedDeep(call.input), normalizedArgs)) {
         if (call.used) {
           return null;
         }
@@ -2823,6 +2888,18 @@ ${next}`
         return call.id;
       }
     }
+    const candidates = [];
+    for (let i = this.toolCalls.length - 1; i >= 0; i--) {
+      const call = this.toolCalls[i];
+      if (call.used) continue;
+      const callName = canonicalizeToolNameForMatching(call.name);
+      if (callName === normalizedName) candidates.push(call);
+      if (candidates.length > 1) break;
+    }
+    if (candidates.length === 1) {
+      candidates[0].used = true;
+      return candidates[0].id;
+    }
     return null;
   }
   /**
@@ -7095,7 +7172,11 @@ async function uploadScreenshotViewsForSession(args) {
   for (const v of args.views) {
     const buf = await readFile(v.path);
     const filename = path.basename(v.path);
-    const contentType = filename.toLowerCase().endsWith(".png") ? "image/png" : "application/octet-stream";
+    const contentType = (() => {
+      const mime = detectImageMimeTypeFromBuffer(buf);
+      if (mime) return mime;
+      throw new Error(`Unsupported screenshot format (expected PNG/JPEG): ${v.path}`);
+    })();
     const blob = new Blob([buf], { type: contentType });
     form.append(`file:${v.id}`, blob, filename);
   }
@@ -7136,6 +7217,22 @@ async function uploadScreenshotViewsForSession(args) {
   }
   return out;
 }
+function detectImageMimeTypeFromBuffer(buf) {
+  if (!buf || buf.length < 12) return null;
+  if (buf[0] === 137 && buf[1] === 80 && buf[2] === 78 && buf[3] === 71 && buf[4] === 13 && buf[5] === 10 && buf[6] === 26 && buf[7] === 10) {
+    return "image/png";
+  }
+  if (buf[0] === 255 && buf[1] === 216 && buf[2] === 255) {
+    return "image/jpeg";
+  }
+  if (buf[0] === 71 && buf[1] === 73 && buf[2] === 70 && buf[3] === 56 && (buf[4] === 55 || buf[4] === 57) && buf[5] === 97) {
+    return "image/gif";
+  }
+  if (buf[0] === 82 && buf[1] === 73 && buf[2] === 70 && buf[3] === 70 && buf[8] === 87 && buf[9] === 69 && buf[10] === 66 && buf[11] === 80) {
+    return "image/webp";
+  }
+  return null;
+}
 async function startFlockbayServer(client, options) {
   const handler = async (title) => {
     logger.debug("[flockbayMCP] Changing title to:", title);
@@ -7208,7 +7305,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 +7331,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 +7473,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 +7505,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 +7542,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 +7554,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();
@@ -8554,13 +8762,13 @@ ${String(st.stdout || "").trim()}`
     "read_images",
     {
       title: "Read Images",
-      description: "Read one or more local PNG images by path and return a `{ views: [...] }` payload so the app can render them as a gallery.",
+      description: "Read one or more local images by path (PNG/JPEG) and return a `{ views: [...] }` payload so the app can render them as a gallery.",
       inputSchema: {
-        paths: z.array(z.string()).describe("Image paths (absolute or relative to the session directory). PNG only."),
+        paths: z.array(z.string()).describe("Image paths (absolute or relative to the session directory). PNG/JPG only."),
         limit: z.number().int().positive().optional().describe("Max number of images to include (default 10)."),
         upload: z.boolean().optional().describe("Upload images to the session screenshots store and return HTTPS URLs (default true)."),
         includeBase64: z.boolean().optional().describe("Include base64 data in the payload (default false)."),
-        includeToolImages: z.boolean().optional().describe("Include MCP image blocks so vision models can see the PNGs (default false)."),
+        includeToolImages: z.boolean().optional().describe("Include MCP image blocks so vision models can see the images (default false)."),
         maxBytesPerImage: z.number().int().positive().optional().describe("Max bytes per image when includeBase64=true (default 2500000).")
       }
     },
@@ -8592,14 +8800,16 @@ ${String(st.stdout || "").trim()}`
             const home = process.env.HOME || process.env.USERPROFILE || "";
             if (home) return path.join(home, p.slice(2));
           }
-          return path.isAbsolute(p) ? p : path.resolve(process.cwd(), p);
+          const baseDir = readSessionWorkingDirectory();
+          return path.isAbsolute(p) ? p : path.resolve(baseDir, p);
         };
         const idsSeen = /* @__PURE__ */ new Set();
         const viewsLocal = [];
         for (const inputPath of paths) {
           const abs = resolvePath(inputPath);
-          if (!abs.toLowerCase().endsWith(".png")) {
-            throw new Error(`Only PNG images are supported: ${abs}`);
+          const lower = abs.toLowerCase();
+          if (!lower.endsWith(".png") && !lower.endsWith(".jpg") && !lower.endsWith(".jpeg")) {
+            throw new Error(`Only PNG/JPG images are supported: ${abs}`);
           }
           if (!existsSync(abs)) {
             throw new Error(`Image not found: ${abs}`);
@@ -8619,7 +8829,11 @@ ${String(st.stdout || "").trim()}`
               throw new Error(`Image too large (${st.size} bytes) to embed: ${abs}`);
             }
             const buf = await readFile(abs);
-            viewsLocal.push({ id: unique, path: abs, base64: buf.toString("base64") });
+            const mime = detectImageMimeTypeFromBuffer(buf);
+            if (!mime) {
+              throw new Error(`Unsupported image format (expected PNG/JPEG): ${abs}`);
+            }
+            viewsLocal.push({ id: unique, path: abs, base64: buf.toString("base64"), mimeType: mime });
           } else {
             viewsLocal.push({ id: unique, path: abs });
           }
@@ -8644,7 +8858,7 @@ ${String(st.stdout || "").trim()}`
           viewsLocal.forEach((v, idx) => {
             if (!v.base64) return;
             content.push({ type: "text", text: `Image ${idx + 1}: ${v.id}` });
-            content.push({ type: "image", data: v.base64, mimeType: "image/png" });
+            content.push({ type: "image", data: v.base64, mimeType: v.mimeType || "image/png" });
           });
         }
         return {
@@ -8656,7 +8870,7 @@ ${String(st.stdout || "").trim()}`
         return {
           content: [
             { type: "text", text: `Failed to read images: ${error instanceof Error ? error.message : String(error)}` },
-            { type: "text", text: `Tip: pass absolute PNG paths, or relative paths from the session folder.` }
+            { type: "text", text: `Tip: pass absolute PNG/JPG paths, or relative paths from the session folder.` }
           ],
           isError: true
         };
@@ -8858,6 +9072,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 +10523,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 +12305,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await import('./runCodex-DwsaTF4s.mjs');
+      const { runCodex } = await import('./runCodex-d2KQX2mn.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -12159,7 +12400,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await import('./runGemini-qA5dD13X.mjs');
+      const { runGemini } = await import('./runGemini-Cn0C7MS1.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-BiUf5vLX.cjs');
-require('./types-CL_3YyS9.cjs');
+require('./index-Bhkn02hu.cjs');
+require('./types-DeH24uWs.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-By332wvJ.mjs';
+import './types-mXJc7o0P.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-DeH24uWs.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-mXJc7o0P.mjs';
 import 'axios';
 import 'node:fs';
 import 'node:os';

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

@@ -2,7 +2,7 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-CL_3YyS9.cjs');
+var types = require('./types-DeH24uWs.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-Bhkn02hu.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") {
@@ -3173,11 +3179,9 @@ async function runCodex(opts) {
     } else if (msg.type === "task_complete") {
       messageBuffer.addMessage("Task completed", "status");
       flushInflightExecCalls({ isError: false, reason: "task_complete" });
-      sendReady();
     } else if (msg.type === "turn_aborted") {
       messageBuffer.addMessage("Turn aborted", "status");
       flushInflightExecCalls({ isError: true, reason: "turn_aborted" });
-      sendReady();
     }
     if (msg.type === "task_started") {
       if (!thinking) {

package/dist/{runCodex-DwsaTF4s.mjs → runCodex-d2KQX2mn.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-mXJc7o0P.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-By332wvJ.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") {
@@ -3171,11 +3177,9 @@ async function runCodex(opts) {
     } else if (msg.type === "task_complete") {
       messageBuffer.addMessage("Task completed", "status");
       flushInflightExecCalls({ isError: false, reason: "task_complete" });
-      sendReady();
     } else if (msg.type === "turn_aborted") {
       messageBuffer.addMessage("Turn aborted", "status");
       flushInflightExecCalls({ isError: true, reason: "turn_aborted" });
-      sendReady();
     }
     if (msg.type === "task_started") {
       if (!thinking) {