flockbay 0.10.20 → 0.10.22

package/dist/{runGemini-FOBXtEU6.cjs → runGemini-8w5P093W.cjs}

@@ -6,8 +6,8 @@ var node_crypto = require('node:crypto');
 var os = require('node:os');
 var path = require('node:path');
 var fs$2 = require('node:fs/promises');
-var types = require('./types-BYHCKlu_.cjs');
-var index = require('./index-D_mglYG0.cjs');
+var types = require('./types-Z2OYpI8c.cjs');
+var index = require('./index-DQTqwzYd.cjs');
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var fs = require('fs');
@@ -45,6 +45,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");
 }
@@ -57,6 +68,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) {
@@ -67,20 +90,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;
       }
     }
@@ -317,7 +350,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);
@@ -1820,7 +1853,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`.");
@@ -2372,6 +2405,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();
@@ -2415,8 +2507,9 @@ async function runGemini(opts) {
     for (let i = 0; i < unique.length; i += 1) {
       const p = unique[i];
       const buf = await fs$2.readFile(p);
+      const mimeType = detectImageMimeTypeFromBuffer(buf) || "image/png";
       blocks.push({ type: "text", text: `Image ${i + 1}: ${path.basename(p)}` });
-      blocks.push({ type: "image", data: buf.toString("base64"), mimeType: "image/png" });
+      blocks.push({ type: "image", data: buf.toString("base64"), mimeType });
     }
     return blocks;
   };
@@ -2458,29 +2551,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(index.PLATFORM_SYSTEM_PROMPT);
-        }
-      } else {
-        preambleParts.push(index.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 ? index.withUserImagesMarker(fullPrompt, images.length) : fullPrompt;
     messageQueue.push(promptText, mode, images.length > 0 ? { isolate: true } : void 0);
@@ -2490,19 +2569,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 = [index.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 = () => {
@@ -2517,6 +2591,30 @@ async function runGemini(opts) {
       types.logger.debug("[Gemini] Failed to send ready push", pushError);
     }
   };
+  let pendingTurnCompletion = null;
+  const beginTurnCompletionWait = () => {
+    if (pendingTurnCompletion) {
+      types.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;
@@ -2544,10 +2642,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) {
     types.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({
@@ -2558,6 +2682,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);
@@ -2696,6 +2827,7 @@ async function runGemini(opts) {
   };
   let accumulatedResponse = "";
   let isResponseInProgress = false;
+  let currentResponseMessageId = null;
   function setupGeminiMessageHandler(backend) {
     backend.onMessage((msg) => {
       switch (msg.type) {
@@ -2725,6 +2857,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: node_crypto.randomUUID()
@@ -2765,14 +2900,18 @@ async function runGemini(opts) {
               types.logger.debug(`[gemini] Sending complete message to mobile (length: ${finalMessageText.length}): ${finalMessageText.substring(0, 100)}...`);
               types.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({
@@ -2969,6 +3108,7 @@ async function runGemini(opts) {
       if (!message) {
         break;
       }
+      let startedSessionThisTurn = false;
       if (wasSessionCreated && currentModeHash && message.hash !== currentModeHash) {
         types.logger.debug("[Gemini] Mode changed \u2013 restarting Gemini session");
         messageBuffer.addMessage("\u2550".repeat(40), "status");
@@ -2995,8 +3135,9 @@ async function runGemini(opts) {
         const actualModel = determineGeminiModel(modelToUse, localConfigForModel);
         types.logger.debug(`[gemini] Model change - modelToUse=${modelToUse}, actualModel=${actualModel}`);
         types.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;
         types.logger.debug(`[gemini] New ACP session started: ${acpSessionId}`);
         types.logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
         updateDisplayedModel(actualModel, false);
@@ -3011,6 +3152,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");
@@ -3035,8 +3185,9 @@ async function runGemini(opts) {
           if (!acpSessionId) {
             types.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;
             types.logger.debug(`[gemini] ACP session started: ${acpSessionId}`);
             wasSessionCreated = true;
             currentModeHash = message.hash;
@@ -3054,26 +3205,48 @@ async function runGemini(opts) {
         }
         const promptToSend = message.message;
         const parsedPrompt = index.extractUserImagesMarker(promptToSend);
-        const promptText = parsedPrompt.text;
         const promptImages = parsedPrompt.hasImages ? index.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 : index.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 }))
           ];
           types.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 {
           types.logger.debug(`[gemini] Sending prompt to Gemini (length: ${promptText.length}): ${promptText.substring(0, 100)}...`);
           types.logger.debug(`[gemini] Full prompt: ${promptText}`);
-          await geminiBackend.sendPrompt(acpSessionId, promptText);
+          const status = await sendPromptAndWait(promptText);
+          if (status !== "idle") {
+            skipAutoFinalize = true;
+          }
         }
         types.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) {
@@ -3082,14 +3255,21 @@ async function runGemini(opts) {
       } catch (error) {
         types.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);
@@ -3121,7 +3301,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")) {
@@ -3145,6 +3325,7 @@ async function runGemini(opts) {
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();
+        abortRequested = false;
         thinking = false;
         session.keepAlive(thinking, "remote");
         if (!retryThisTurn) {
@@ -3174,7 +3355,11 @@ async function runGemini(opts) {
               });
             }
           }
-          emitReadyIfIdle();
+          if (readySentForAbort) {
+            readySentForAbort = false;
+          } else {
+            emitReadyIfIdle();
+          }
         }
         types.logger.debug(`[gemini] Main loop: turn completed, continuing to next iteration (queue size: ${messageQueue.size()})`);
       }