flockbay 0.10.20 → 0.10.21

package/dist/{runCodex-Biis9GFw.mjs → runCodex-d2KQX2mn.mjs}

@@ -1,6 +1,6 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-C4QeUggl.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-mXJc7o0P.mjs';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { z } from 'zod';
@@ -10,7 +10,7 @@ import fs__default from 'node:fs';
 import os from 'node:os';
 import path, { resolve, join } from 'node:path';
 import { spawnSync } from 'node:child_process';
-import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, i as initialMachineMetadata, E as ElicitationHub, n as notifyDaemonSessionStarted, M as MessageQueue2, P as PLATFORM_SYSTEM_PROMPT, a as setLatestUserImages, w as withUserImagesMarker, r as registerKillSessionHandler, b as MessageBuffer, d as startFlockbayServer, e as detectUnrealProject, g as buildProjectCapsule, t as trimIdent, j as autoFinalizeCoordinationWorkItem, k as detectScreenshotsForGate, l as applyCoordinationSideEffectsFromMcpToolResult, m as stopCaffeinate } from './index-CX0Z8pmz.mjs';
+import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, i as initialMachineMetadata, E as ElicitationHub, n as notifyDaemonSessionStarted, M as MessageQueue2, P as PLATFORM_SYSTEM_PROMPT, a as setLatestUserImages, w as withUserImagesMarker, r as registerKillSessionHandler, b as MessageBuffer, d as startFlockbayServer, e as detectUnrealProject, g as buildProjectCapsule, t as trimIdent, j as autoFinalizeCoordinationWorkItem, k as detectScreenshotsForGate, l as applyCoordinationSideEffectsFromMcpToolResult, m as stopCaffeinate } from './index-By332wvJ.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';
@@ -3177,11 +3177,9 @@ async function runCodex(opts) {
     } else if (msg.type === "task_complete") {
       messageBuffer.addMessage("Task completed", "status");
       flushInflightExecCalls({ isError: false, reason: "task_complete" });
-      sendReady();
     } else if (msg.type === "turn_aborted") {
       messageBuffer.addMessage("Turn aborted", "status");
       flushInflightExecCalls({ isError: true, reason: "turn_aborted" });
-      sendReady();
     }
     if (msg.type === "task_started") {
       if (!thinking) {

package/dist/{runGemini-BSH4b0wu.mjs → runGemini-Cn0C7MS1.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-mXJc7o0P.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-By332wvJ.mjs';
 import { spawn, spawnSync } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
@@ -55,6 +55,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) {
@@ -2370,6 +2382,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 +2484,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 +2528,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 +2546,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 = () => {
@@ -2763,6 +2816,7 @@ 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;
             }
@@ -2967,6 +3021,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");
@@ -2995,6 +3050,7 @@ async function runGemini(opts) {
         logger.debug("[gemini] Starting new ACP session with model:", actualModel);
         const { sessionId } = await geminiBackend.startSession();
         acpSessionId = sessionId;
+        startedSessionThisTurn = true;
         logger.debug(`[gemini] New ACP session started: ${acpSessionId}`);
         logger.debug(`[gemini] Calling updateDisplayedModel with: ${actualModel}`);
         updateDisplayedModel(actualModel, false);
@@ -3035,6 +3091,7 @@ async function runGemini(opts) {
             updatePermissionMode(message.mode.permissionMode);
             const { sessionId } = await geminiBackend.startSession();
             acpSessionId = sessionId;
+            startedSessionThisTurn = true;
             logger.debug(`[gemini] ACP session started: ${acpSessionId}`);
             wasSessionCreated = true;
             currentModeHash = message.hash;
@@ -3052,8 +3109,21 @@ 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 },

package/dist/{runGemini-FOBXtEU6.cjs → runGemini-DNSymY04.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-DeH24uWs.cjs');
+var index = require('./index-Bhkn02hu.cjs');
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var fs = require('fs');
@@ -57,6 +57,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) {
@@ -2372,6 +2384,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 +2486,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 +2530,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 +2548,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 = () => {
@@ -2765,6 +2818,7 @@ 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;
             }
@@ -2969,6 +3023,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");
@@ -2997,6 +3052,7 @@ async function runGemini(opts) {
         types.logger.debug("[gemini] Starting new ACP session with model:", actualModel);
         const { sessionId } = await 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);
@@ -3037,6 +3093,7 @@ async function runGemini(opts) {
             updatePermissionMode(message.mode.permissionMode);
             const { sessionId } = await geminiBackend.startSession();
             acpSessionId = sessionId;
+            startedSessionThisTurn = true;
             types.logger.debug(`[gemini] ACP session started: ${acpSessionId}`);
             wasSessionCreated = true;
             currentModeHash = message.hash;
@@ -3054,8 +3111,21 @@ 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 },

package/dist/{types-BYHCKlu_.cjs → types-DeH24uWs.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.21";
 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-DeH24uWs.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;

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

@@ -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.21";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";

package/package.json

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

package/scripts/claude_version_utils.cjs

@@ -11,7 +11,7 @@
  *    - Windows CMD: curl -fsSL https://claude.ai/install.cmd | cmd
  */
 
-const { execSync } = require('child_process');
+const { execSync, execFileSync } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
@@ -258,19 +258,53 @@ function findLatestVersionBinary(versionsDir, binaryName = null) {
  * @returns {{path: string, source: string}|null} Path and source, or null if not found
  */
 function findGlobalClaudeCliPath() {
-    // Check npm global first (highest priority)
+    const candidates = [];
+
     const npmPath = findNpmGlobalCliPath();
-    if (npmPath) return { path: npmPath, source: 'npm' };
+    if (npmPath) candidates.push({ path: npmPath, source: 'npm', priority: 3 });
 
-    // Check Homebrew installation
     const homebrewPath = findHomebrewCliPath();
-    if (homebrewPath) return { path: homebrewPath, source: 'Homebrew' };
+    if (homebrewPath) candidates.push({ path: homebrewPath, source: 'Homebrew', priority: 2 });
 
-    // Check native installer
     const nativePath = findNativeInstallerCliPath();
-    if (nativePath) return { path: nativePath, source: 'native installer' };
+    if (nativePath) candidates.push({ path: nativePath, source: 'native installer', priority: 1 });
 
-    return null;
+    if (candidates.length === 0) return null;
+
+    // Prefer the newest version across installs when we can determine it.
+    // If versions are missing/unparseable, fall back to the legacy priority ordering.
+    let best = null;
+    for (const c of candidates) {
+        const version = getVersion(c.path);
+        const parsed = parseSemver3(version);
+        const score = parsed ? parsed : null;
+
+        if (!best) {
+            best = { ...c, version, score };
+            continue;
+        }
+
+        if (best.score && score) {
+            if (compareVersions(version, best.version) > 0) {
+                best = { ...c, version, score };
+            }
+            continue;
+        }
+
+        // If one has a parseable version and the other doesn't, prefer the parseable one.
+        if (!best.score && score) {
+            best = { ...c, version, score };
+            continue;
+        }
+        if (best.score && !score) continue;
+
+        // Neither has a version: use priority.
+        if ((c.priority || 0) > (best.priority || 0)) {
+            best = { ...c, version, score };
+        }
+    }
+
+    return best ? { path: best.path, source: best.source } : candidates[0];
 }
 
 /**
@@ -280,15 +314,35 @@ function findGlobalClaudeCliPath() {
  */
 function getVersion(cliPath) {
     try {
-        const pkgPath = path.join(path.dirname(cliPath), 'package.json');
-        if (fs.existsSync(pkgPath)) {
-            const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
-            return pkg.version;
+        const isJsFile = cliPath.endsWith('.js') || cliPath.endsWith('.cjs');
+        if (isJsFile) {
+            const pkgPath = path.join(path.dirname(cliPath), 'package.json');
+            if (fs.existsSync(pkgPath)) {
+                const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+                return pkg.version;
+            }
+            return null;
         }
+
+        // Binary install: try to ask it.
+        const out = execFileSync(cliPath, ['--version'], { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
+        const m = out.match(/(\d+\.\d+\.\d+)/);
+        return m ? m[1] : null;
     } catch (e) {}
     return null;
 }
 
+function parseSemver3(v) {
+    if (!v || typeof v !== 'string') return null;
+    const m = 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];
+}
+
 /**
  * Compare semver versions
  * @param {string} a - First version