flockbay 0.10.15 → 0.10.16

package/dist/{runGemini-Bt0oEj_g.mjs → runGemini-BS6sBU_V.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-DGd6ea2Z.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, m as extractUserImagesMarker, o as getLatestUserImages, j as autoFinalizeCoordinationWorkItem, E as ElicitationHub, l as stopCaffeinate } from './index-CUp3juDS.mjs';
+import { l as logger, b as packageJson, A as ApiClient, r as readSettings, p as projectPath, c as configuration } from './types-CwzNqYEx.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-DtmFQzXY.mjs';
 import { spawn, spawnSync } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
@@ -13,31 +13,28 @@ import { join } from 'path';
 import { homedir } from 'os';
 import { execSync } from 'child_process';
 import fs__default from 'node:fs';
-import { d as detectScreenshotsForGate } from './flockbayScreenshotGate-DJX3Is5d.mjs';
 import 'axios';
-import 'chalk';
-import 'zod';
-import 'tweetnacl';
 import 'node:events';
 import 'socket.io-client';
+import 'chalk';
+import 'zod';
 import 'fs/promises';
 import 'crypto';
 import 'url';
 import 'node:process';
 import 'node:net';
-import 'expo-server-sdk';
 import 'node:readline';
 import 'node:url';
 import 'ps-list';
 import 'cross-spawn';
 import 'tmp';
-import 'qrcode-terminal';
 import 'open';
 import 'fastify';
 import 'fastify-type-provider-zod';
 import '@modelcontextprotocol/sdk/server/mcp.js';
 import 'node:http';
 import '@modelcontextprotocol/sdk/server/streamableHttp.js';
+import 'tweetnacl';
 import 'http';
 import 'util';
 
@@ -934,15 +931,6 @@ ${excerpt}` : base;
         }
       }
     }
-    if (update.messageChunk) {
-      const chunk = update.messageChunk;
-      if (chunk.textDelta) {
-        this.emit({
-          type: "model-output",
-          textDelta: chunk.textDelta
-        });
-      }
-    }
     if (update.plan) {
       this.emit({
         type: "event",
@@ -1878,11 +1866,14 @@ class GeminiPermissionHandler {
     }
     this.pendingRequests.clear();
     this.session.updateAgentState((currentState) => {
-      const pendingRequests = currentState.requests || {};
-      const completedRequests = { ...currentState.completedRequests };
+      const pendingRaw = currentState?.requests;
+      const pendingRequests = pendingRaw && typeof pendingRaw === "object" ? pendingRaw : {};
+      const completedRaw = currentState?.completedRequests;
+      const completedRequests = completedRaw && typeof completedRaw === "object" ? { ...completedRaw } : {};
       for (const [id, request] of Object.entries(pendingRequests)) {
+        const reqObj = request && typeof request === "object" ? request : { value: request };
         completedRequests[id] = {
-          ...request,
+          ...reqObj,
           completedAt: Date.now(),
           status: "canceled",
           reason: "Session reset"
@@ -2348,8 +2339,19 @@ async function runGemini(opts) {
     lifecycleStateSince: Date.now(),
     flavor: "gemini"
   };
-  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
+  const response = opts.sessionId ? await api.getSessionById(opts.sessionId) : await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   const session = api.sessionSyncClient(response);
+  if (opts.sessionId) {
+    session.updateMetadata((currentMetadata) => ({
+      ...currentMetadata,
+      ...metadata,
+      // Preserve user-facing fields set by other clients.
+      name: currentMetadata?.name,
+      summary: currentMetadata?.summary
+    }));
+  }
+  await session.connectAndWait(15e3);
+  session.keepAlive(false, "remote");
   try {
     logger.debug(`[START] Reporting session ${response.id} to daemon`);
     const result = await notifyDaemonSessionStarted(response.id, metadata);
@@ -2396,9 +2398,13 @@ async function runGemini(opts) {
         text: [
           `You just generated ${unique.length} screenshot${unique.length === 1 ? "" : "s"}.`,
           "",
-          "Visually inspect EVERY screenshot and report:",
-          "- One short bullet per image describing what you see",
-          "- Whether the screenshots match the user's request",
+          "Visually inspect EVERY screenshot and report (this is for YOUR validation, not ceremony):",
+          "1) List 2\u20135 concrete acceptance criteria for the user\u2019s request.",
+          "2) One short bullet per image describing what you see.",
+          "3) For each acceptance criterion: mark it as Verified / Not visible / Failed based ONLY on the screenshots.",
+          '   - If "Not visible", say what evidence is missing.',
+          '   - If "Failed", say what is wrong.',
+          "4) If anything is not Verified: state the next tool/action you will take to fix or validate it (do not claim completion yet).",
           "",
           "Do not run any tools in this step."
         ].join("\n")
@@ -2534,8 +2540,14 @@ async function runGemini(opts) {
   let geminiBackend = null;
   let acpSessionId = null;
   let wasSessionCreated = false;
-  async function handleAbort() {
+  let abortNote = null;
+  let abortNoteSentToSession = false;
+  async function handleAbort(note, options) {
     logger.debug("[Gemini] Abort requested - stopping current task");
+    if (typeof note === "string" && note.trim()) {
+      abortNote = note.trim();
+      abortNoteSentToSession = Boolean(options?.alreadySentToSession);
+    }
     session.sendCodexMessage({
       type: "turn_aborted",
       id: randomUUID()
@@ -2590,7 +2602,7 @@ async function runGemini(opts) {
       process.exit(1);
     }
   };
-  session.rpcHandlerManager.registerHandler("abort", handleAbort);
+  session.rpcHandlerManager.registerHandler("cancel-generation", handleAbort);
   registerKillSessionHandler(session.rpcHandlerManager, handleKillSession);
   const messageBuffer = new MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -2648,6 +2660,21 @@ async function runGemini(opts) {
   }
   const elicitationHub = new ElicitationHub();
   const flockbayServer = await startFlockbayServer(session, { elicitationHub });
+  const unsubscribeUnrealIssue = (() => {
+    const onIssue = flockbayServer?.unreal?.onIssue;
+    if (typeof onIssue !== "function") return null;
+    return onIssue((event) => {
+      try {
+        const kind = typeof event?.kind === "string" ? event.kind : "unreachable";
+        const base = typeof event?.message === "string" && event.message.trim() ? event.message.trim() : "Unreal Editor issue detected.";
+        const msg = kind === "process_exit" ? `Unreal Editor crashed. ${base}` : `Unreal Editor is not reachable. ${base}`;
+        session.sendSessionEvent({ type: "message", message: msg });
+        void handleAbort(msg, { alreadySentToSession: true });
+      } catch (err) {
+        logger.debug("[Gemini] Failed to handle Unreal issue event", err);
+      }
+    });
+  })();
   const bridgeCommand = join$1(projectPath(), "bin", "flockbay-mcp.mjs");
   const mcpServers = {
     flockbay: {
@@ -3055,8 +3082,12 @@ async function runGemini(opts) {
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (isAbortError) {
           skipAutoFinalize = true;
-          messageBuffer.addMessage("Aborted by user", "status");
-          session.sendSessionEvent({ type: "message", message: "Aborted by user" });
+          const note = abortNote || "Aborted by user";
+          abortNote = null;
+          const alreadySent = abortNoteSentToSession;
+          abortNoteSentToSession = false;
+          messageBuffer.addMessage(note, "status");
+          if (!alreadySent) session.sendSessionEvent({ type: "message", message: note });
         } 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);
@@ -3148,6 +3179,10 @@ async function runGemini(opts) {
     }
   } finally {
     logger.debug("[gemini]: Final cleanup start");
+    try {
+      if (typeof unsubscribeUnrealIssue === "function") unsubscribeUnrealIssue();
+    } catch {
+    }
     try {
       session.sendSessionDeath();
       await session.flush();

package/dist/{runGemini-CBxZp6I7.cjs → runGemini-CpmehDQ2.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-C-jnUdn_.cjs');
-var index = require('./index--o4BPz5o.cjs');
+var types = require('./types-SUAKq-K0.cjs');
+var index = require('./index-Cau-_Qvn.cjs');
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var fs = require('fs');
@@ -15,31 +15,28 @@ var path$1 = require('path');
 var os$1 = require('os');
 var child_process = require('child_process');
 var fs$1 = require('node:fs');
-var flockbayScreenshotGate = require('./flockbayScreenshotGate-DkxU24cR.cjs');
 require('axios');
-require('chalk');
-require('zod');
-require('tweetnacl');
 require('node:events');
 require('socket.io-client');
+require('chalk');
+require('zod');
 require('fs/promises');
 require('crypto');
 require('url');
 require('node:process');
 require('node:net');
-require('expo-server-sdk');
 require('node:readline');
 require('node:url');
 require('ps-list');
 require('cross-spawn');
 require('tmp');
-require('qrcode-terminal');
 require('open');
 require('fastify');
 require('fastify-type-provider-zod');
 require('@modelcontextprotocol/sdk/server/mcp.js');
 require('node:http');
 require('@modelcontextprotocol/sdk/server/streamableHttp.js');
+require('tweetnacl');
 require('http');
 require('util');
 
@@ -936,15 +933,6 @@ ${excerpt}` : base;
         }
       }
     }
-    if (update.messageChunk) {
-      const chunk = update.messageChunk;
-      if (chunk.textDelta) {
-        this.emit({
-          type: "model-output",
-          textDelta: chunk.textDelta
-        });
-      }
-    }
     if (update.plan) {
       this.emit({
         type: "event",
@@ -1880,11 +1868,14 @@ class GeminiPermissionHandler {
     }
     this.pendingRequests.clear();
     this.session.updateAgentState((currentState) => {
-      const pendingRequests = currentState.requests || {};
-      const completedRequests = { ...currentState.completedRequests };
+      const pendingRaw = currentState?.requests;
+      const pendingRequests = pendingRaw && typeof pendingRaw === "object" ? pendingRaw : {};
+      const completedRaw = currentState?.completedRequests;
+      const completedRequests = completedRaw && typeof completedRaw === "object" ? { ...completedRaw } : {};
       for (const [id, request] of Object.entries(pendingRequests)) {
+        const reqObj = request && typeof request === "object" ? request : { value: request };
         completedRequests[id] = {
-          ...request,
+          ...reqObj,
           completedAt: Date.now(),
           status: "canceled",
           reason: "Session reset"
@@ -2350,8 +2341,19 @@ async function runGemini(opts) {
     lifecycleStateSince: Date.now(),
     flavor: "gemini"
   };
-  const response = await api.getOrCreateSession({ tag: sessionTag, metadata, state });
+  const response = opts.sessionId ? await api.getSessionById(opts.sessionId) : await api.getOrCreateSession({ tag: sessionTag, metadata, state });
   const session = api.sessionSyncClient(response);
+  if (opts.sessionId) {
+    session.updateMetadata((currentMetadata) => ({
+      ...currentMetadata,
+      ...metadata,
+      // Preserve user-facing fields set by other clients.
+      name: currentMetadata?.name,
+      summary: currentMetadata?.summary
+    }));
+  }
+  await session.connectAndWait(15e3);
+  session.keepAlive(false, "remote");
   try {
     types.logger.debug(`[START] Reporting session ${response.id} to daemon`);
     const result = await index.notifyDaemonSessionStarted(response.id, metadata);
@@ -2380,7 +2382,7 @@ async function runGemini(opts) {
     if (!output) return;
     const cwdHint = output?.cwd;
     const cwd = typeof cwdHint === "string" && cwdHint.trim().length > 0 ? cwdHint.trim() : process.cwd();
-    const detected = flockbayScreenshotGate.detectScreenshotsForGate({ output, cwd });
+    const detected = index.detectScreenshotsForGate({ output, cwd });
     if (detected.paths.length === 0) return;
     for (const p of detected.paths) {
       const trimmed = String(p || "").trim();
@@ -2398,9 +2400,13 @@ async function runGemini(opts) {
         text: [
           `You just generated ${unique.length} screenshot${unique.length === 1 ? "" : "s"}.`,
           "",
-          "Visually inspect EVERY screenshot and report:",
-          "- One short bullet per image describing what you see",
-          "- Whether the screenshots match the user's request",
+          "Visually inspect EVERY screenshot and report (this is for YOUR validation, not ceremony):",
+          "1) List 2\u20135 concrete acceptance criteria for the user\u2019s request.",
+          "2) One short bullet per image describing what you see.",
+          "3) For each acceptance criterion: mark it as Verified / Not visible / Failed based ONLY on the screenshots.",
+          '   - If "Not visible", say what evidence is missing.',
+          '   - If "Failed", say what is wrong.',
+          "4) If anything is not Verified: state the next tool/action you will take to fix or validate it (do not claim completion yet).",
           "",
           "Do not run any tools in this step."
         ].join("\n")
@@ -2536,8 +2542,14 @@ async function runGemini(opts) {
   let geminiBackend = null;
   let acpSessionId = null;
   let wasSessionCreated = false;
-  async function handleAbort() {
+  let abortNote = null;
+  let abortNoteSentToSession = false;
+  async function handleAbort(note, options) {
     types.logger.debug("[Gemini] Abort requested - stopping current task");
+    if (typeof note === "string" && note.trim()) {
+      abortNote = note.trim();
+      abortNoteSentToSession = Boolean(options?.alreadySentToSession);
+    }
     session.sendCodexMessage({
       type: "turn_aborted",
       id: node_crypto.randomUUID()
@@ -2592,7 +2604,7 @@ async function runGemini(opts) {
       process.exit(1);
     }
   };
-  session.rpcHandlerManager.registerHandler("abort", handleAbort);
+  session.rpcHandlerManager.registerHandler("cancel-generation", handleAbort);
   index.registerKillSessionHandler(session.rpcHandlerManager, handleKillSession);
   const messageBuffer = new index.MessageBuffer();
   const hasTTY = process.stdout.isTTY && process.stdin.isTTY;
@@ -2650,6 +2662,21 @@ async function runGemini(opts) {
   }
   const elicitationHub = new index.ElicitationHub();
   const flockbayServer = await index.startFlockbayServer(session, { elicitationHub });
+  const unsubscribeUnrealIssue = (() => {
+    const onIssue = flockbayServer?.unreal?.onIssue;
+    if (typeof onIssue !== "function") return null;
+    return onIssue((event) => {
+      try {
+        const kind = typeof event?.kind === "string" ? event.kind : "unreachable";
+        const base = typeof event?.message === "string" && event.message.trim() ? event.message.trim() : "Unreal Editor issue detected.";
+        const msg = kind === "process_exit" ? `Unreal Editor crashed. ${base}` : `Unreal Editor is not reachable. ${base}`;
+        session.sendSessionEvent({ type: "message", message: msg });
+        void handleAbort(msg, { alreadySentToSession: true });
+      } catch (err) {
+        types.logger.debug("[Gemini] Failed to handle Unreal issue event", err);
+      }
+    });
+  })();
   const bridgeCommand = path.join(types.projectPath(), "bin", "flockbay-mcp.mjs");
   const mcpServers = {
     flockbay: {
@@ -3057,8 +3084,12 @@ async function runGemini(opts) {
         const isAbortError = error instanceof Error && error.name === "AbortError";
         if (isAbortError) {
           skipAutoFinalize = true;
-          messageBuffer.addMessage("Aborted by user", "status");
-          session.sendSessionEvent({ type: "message", message: "Aborted by user" });
+          const note = abortNote || "Aborted by user";
+          abortNote = null;
+          const alreadySent = abortNoteSentToSession;
+          abortNoteSentToSession = false;
+          messageBuffer.addMessage(note, "status");
+          if (!alreadySent) session.sendSessionEvent({ type: "message", message: note });
         } 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);
@@ -3150,6 +3181,10 @@ async function runGemini(opts) {
     }
   } finally {
     types.logger.debug("[gemini]: Final cleanup start");
+    try {
+      if (typeof unsubscribeUnrealIssue === "function") unsubscribeUnrealIssue();
+    } catch {
+    }
     try {
       session.sendSessionDeath();
       await session.flush();