flockbay 0.10.20 → 0.10.22

package/dist/{runGemini-BSH4b0wu.mjs → runGemini-CK43WQk8.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-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 { l as logger, b as packageJson, A as ApiClient, r as readSettings, p as projectPath, c as configuration } from './types-CMWcip0F.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, r as registerKillSessionHandler, d as startFlockbayServer, o as extractUserImagesMarker, p as getLatestUserImages, P as PLATFORM_SYSTEM_PROMPT, j as autoFinalizeCoordinationWorkItem, E as ElicitationHub, k as detectScreenshotsForGate, m as stopCaffeinate } from './index-BjZUYSzh.mjs';
 import { spawn, spawnSync } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
@@ -43,6 +43,17 @@ const KNOWN_TOOL_PATTERNS = {
   save_memory: ["save_memory", "save-memory"],
   think: ["think"]
 };
+const MCP_FLOCKBAY_TOOL_RE = /\bmcp__flockbay__[a-z0-9_]+\b/gi;
+const UNREAL_MCP_TOOL_RE = /\bunreal_mcp_[a-z0-9_]+\b/gi;
+function extractFirstToolNameFromText(text) {
+  if (!text) return null;
+  const lower = text.toLowerCase();
+  const mcpMatch = lower.match(MCP_FLOCKBAY_TOOL_RE);
+  if (mcpMatch && mcpMatch[0]) return mcpMatch[0];
+  const unrealMatch = lower.match(UNREAL_MCP_TOOL_RE);
+  if (unrealMatch && unrealMatch[0]) return `mcp__flockbay__${unrealMatch[0]}`;
+  return null;
+}
 function isInvestigationTool(toolCallId, toolKind) {
   return toolCallId.includes("codebase_investigator") || toolCallId.includes("investigator") || typeof toolKind === "string" && toolKind.includes("investigator");
 }
@@ -55,6 +66,18 @@ function extractToolNameFromId(toolCallId) {
       }
     }
   }
+  const uuidLike = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i.test(toolCallId);
+  if (!uuidLike) {
+    const prefix = toolCallId.split(/[-:]/, 1)[0] || "";
+    const trimmed = prefix.trim();
+    if (trimmed.length >= 2 && trimmed.length <= 160) {
+      const hasNonHexAlpha = /[g-z]/i.test(trimmed) || /[A-Z]/.test(trimmed) || /_/.test(trimmed);
+      const saneChars = /^[A-Za-z0-9_]+$/.test(trimmed);
+      if (saneChars && hasNonHexAlpha) {
+        return trimmed;
+      }
+    }
+  }
   return null;
 }
 function determineToolName(toolName, toolCallId, input, params, context) {
@@ -65,20 +88,30 @@ function determineToolName(toolName, toolCallId, input, params, context) {
   if (idToolName) {
     return idToolName;
   }
+  const idTextToolName = extractFirstToolNameFromText(toolCallId);
+  if (idTextToolName) {
+    return idTextToolName;
+  }
   if (input && typeof input === "object") {
-    const inputStr = JSON.stringify(input).toLowerCase();
+    const inputStr = JSON.stringify(input);
+    const extracted = extractFirstToolNameFromText(inputStr);
+    if (extracted) return extracted;
+    const inputLower = inputStr.toLowerCase();
     for (const [toolName2, patterns] of Object.entries(KNOWN_TOOL_PATTERNS)) {
       for (const pattern of patterns) {
-        if (inputStr.includes(pattern.toLowerCase())) {
+        if (inputLower.includes(pattern.toLowerCase())) {
           return toolName2;
         }
       }
     }
   }
-  const paramsStr = JSON.stringify(params).toLowerCase();
+  const paramsStr = JSON.stringify(params);
+  const paramsExtracted = extractFirstToolNameFromText(paramsStr);
+  if (paramsExtracted) return paramsExtracted;
+  const paramsLower = paramsStr.toLowerCase();
   for (const [toolName2, patterns] of Object.entries(KNOWN_TOOL_PATTERNS)) {
     for (const pattern of patterns) {
-      if (paramsStr.includes(pattern.toLowerCase())) {
+      if (paramsLower.includes(pattern.toLowerCase())) {
         return toolName2;
       }
     }
@@ -315,7 +348,7 @@ class AcpSdkBackend {
             this.emit({
               type: "status",
               status: "error",
-              detail: "Model not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite"
+              detail: "Model not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite, gemini-3-pro-preview, gemini-3-flash-preview"
             });
           } else if (/authentication required/i.test(text) || /login required/i.test(text) || /invalid.*(api key|key)/i.test(text) || /permission denied/i.test(text)) {
             const excerpt = this.stderrExcerpt(20);
@@ -1818,7 +1851,7 @@ class GeminiPermissionHandler {
     const decision = result.decision;
     const reason = result.reason;
     const kind = decision === "approved" || decision === "approved_for_session" ? "policy_allow" : decision === "abort" && reason === "permission_prompt_required" ? "policy_prompt" : "policy_block";
-    const summary = kind === "policy_allow" ? "Allowed." : kind === "policy_prompt" ? "Waiting for permission to run this tool." : reason ? `Blocked: ${reason}` : "Blocked by policy.";
+    const summary = kind === "policy_allow" ? "Allowed." : kind === "policy_prompt" ? "Waiting for permission to run this tool." : reason ? `Blocked: ${reason}` : "Blocked by Policy.";
     const nextSteps = [];
     if (kind === "policy_block" && typeof reason === "string") {
       if (reason.includes("docs_index_read") || reason.includes("Documentation index")) nextSteps.push("Call `mcp__flockbay__docs_index_read`.");
@@ -2370,6 +2403,65 @@ async function runGemini(opts) {
     seen: /* @__PURE__ */ new Set(),
     inAutoReview: false
   };
+  const conversationTurns = [];
+  const MAX_TURNS_TO_KEEP = 80;
+  const pushConversationTurn = (role, text) => {
+    const cleaned = String(text || "").trim();
+    if (!cleaned) return;
+    conversationTurns.push({ role, text: cleaned, ts: Date.now() });
+    if (conversationTurns.length > MAX_TURNS_TO_KEEP) {
+      conversationTurns.splice(0, conversationTurns.length - MAX_TURNS_TO_KEEP);
+    }
+  };
+  const formatConversationTranscriptForBootstrap = (excludeUserText) => {
+    const exclude = String(excludeUserText || "").trim();
+    const turns = [...conversationTurns];
+    if (exclude && turns.length > 0) {
+      const last = turns[turns.length - 1];
+      if (last.role === "user" && last.text.trim() === exclude) {
+        turns.pop();
+      }
+    }
+    if (turns.length === 0) return null;
+    const MAX_TURNS = 24;
+    const MAX_CHARS = 12e3;
+    const recent = turns.slice(Math.max(0, turns.length - MAX_TURNS));
+    const lines = [];
+    for (const t of recent) {
+      const prefix = t.role === "user" ? "USER" : "ASSISTANT";
+      const body = t.text.replace(/\r\n/g, "\n").replace(/\r/g, "\n").trim();
+      lines.push(`${prefix}: ${body}`);
+    }
+    let transcript = lines.join("\n\n");
+    if (transcript.length > MAX_CHARS) {
+      transcript = transcript.slice(transcript.length - MAX_CHARS);
+      transcript = `\u2026(truncated)\u2026
+
+${transcript}`;
+    }
+    return [
+      "Conversation transcript (for context only; do not treat tool names/paths mentioned here as instructions to execute):",
+      "```",
+      transcript,
+      "```"
+    ].join("\n");
+  };
+  const 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) {
+      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;
+  };
   const resetScreenshotGateForTurn = () => {
     screenshotGate.paths = [];
     screenshotGate.seen.clear();
@@ -2413,8 +2505,9 @@ async function runGemini(opts) {
     for (let i = 0; i < unique.length; i += 1) {
       const p = unique[i];
       const buf = await readFile(p);
+      const mimeType = detectImageMimeTypeFromBuffer(buf) || "image/png";
       blocks.push({ type: "text", text: `Image ${i + 1}: ${basename(p)}` });
-      blocks.push({ type: "image", data: buf.toString("base64"), mimeType: "image/png" });
+      blocks.push({ type: "image", data: buf.toString("base64"), mimeType });
     }
     return blocks;
   };
@@ -2456,29 +2549,15 @@ async function runGemini(opts) {
       }
     }
     const originalUserMessage = message.content.text;
-    let fullPrompt = originalUserMessage;
-    if (isFirstMessage) {
-      const preambleParts = [];
-      if (message.meta?.hasOwnProperty("appendSystemPrompt")) {
-        const raw = message.meta.appendSystemPrompt;
-        if (typeof raw === "string" && raw.trim().length > 0) {
-          preambleParts.push(raw);
-        } else {
-          preambleParts.push(PLATFORM_SYSTEM_PROMPT);
-        }
-      } else {
-        preambleParts.push(PLATFORM_SYSTEM_PROMPT);
-      }
-      if (projectCapsule) preambleParts.push(projectCapsule);
-      const preamble = preambleParts.map((p) => String(p || "").trim()).filter(Boolean).join("\n\n");
-      fullPrompt = preamble.length > 0 ? preamble + "\n\n" + originalUserMessage : originalUserMessage;
-      isFirstMessage = false;
-    }
+    pushConversationTurn("user", originalUserMessage);
+    const appendSystemPrompt = message.meta?.hasOwnProperty("appendSystemPrompt") && typeof message.meta.appendSystemPrompt === "string" ? message.meta.appendSystemPrompt : null;
+    const fullPrompt = originalUserMessage;
     const mode = {
       permissionMode: messagePermissionMode || "default",
       model: messageModel,
-      originalUserMessage
+      originalUserMessage,
       // Store original message separately
+      appendSystemPrompt
     };
     const promptText = images.length > 0 ? withUserImagesMarker(fullPrompt, images.length) : fullPrompt;
     messageQueue.push(promptText, mode, images.length > 0 ? { isolate: true } : void 0);
@@ -2488,19 +2567,14 @@ async function runGemini(opts) {
   const keepAliveInterval = setInterval(() => {
     session.keepAlive(thinking, "remote");
   }, 2e3);
-  let isFirstMessage = true;
   const autoPrompt = String(process.env.FLOCKBAY_AUTO_PROMPT || "").trim();
   const autoExitOnIdle = String(process.env.FLOCKBAY_AUTO_EXIT_ON_IDLE || "").trim() === "1";
   if (autoPrompt) {
-    const preambleParts = [PLATFORM_SYSTEM_PROMPT];
-    if (projectCapsule) preambleParts.push(projectCapsule);
-    const preamble = preambleParts.map((p) => String(p || "").trim()).filter(Boolean).join("\n\n");
-    const fullPrompt = preamble.length > 0 ? preamble + "\n\n" + autoPrompt : autoPrompt;
-    isFirstMessage = false;
-    messageQueue.push(fullPrompt, {
+    messageQueue.push(autoPrompt, {
       permissionMode: "default",
       model: void 0,
-      originalUserMessage: autoPrompt
+      originalUserMessage: autoPrompt,
+      appendSystemPrompt: null
     });
   }
   const sendReady = () => {
@@ -2515,6 +2589,30 @@ async function runGemini(opts) {
       logger.debug("[Gemini] Failed to send ready push", pushError);
     }
   };
+  let pendingTurnCompletion = null;
+  const beginTurnCompletionWait = () => {
+    if (pendingTurnCompletion) {
+      logger.debug("[Gemini] beginTurnCompletionWait called while a turn is already pending; replacing pending wait");
+      try {
+        pendingTurnCompletion.resolve("error");
+      } catch {
+      }
+      pendingTurnCompletion = null;
+    }
+    let resolve2;
+    const promise = new Promise((res) => {
+      resolve2 = res;
+    });
+    pendingTurnCompletion = { sawRunning: false, resolve: resolve2, promise };
+    return promise;
+  };
+  const maybeResolveTurnCompletion = (status) => {
+    if (!pendingTurnCompletion) return;
+    if (!pendingTurnCompletion.sawRunning) return;
+    const pending = pendingTurnCompletion;
+    pendingTurnCompletion = null;
+    pending.resolve(status);
+  };
   const emitReadyIfIdle = () => {
     if (shouldExit) {
       return false;
@@ -2542,10 +2640,36 @@ async function runGemini(opts) {
   let wasSessionCreated = false;
   let abortNote = null;
   let abortNoteSentToSession = false;
+  let abortRequested = false;
+  let readySentForAbort = false;
+  function normalizeCancelNote(input) {
+    if (typeof input === "string") return input.trim() ? input.trim() : null;
+    if (!input || typeof input !== "object") return null;
+    const note = typeof input.note === "string" ? String(input.note).trim() : "";
+    if (note) return note;
+    const reason = typeof input.reason === "string" ? String(input.reason).trim() : "";
+    if (reason) return reason;
+    return null;
+  }
+  function makeAbortError(message = "Aborted") {
+    const error = new Error(message);
+    error.name = "AbortError";
+    return error;
+  }
+  function abortable(signal, promise) {
+    if (signal.aborted) return Promise.reject(makeAbortError());
+    return new Promise((resolve2, reject) => {
+      const onAbort = () => reject(makeAbortError());
+      signal.addEventListener("abort", onAbort, { once: true });
+      promise.then(resolve2, reject).finally(() => signal.removeEventListener("abort", onAbort));
+    });
+  }
   async function handleAbort(note, options) {
     logger.debug("[Gemini] Abort requested - stopping current task");
-    if (typeof note === "string" && note.trim()) {
-      abortNote = note.trim();
+    abortRequested = true;
+    const normalizedNote = normalizeCancelNote(note);
+    if (normalizedNote) {
+      abortNote = normalizedNote;
       abortNoteSentToSession = Boolean(options?.alreadySentToSession);
     }
     session.sendCodexMessage({
@@ -2556,6 +2680,13 @@ async function runGemini(opts) {
     diffProcessor.reset();
     try {
       abortController.abort();
+      if (pendingTurnCompletion) {
+        try {
+          pendingTurnCompletion.resolve("error");
+        } catch {
+        }
+        pendingTurnCompletion = null;
+      }
       messageQueue.reset();
       if (geminiBackend && acpSessionId) {
         await geminiBackend.cancel(acpSessionId);
@@ -2694,6 +2825,7 @@ async function runGemini(opts) {
   };
   let accumulatedResponse = "";
   let isResponseInProgress = false;
+  let currentResponseMessageId = null;
   function setupGeminiMessageHandler(backend) {
     backend.onMessage((msg) => {
       switch (msg.type) {
@@ -2723,6 +2855,9 @@ async function runGemini(opts) {
           if (msg.status === "running") {
             thinking = true;
             session.keepAlive(thinking, "remote");
+            if (pendingTurnCompletion) {
+              pendingTurnCompletion.sawRunning = true;
+            }
             session.sendCodexMessage({
               type: "task_started",
               id: randomUUID()
@@ -2763,14 +2898,18 @@ async function runGemini(opts) {
               logger.debug(`[gemini] Sending complete message to mobile (length: ${finalMessageText.length}): ${finalMessageText.substring(0, 100)}...`);
               logger.debug(`[gemini] Full message payload:`, JSON.stringify(messagePayload, null, 2));
               session.sendCodexMessage(messagePayload);
+              pushConversationTurn("assistant", finalMessageText);
               accumulatedResponse = "";
               isResponseInProgress = false;
             }
+            maybeResolveTurnCompletion(msg.status);
           } else if (msg.status === "error") {
             thinking = false;
             session.keepAlive(thinking, "remote");
             accumulatedResponse = "";
             isResponseInProgress = false;
+            currentResponseMessageId = null;
+            maybeResolveTurnCompletion("error");
             const errorMessage = stringifyErrorish(msg.detail || "Unknown error");
             messageBuffer.addMessage(`Error: ${errorMessage}`, "status");
             session.sendCodexMessage({
@@ -2967,6 +3106,7 @@ async function runGemini(opts) {
       if (!message) {
         break;
       }
+      let startedSessionThisTurn = false;
       if (wasSessionCreated && currentModeHash && message.hash !== currentModeHash) {
         logger.debug("[Gemini] Mode changed \u2013 restarting Gemini session");
         messageBuffer.addMessage("\u2550".repeat(40), "status");
@@ -2993,8 +3133,9 @@ async function runGemini(opts) {
         const actualModel = determineGeminiModel(modelToUse, localConfigForModel);
         logger.debug(`[gemini] Model change - modelToUse=${modelToUse}, actualModel=${actualModel}`);
         logger.debug("[gemini] Starting new ACP session with model:", actualModel);
-        const { sessionId } = await geminiBackend.startSession();
+        const { sessionId } = await abortable(abortController.signal, geminiBackend.startSession());
         acpSessionId = sessionId;
+        startedSessionThisTurn = true;
         logger.debug(`[gemini] New ACP session started: ${acpSessionId}`);
         logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
         updateDisplayedModel(actualModel, false);
@@ -3009,6 +3150,15 @@ async function runGemini(opts) {
       let retryThisTurn = false;
       let skipAutoFinalize = false;
       try {
+        const turnSignal = abortController.signal;
+        const sendPromptAndWait = async (prompt) => {
+          if (!geminiBackend || !acpSessionId) {
+            throw new Error("Gemini backend or session not initialized");
+          }
+          const completion = beginTurnCompletionWait();
+          await abortable(turnSignal, geminiBackend.sendPrompt(acpSessionId, prompt));
+          return await abortable(turnSignal, completion);
+        };
         if (first || !wasSessionCreated) {
           if (!geminiBackend) {
             await refreshGeminiCloudToken("before-backend-create");
@@ -3033,8 +3183,9 @@ async function runGemini(opts) {
           if (!acpSessionId) {
             logger.debug("[gemini] Starting ACP session...");
             updatePermissionMode(message.mode.permissionMode);
-            const { sessionId } = await geminiBackend.startSession();
+            const { sessionId } = await abortable(turnSignal, geminiBackend.startSession());
             acpSessionId = sessionId;
+            startedSessionThisTurn = true;
             logger.debug(`[gemini] ACP session started: ${acpSessionId}`);
             wasSessionCreated = true;
             currentModeHash = message.hash;
@@ -3052,26 +3203,48 @@ async function runGemini(opts) {
         }
         const promptToSend = message.message;
         const parsedPrompt = extractUserImagesMarker(promptToSend);
-        const promptText = parsedPrompt.text;
         const promptImages = parsedPrompt.hasImages ? getLatestUserImages().slice(0, parsedPrompt.count) : [];
+        const originalUserMessage = (message.mode?.originalUserMessage || parsedPrompt.text || "").trim();
+        let promptText = parsedPrompt.text;
+        if (startedSessionThisTurn) {
+          const override = typeof message.mode?.appendSystemPrompt === "string" ? message.mode.appendSystemPrompt.trim() : "";
+          const systemPrompt = override.length > 0 ? override : PLATFORM_SYSTEM_PROMPT;
+          const preambleParts = [systemPrompt];
+          if (projectCapsule) preambleParts.push(projectCapsule);
+          const transcript = formatConversationTranscriptForBootstrap(originalUserMessage);
+          if (transcript) preambleParts.push(transcript);
+          const preamble = preambleParts.map((p) => String(p || "").trim()).filter(Boolean).join("\n\n");
+          promptText = preamble.length > 0 ? `${preamble}
+
+${originalUserMessage}` : originalUserMessage;
+        }
         if (promptImages.length > 0) {
           const blocks = [
             { type: "text", text: promptText },
             ...promptImages.map((img) => ({ type: "image", data: img.base64, mimeType: img.mimeType }))
           ];
           logger.debug(`[gemini] Sending multimodal prompt blocks (textLength=${promptText.length}, images=${promptImages.length})`);
-          await geminiBackend.sendPrompt(acpSessionId, blocks);
+          const status = await sendPromptAndWait(blocks);
+          if (status !== "idle") {
+            skipAutoFinalize = true;
+          }
         } else {
           logger.debug(`[gemini] Sending prompt to Gemini (length: ${promptText.length}): ${promptText.substring(0, 100)}...`);
           logger.debug(`[gemini] Full prompt: ${promptText}`);
-          await geminiBackend.sendPrompt(acpSessionId, promptText);
+          const status = await sendPromptAndWait(promptText);
+          if (status !== "idle") {
+            skipAutoFinalize = true;
+          }
         }
         logger.debug("[gemini] Prompt sent successfully");
-        if (!screenshotGate.inAutoReview && screenshotGate.paths.length > 0) {
+        if (!skipAutoFinalize && !screenshotGate.inAutoReview && screenshotGate.paths.length > 0) {
           screenshotGate.inAutoReview = true;
           messageBuffer.addMessage("Auto-reviewing screenshots\u2026", "status");
           const blocks = await buildScreenshotReviewBlocks(screenshotGate.paths);
-          await geminiBackend.sendPrompt(acpSessionId, blocks);
+          const status = await sendPromptAndWait(blocks);
+          if (status !== "idle") {
+            skipAutoFinalize = true;
+          }
           screenshotGate.inAutoReview = false;
         }
         if (first) {
@@ -3080,14 +3253,21 @@ async function runGemini(opts) {
       } catch (error) {
         logger.debug("[gemini] Error in gemini session:", error);
         const isAbortError = error instanceof Error && error.name === "AbortError";
-        if (isAbortError) {
+        const treatAsAbort = abortRequested || isAbortError;
+        if (treatAsAbort) {
           skipAutoFinalize = true;
-          const note = abortNote || "Aborted by user";
+          readySentForAbort = true;
+          const note = abortNote || "Canceled by user";
           abortNote = null;
           const alreadySent = abortNoteSentToSession;
           abortNoteSentToSession = false;
+          abortRequested = false;
+          accumulatedResponse = "";
+          isResponseInProgress = false;
+          currentResponseMessageId = null;
           messageBuffer.addMessage(note, "status");
           if (!alreadySent) session.sendSessionEvent({ type: "message", message: note });
+          session.sendSessionEvent({ type: "ready" });
         } else {
           const rawErrorString = error instanceof Error ? error.message : String(error);
           const looksLikeAuthOrQuotaError = /unauthenticated|unauthorized|invalid (api )?key|api key not valid|permission denied|forbidden|expired|quota|usage limit|rate limit|resource exhausted|resource_exhausted|status 401|status 403|status 429|\b401\b|\b403\b|\b429\b/i.test(rawErrorString);
@@ -3119,7 +3299,7 @@ async function runGemini(opts) {
             const errorString = String(error);
             if (errorCode === 404 || errorDetails.includes("notFound") || errorDetails.includes("404") || errorMessage.includes("not found") || errorMessage.includes("404")) {
               const currentModel2 = displayedModel || "gemini-2.5-pro";
-              errorMsg = `Model "${currentModel2}" not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite`;
+              errorMsg = `Model "${currentModel2}" not found. Available models: gemini-2.5-pro, gemini-2.5-flash, gemini-2.5-flash-lite, gemini-3-pro-preview, gemini-3-flash-preview`;
             } else if (errorCode === 429 || errorDetails.includes("429") || errorMessage.includes("429") || errorString.includes("429") || errorDetails.includes("rateLimitExceeded") || errorDetails.includes("RESOURCE_EXHAUSTED") || errorMessage.includes("Rate limit exceeded") || errorMessage.includes("Resource exhausted") || errorString.includes("rateLimitExceeded") || errorString.includes("RESOURCE_EXHAUSTED")) {
               errorMsg = "Gemini API rate limit exceeded. Please wait a moment and try again. The API will retry automatically.";
             } else if (errorDetails.includes("quota") || errorMessage.includes("quota") || errorString.includes("quota")) {
@@ -3143,6 +3323,7 @@ async function runGemini(opts) {
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();
+        abortRequested = false;
         thinking = false;
         session.keepAlive(thinking, "remote");
         if (!retryThisTurn) {
@@ -3172,7 +3353,11 @@ async function runGemini(opts) {
               });
             }
           }
-          emitReadyIfIdle();
+          if (readySentForAbort) {
+            readySentForAbort = false;
+          } else {
+            emitReadyIfIdle();
+          }
         }
         logger.debug(`[gemini] Main loop: turn completed, continuing to next iteration (queue size: ${messageQueue.size()})`);
       }

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

@@ -11,7 +11,7 @@ import { readFile, unlink, open, stat, mkdir, writeFile, rename } from 'node:fs/
 import * as z from 'zod';
 import { z as z$1 } from 'zod';
 import { spawn } from 'child_process';
-import { realpath, stat as stat$1, readdir, rm, mkdir as mkdir$1, readFile as readFile$1, open as open$1, writeFile as writeFile$1, chmod } from 'fs/promises';
+import { readdir, mkdir as mkdir$1, realpath, stat as stat$1, rm, readFile as readFile$1, open as open$1, writeFile as writeFile$1, chmod } from 'fs/promises';
 import { randomUUID, createHash } from 'crypto';
 import { dirname, resolve, join as join$1, relative } from 'path';
 import { fileURLToPath } from 'url';
@@ -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.20";
+var version = "0.10.22";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -1570,6 +1570,44 @@ function registerCommonHandlers(rpcHandlerManager, workingDirectory, coordinatio
       };
     }
   });
+  rpcHandlerManager.registerHandler("fs_list_dir", async (data) => {
+    const p = String(data?.path || "").trim();
+    if (!p) return { success: false, error: "missing_path" };
+    try {
+      const out = [];
+      const items = await readdir(p, { withFileTypes: true });
+      for (const d of items) {
+        out.push({
+          name: d.name,
+          isDir: d.isDirectory(),
+          isFile: d.isFile(),
+          isSymlink: d.isSymbolicLink()
+        });
+      }
+      out.sort((a, b) => {
+        if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
+        return a.name.localeCompare(b.name);
+      });
+      return { success: true, path: p, entries: out };
+    } catch (error) {
+      const e = error;
+      const msg = e?.message ? String(e.message) : String(error);
+      return { success: false, path: p, error: msg };
+    }
+  });
+  rpcHandlerManager.registerHandler("fs_mkdir", async (data) => {
+    const p = String(data?.path || "").trim();
+    if (!p) return { success: false, error: "missing_path" };
+    const recursive = data?.recursive !== false;
+    try {
+      await mkdir$1(p, { recursive });
+      return { success: true, path: p };
+    } catch (error) {
+      const e = error;
+      const msg = e?.message ? String(e.message) : String(error);
+      return { success: false, path: p, error: msg };
+    }
+  });
   rpcHandlerManager.registerHandler(
     "unreal-mcp-bridge-status",
     async (params) => {
@@ -3774,4 +3812,4 @@ const RawJSONLinesSchema = z$1.discriminatedUnion("type", [
   }).passthrough()
 ]);
 
-export { ApiClient as A, RawJSONLinesSchema as R, ApiSessionClient as a, packageJson as b, configuration as c, backoff as d, delay as e, readDaemonState as f, clearDaemonState as g, readCredentials as h, unrealMcpPythonDir as i, acquireDaemonLock as j, writeDaemonState as k, logger as l, ApiMachineClient as m, releaseDaemonLock as n, clearCredentials as o, projectPath as p, clearMachineId as q, readSettings as r, sendUnrealMcpTcpCommand as s, installUnrealMcpPluginToEngine as t, updateSettings as u, getLatestDaemonLog as v, writeCredentials as w, normalizeServerUrlForNode as x };
+export { ApiClient as A, RawJSONLinesSchema as R, ApiSessionClient as a, packageJson as b, configuration as c, backoff as d, delay as e, readDaemonState as f, clearDaemonState as g, readCredentials as h, unrealMcpPythonDir as i, acquireDaemonLock as j, writeDaemonState as k, logger as l, ApiMachineClient as m, releaseDaemonLock as n, clearCredentials as o, projectPath as p, clearMachineId as q, readSettings as r, sendUnrealMcpTcpCommand as s, installUnrealMcpPluginToEngine as t, updateSettings as u, buildAndInstallUnrealMcpPlugin as v, writeCredentials as w, getLatestDaemonLog as x, normalizeServerUrlForNode as y };

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

@@ -42,7 +42,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "flockbay";
-var version = "0.10.20";
+var version = "0.10.22";
 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-BYHCKlu_.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-Z2OYpI8c.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -1591,6 +1591,44 @@ function registerCommonHandlers(rpcHandlerManager, workingDirectory, coordinatio
       };
     }
   });
+  rpcHandlerManager.registerHandler("fs_list_dir", async (data) => {
+    const p = String(data?.path || "").trim();
+    if (!p) return { success: false, error: "missing_path" };
+    try {
+      const out = [];
+      const items = await fs$3.readdir(p, { withFileTypes: true });
+      for (const d of items) {
+        out.push({
+          name: d.name,
+          isDir: d.isDirectory(),
+          isFile: d.isFile(),
+          isSymlink: d.isSymbolicLink()
+        });
+      }
+      out.sort((a, b) => {
+        if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
+        return a.name.localeCompare(b.name);
+      });
+      return { success: true, path: p, entries: out };
+    } catch (error) {
+      const e = error;
+      const msg = e?.message ? String(e.message) : String(error);
+      return { success: false, path: p, error: msg };
+    }
+  });
+  rpcHandlerManager.registerHandler("fs_mkdir", async (data) => {
+    const p = String(data?.path || "").trim();
+    if (!p) return { success: false, error: "missing_path" };
+    const recursive = data?.recursive !== false;
+    try {
+      await fs$3.mkdir(p, { recursive });
+      return { success: true, path: p };
+    } catch (error) {
+      const e = error;
+      const msg = e?.message ? String(e.message) : String(error);
+      return { success: false, path: p, error: msg };
+    }
+  });
   rpcHandlerManager.registerHandler(
     "unreal-mcp-bridge-status",
     async (params) => {
@@ -3801,6 +3839,7 @@ exports.ApiSessionClient = ApiSessionClient;
 exports.RawJSONLinesSchema = RawJSONLinesSchema;
 exports.acquireDaemonLock = acquireDaemonLock;
 exports.backoff = backoff;
+exports.buildAndInstallUnrealMcpPlugin = buildAndInstallUnrealMcpPlugin;
 exports.clearCredentials = clearCredentials;
 exports.clearDaemonState = clearDaemonState;
 exports.clearMachineId = clearMachineId;

package/package.json

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