flockbay 0.10.20 → 0.10.21

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

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-BYHCKlu_.cjs');
+var types = require('./types-DeH24uWs.cjs');
 var node_child_process = require('node:child_process');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -1258,7 +1258,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(path.dirname(binPath));
   }
   add(path.dirname(process$1.execPath));
@@ -1272,12 +1273,12 @@ 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-D_mglYG0.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-Bhkn02hu.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion(claudeExecutable) {
   try {
     const cleanEnv = buildDaemonSafeEnv(getCleanEnv(), claudeExecutable);
-    const output = claudeExecutable.includes("/") && !claudeExecutable.startsWith("\\\\") ? node_child_process.execFileSync(claudeExecutable, ["--version"], {
+    const output = (claudeExecutable.includes("/") || claudeExecutable.includes("\\")) && !claudeExecutable.startsWith("\\\\") ? node_child_process.execFileSync(claudeExecutable, ["--version"], {
       encoding: "utf8",
       stdio: ["pipe", "pipe", "pipe"],
       cwd: os.homedir(),
@@ -1295,6 +1296,35 @@ function getGlobalClaudeVersion(claudeExecutable) {
     return null;
   }
 }
+function tryReadBundledClaudeVersion(nodeModulesCliPath) {
+  try {
+    const pkgPath = path.join(path.dirname(path.dirname(nodeModulesCliPath)), "package.json");
+    if (!fs.existsSync(pkgPath)) return null;
+    const raw = fs.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();
@@ -1414,11 +1444,22 @@ function getDefaultClaudeCodePath() {
     return nodeModulesPath;
   }
   const globalVersion = getGlobalClaudeVersion(globalPath);
+  const bundledVersion = tryReadBundledClaudeVersion(nodeModulesPath);
   types.logger.debug(`[Claude SDK] Global version: ${globalVersion || "unknown"}`);
-  if (!globalVersion) {
+  types.logger.debug(`[Claude SDK] Bundled version: ${bundledVersion || "unknown"}`);
+  if (!globalVersion || !bundledVersion) {
     types.logger.debug(`[Claude SDK] Cannot compare versions, using global: ${globalPath}`);
     return globalPath;
   }
+  const cmp = compareSemver(bundledVersion, globalVersion);
+  if (cmp === null) {
+    types.logger.debug(`[Claude SDK] Cannot parse versions, using global: ${globalPath}`);
+    return globalPath;
+  }
+  if (cmp > 0) {
+    types.logger.debug(`[Claude SDK] Bundled Claude is newer (${bundledVersion} > ${globalVersion}), using bundled: ${nodeModulesPath}`);
+    return nodeModulesPath;
+  }
   return globalPath;
 }
 function logDebug(message) {
@@ -1693,8 +1734,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") {
@@ -2470,6 +2512,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();
@@ -2753,8 +2810,13 @@ ${next}`
     }
     let toolCallId = this.resolveToolCallId(toolName, input);
     if (!toolCallId) {
-      await types.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 types.delay(100);
+        toolCallId = this.resolveToolCallId(toolName, input);
+      }
       if (!toolCallId) {
         throw new Error(`Could not resolve tool call ID for ${toolName}`);
       }
@@ -2835,9 +2897,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;
         }
@@ -2845,6 +2910,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;
   }
   /**
@@ -7117,7 +7194,11 @@ async function uploadScreenshotViewsForSession(args) {
   for (const v of args.views) {
     const buf = await fs$2.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);
   }
@@ -7158,6 +7239,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) => {
     types.logger.debug("[flockbayMCP] Changing title to:", title);
@@ -8687,13 +8784,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.z.array(z.z.string()).describe("Image paths (absolute or relative to the session directory). PNG only."),
+        paths: z.z.array(z.z.string()).describe("Image paths (absolute or relative to the session directory). PNG/JPG only."),
         limit: z.z.number().int().positive().optional().describe("Max number of images to include (default 10)."),
         upload: z.z.boolean().optional().describe("Upload images to the session screenshots store and return HTTPS URLs (default true)."),
         includeBase64: z.z.boolean().optional().describe("Include base64 data in the payload (default false)."),
-        includeToolImages: z.z.boolean().optional().describe("Include MCP image blocks so vision models can see the PNGs (default false)."),
+        includeToolImages: z.z.boolean().optional().describe("Include MCP image blocks so vision models can see the images (default false)."),
         maxBytesPerImage: z.z.number().int().positive().optional().describe("Max bytes per image when includeBase64=true (default 2500000).")
       }
     },
@@ -8725,14 +8822,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 (!fs.existsSync(abs)) {
             throw new Error(`Image not found: ${abs}`);
@@ -8752,7 +8851,11 @@ ${String(st.stdout || "").trim()}`
               throw new Error(`Image too large (${st.size} bytes) to embed: ${abs}`);
             }
             const buf = await fs$2.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 });
           }
@@ -8777,7 +8880,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 {
@@ -8789,7 +8892,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
         };
@@ -12224,7 +12327,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CXJW0tzo.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-CH4lz1QX.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -12319,7 +12422,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-FOBXtEU6.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-DNSymY04.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {

package/dist/{index-CX0Z8pmz.mjs → index-By332wvJ.mjs}

@@ -1,7 +1,7 @@
 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-C4QeUggl.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';
@@ -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);
@@ -8665,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).")
       }
     },
@@ -8703,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}`);
@@ -8730,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 });
           }
@@ -8755,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 {
@@ -8767,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
         };
@@ -12202,7 +12305,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await import('./runCodex-Biis9GFw.mjs');
+      const { runCodex } = await import('./runCodex-d2KQX2mn.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -12297,7 +12400,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await import('./runGemini-BSH4b0wu.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-D_mglYG0.cjs');
-require('./types-BYHCKlu_.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-CX0Z8pmz.mjs';
-import './types-C4QeUggl.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-BYHCKlu_.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-C4QeUggl.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-CXJW0tzo.cjs → runCodex-CH4lz1QX.cjs}

@@ -2,7 +2,7 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-BYHCKlu_.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-D_mglYG0.cjs');
+var index = require('./index-Bhkn02hu.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
@@ -3179,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) {