flockbay 0.10.21 → 0.10.23

package/dist/{runCodex-CH4lz1QX.cjs → runCodex-ozeIEfAo.cjs}

@@ -2,7 +2,7 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-DeH24uWs.cjs');
+var types = require('./types-DvlwEGpS.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-Bhkn02hu.cjs');
+var index = require('./index-BtB1Sqpy.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
@@ -252,18 +252,18 @@ function buildMcpElicitationResult(decision, requestedSchemaRaw, options) {
     if (!raw) return "";
     if (/^Blocked\b/.test(raw)) return raw;
     if (raw === "ledger_read_required") {
-      return "Blocked by policy (automatic; not the user): read the ledger before making file edits. Next: call mcp__flockbay__ledger_read, then retry the edit.";
+      return "Blocked by Policy (automatic; not the user): read the ledger before making file edits. Next: call mcp__flockbay__ledger_read, then retry the edit.";
     }
     if (raw === "docs_index_read_required") {
-      return "Blocked by policy (automatic; not the user): read the game Documentation index before making edits. Next: call mcp__flockbay__docs_index_read, then retry the edit.";
+      return "Blocked by Policy (automatic; not the user): read the game Documentation index before making edits. Next: call mcp__flockbay__docs_index_read, then retry the edit.";
     }
     if (raw.startsWith("file_claim_required:")) {
       const withoutPrefix = raw.slice("file_claim_required:".length);
       const file = withoutPrefix.split("(")[0]?.trim() || "the file";
-      return `Blocked by policy (automatic; not the user): claim ${file} before editing it. Next: claim the file via mcp__flockbay__ledger_claim (or mcp__flockbay__coordination_claim_files), then retry the edit.`;
+      return `Blocked by Policy (automatic; not the user): claim ${file} before editing it. Next: claim the file via mcp__flockbay__ledger_claim (or mcp__flockbay__coordination_claim_files), then retry the edit.`;
     }
     if (raw === "read_only_mode") {
-      return "Blocked by policy (automatic; not the user): this session is in read-only mode. Next: switch permission mode to allow edits, then retry.";
+      return "Blocked by Policy (automatic; not the user): this session is in read-only mode. Next: switch permission mode to allow edits, then retry.";
     }
     return `Blocked: ${raw}`;
   };
@@ -1742,7 +1742,7 @@ function buildPolicyHint(reason, decision, gate) {
       };
     }
     return {
-      summary: "Blocked by policy.",
+      summary: "Blocked by Policy.",
       nextSteps: []
     };
   }
@@ -1754,7 +1754,7 @@ function buildPolicyHint(reason, decision, gate) {
   }
   if (raw === "ledger_read_required") {
     return {
-      summary: "Blocked by policy (automatic; not the user): read the ledger before making file edits.",
+      summary: "Blocked by Policy (automatic; not the user): read the ledger before making file edits.",
       nextSteps: [
         "Call `mcp__flockbay__ledger_read` (or `mcp__flockbay__coordination_ledger_snapshot`).",
         "Then retry the file edit."
@@ -1763,7 +1763,7 @@ function buildPolicyHint(reason, decision, gate) {
   }
   if (raw === "docs_index_read_required") {
     return {
-      summary: "Blocked by policy (automatic; not the user): read the game Documentation index before making edits.",
+      summary: "Blocked by Policy (automatic; not the user): read the game Documentation index before making edits.",
       nextSteps: [
         "Call `mcp__flockbay__docs_index_read`.",
         "Then retry the edit."
@@ -1774,7 +1774,7 @@ function buildPolicyHint(reason, decision, gate) {
     const withoutPrefix = raw.slice("file_claim_required:".length);
     const file = withoutPrefix.split("(")[0]?.trim() || "the file";
     return {
-      summary: `Blocked by policy (automatic; not the user): claim \`${file}\` before editing it.`,
+      summary: `Blocked by Policy (automatic; not the user): claim \`${file}\` before editing it.`,
       nextSteps: [
         `Claim the file via \`mcp__flockbay__ledger_claim\` or \`mcp__flockbay__coordination_claim_files\` (files: ["${file}"]).`,
         "Then retry the file edit."
@@ -1783,7 +1783,7 @@ function buildPolicyHint(reason, decision, gate) {
   }
   if (raw === "read_only_mode") {
     return {
-      summary: "Blocked by policy (automatic; not the user): this session is in read-only mode.",
+      summary: "Blocked by Policy (automatic; not the user): this session is in read-only mode.",
       nextSteps: [
         "Switch permission mode to allow edits (disable read-only).",
         "Then retry the action."
@@ -2383,7 +2383,6 @@ async function runCodex(opts) {
       appendSystemPrompt: index.PLATFORM_SYSTEM_PROMPT
     });
   }
-  const bypassUeGates = String(process.env.FLOCKBAY_DEV_BYPASS_UE_GATES || "") === "1";
   let currentPermissionMode = void 0;
   let currentModel = void 0;
   const defaultAppendSystemPrompt = index.PLATFORM_SYSTEM_PROMPT;
@@ -3451,22 +3450,6 @@ Error: ${message}`,
       try {
         resetScreenshotGateForTurn();
         const overrides = { approvalPolicy: "untrusted", sandbox: "workspace-write" };
-        if (!bypassUeGates) {
-          const detection = await index.detectUnrealProject(process.cwd());
-          if (!detection.ok) {
-            session.sendCodexMessage({
-              type: "message",
-              message: "Select an Unreal project folder (the folder containing a *.uproject) to continue.",
-              id: node_crypto.randomUUID()
-            });
-            if (wasCreated) {
-              client.clearSession();
-              wasCreated = false;
-              currentModeHash = null;
-            }
-            continue;
-          }
-        }
         if (!wasCreated) {
           const projectCapsule = await index.buildProjectCapsule({ startDir: process.cwd() });
           const modelOverride = resolveCodexModelOverride(message.mode.model);

package/dist/{runGemini-DNSymY04.cjs → runGemini-B-sAKY5u.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-DeH24uWs.cjs');
-var index = require('./index-Bhkn02hu.cjs');
+var types = require('./types-DvlwEGpS.cjs');
+var index = require('./index-BtB1Sqpy.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");
 }
@@ -79,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;
       }
     }
@@ -329,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);
@@ -1832,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`.");
@@ -2570,6 +2591,30 @@ ${transcript}`;
       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;
@@ -2597,10 +2642,36 @@ ${transcript}`;
   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({
@@ -2611,6 +2682,13 @@ ${transcript}`;
     diffProcessor.reset();
     try {
       abortController.abort();
+      if (pendingTurnCompletion) {
+        try {
+          pendingTurnCompletion.resolve("error");
+        } catch {
+        }
+        pendingTurnCompletion = null;
+      }
       messageQueue.reset();
       if (geminiBackend && acpSessionId) {
         await geminiBackend.cancel(acpSessionId);
@@ -2749,6 +2827,7 @@ ${transcript}`;
   };
   let accumulatedResponse = "";
   let isResponseInProgress = false;
+  let currentResponseMessageId = null;
   function setupGeminiMessageHandler(backend) {
     backend.onMessage((msg) => {
       switch (msg.type) {
@@ -2778,6 +2857,9 @@ ${transcript}`;
           if (msg.status === "running") {
             thinking = true;
             session.keepAlive(thinking, "remote");
+            if (pendingTurnCompletion) {
+              pendingTurnCompletion.sawRunning = true;
+            }
             session.sendCodexMessage({
               type: "task_started",
               id: node_crypto.randomUUID()
@@ -2822,11 +2904,14 @@ ${transcript}`;
               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({
@@ -3050,7 +3135,7 @@ ${transcript}`;
         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}`);
@@ -3067,6 +3152,15 @@ ${transcript}`;
       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");
@@ -3091,7 +3185,7 @@ ${transcript}`;
           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}`);
@@ -3132,18 +3226,27 @@ ${originalUserMessage}` : originalUserMessage;
             ...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) {
@@ -3152,14 +3255,21 @@ ${originalUserMessage}` : originalUserMessage;
       } 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);
@@ -3191,7 +3301,7 @@ ${originalUserMessage}` : originalUserMessage;
             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")) {
@@ -3215,6 +3325,7 @@ ${originalUserMessage}` : originalUserMessage;
         permissionHandler.reset();
         reasoningProcessor.abort();
         diffProcessor.reset();
+        abortRequested = false;
         thinking = false;
         session.keepAlive(thinking, "remote");
         if (!retryThisTurn) {
@@ -3244,7 +3355,11 @@ ${originalUserMessage}` : originalUserMessage;
               });
             }
           }
-          emitReadyIfIdle();
+          if (readySentForAbort) {
+            readySentForAbort = false;
+          } else {
+            emitReadyIfIdle();
+          }
         }
         types.logger.debug(`[gemini] Main loop: turn completed, continuing to next iteration (queue size: ${messageQueue.size()})`);
       }