flockbay 0.10.30 → 0.10.31

package/dist/{index-b9kiPsW3.cjs → index-ClvxzV4_.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-DPBm2ycs.cjs');
+var types = require('./types-BWU2O_1A.cjs');
 var node_child_process = require('node:child_process');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -345,6 +345,10 @@ const PLATFORM_SYSTEM_PROMPT = trimIdent(`
   - The platform may detect that Unreal Editor crashed/unreachable and will automatically abort your current run and post a chat message.
   - When that happens: STOP UnrealMCP calls, fix the project as needed, then (only when ready) relaunch Unreal Editor with \`mcp__flockbay__unreal_editor_launch\`.
   - Do not \u201Cauto-restart\u201D in a loop. Relaunch is a deliberate action after fixes.
+    - After launching Unreal Editor, do not \u201Crapid-retry\u201D reachability checks. Boot times vary by machine and project size.
+      - Prefer readiness checks (editor health / plugin reachable) spaced by increasing waits (bounded backoff).
+      - Default example ladder for editor boot: wait ~30s, then ~45s, then ~60s between checks (cap any single wait to 60s).
+      - Total cap: at most 240s of waiting for editor boot. If still not reachable, stop waiting and ask the user to tell you when the editor finishes booting (or to share what it shows on-screen).
 
     ## B) Screenshots (via UnrealMCP)
     Use UnrealMCP when the user asks for:
@@ -392,6 +396,24 @@ const PLATFORM_SYSTEM_PROMPT = trimIdent(`
   - Batch related questions into one call when possible.
   - If a user's request is too broad/unclear, ask him questions to clarify the scope and narrow down the work
 
+  # Timing / Waiting (realistic, increasing, bounded)
+
+  User machines vary widely (CPU, disk, GPU) and Unreal projects can be large. When you are waiting for something to become ready (editor boot, local server start, build finishing), you must use realistic waits.
+
+  - Prefer readiness checks over blind sleeps. Use sleeps only to space checks.
+  - Do not \u201Crapid-retry\u201D after starting heavyweight actions (editors, IDEs, emulators, big builds). Seconds-scale retry loops are a bad UX.
+  - Use bounded backoff:
+    - waits must increase between attempts (e.g. 10s \u2192 20s \u2192 40s \u2192 60s \u2026)
+    - cap any single wait to 60s
+    - cap total waiting to a reasonable maximum
+
+  Two tiers (keep it simple):
+  - Standard actions total cap: ~90s
+  - Heavyweight boots total cap: ~240s
+
+  If you expect something to take longer than the applicable total cap, do not pretend you can wait \u201Ca bit longer\u201D.
+  Stop waiting, explain what you\u2019re waiting for and what \u201Cready\u201D looks like, and ask the user to notify you when it completes.
+
   # Platform-provided context blocks
 
   The platform may prefix the user message with internal context blocks (machine/project hints, image markers, etc).
@@ -1274,7 +1296,7 @@ function buildDaemonSafeEnv(baseEnv, binPath) {
   env[pathKey] = [...prepend, ...existingParts].join(pathSep);
   return env;
 }
-const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-b9kiPsW3.cjs', document.baseURI).href)));
+const __filename$1 = node_url.fileURLToPath((typeof document === 'undefined' ? require('u' + 'rl').pathToFileURL(__filename).href : (_documentCurrentScript && _documentCurrentScript.tagName.toUpperCase() === 'SCRIPT' && _documentCurrentScript.src || new URL('index-ClvxzV4_.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion(claudeExecutable) {
   try {
@@ -13270,7 +13292,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-Bq_-aYHm.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-D4m7yDQk.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -13372,7 +13394,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-pQgdPy5x.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-Dp2Noq-p.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {

package/dist/{index-DGp07Mik.mjs → index-DcTQ3012.mjs}

@@ -1,7 +1,7 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import chalk from 'chalk';
 import os, { homedir } from 'node:os';
 import { randomUUID, createCipheriv, randomBytes } from 'node:crypto';
-import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as readDaemonState, g as clearDaemonState, b as packageJson, r as readSettings, h as readCredentials, u as updateSettings, w as writeCredentials, i as unrealMcpPythonDir, j as acquireDaemonLock, k as writeDaemonState, m as ApiMachineClient, n as releaseDaemonLock, s as sendUnrealMcpTcpCommand, A as ApiClient, o as clearCredentials, q as clearMachineId, t as installUnrealMcpPluginToEngine, v as buildAndInstallUnrealMcpPlugin, x as getLatestDaemonLog, y as normalizeServerUrlForNode } from './types-DdJKBH6T.mjs';
+import { l as logger, p as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as readDaemonState, g as clearDaemonState, b as packageJson, r as readSettings, h as readCredentials, u as updateSettings, w as writeCredentials, i as unrealMcpPythonDir, j as acquireDaemonLock, k as writeDaemonState, m as ApiMachineClient, n as releaseDaemonLock, s as sendUnrealMcpTcpCommand, A as ApiClient, o as clearCredentials, q as clearMachineId, t as installUnrealMcpPluginToEngine, v as buildAndInstallUnrealMcpPlugin, x as getLatestDaemonLog, y as normalizeServerUrlForNode } from './types-BOWEIn3h.mjs';
 import { spawn, execFileSync, execSync } from 'node:child_process';
 import path, { resolve, join, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -323,6 +323,10 @@ const PLATFORM_SYSTEM_PROMPT = trimIdent(`
   - The platform may detect that Unreal Editor crashed/unreachable and will automatically abort your current run and post a chat message.
   - When that happens: STOP UnrealMCP calls, fix the project as needed, then (only when ready) relaunch Unreal Editor with \`mcp__flockbay__unreal_editor_launch\`.
   - Do not \u201Cauto-restart\u201D in a loop. Relaunch is a deliberate action after fixes.
+    - After launching Unreal Editor, do not \u201Crapid-retry\u201D reachability checks. Boot times vary by machine and project size.
+      - Prefer readiness checks (editor health / plugin reachable) spaced by increasing waits (bounded backoff).
+      - Default example ladder for editor boot: wait ~30s, then ~45s, then ~60s between checks (cap any single wait to 60s).
+      - Total cap: at most 240s of waiting for editor boot. If still not reachable, stop waiting and ask the user to tell you when the editor finishes booting (or to share what it shows on-screen).
 
     ## B) Screenshots (via UnrealMCP)
     Use UnrealMCP when the user asks for:
@@ -370,6 +374,24 @@ const PLATFORM_SYSTEM_PROMPT = trimIdent(`
   - Batch related questions into one call when possible.
   - If a user's request is too broad/unclear, ask him questions to clarify the scope and narrow down the work
 
+  # Timing / Waiting (realistic, increasing, bounded)
+
+  User machines vary widely (CPU, disk, GPU) and Unreal projects can be large. When you are waiting for something to become ready (editor boot, local server start, build finishing), you must use realistic waits.
+
+  - Prefer readiness checks over blind sleeps. Use sleeps only to space checks.
+  - Do not \u201Crapid-retry\u201D after starting heavyweight actions (editors, IDEs, emulators, big builds). Seconds-scale retry loops are a bad UX.
+  - Use bounded backoff:
+    - waits must increase between attempts (e.g. 10s \u2192 20s \u2192 40s \u2192 60s \u2026)
+    - cap any single wait to 60s
+    - cap total waiting to a reasonable maximum
+
+  Two tiers (keep it simple):
+  - Standard actions total cap: ~90s
+  - Heavyweight boots total cap: ~240s
+
+  If you expect something to take longer than the applicable total cap, do not pretend you can wait \u201Ca bit longer\u201D.
+  Stop waiting, explain what you\u2019re waiting for and what \u201Cready\u201D looks like, and ask the user to notify you when it completes.
+
   # Platform-provided context blocks
 
   The platform may prefix the user message with internal context blocks (machine/project hints, image markers, etc).
@@ -13248,7 +13270,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await import('./runCodex-B0JRo8YP.mjs');
+      const { runCodex } = await import('./runCodex-Csi1jhMD.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -13350,7 +13372,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await import('./runGemini-DO9xzjyY.mjs');
+      const { runGemini } = await import('./runGemini-CsLa2i5F.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {

package/dist/index.cjs

@@ -1,8 +1,8 @@
 'use strict';
 
 require('chalk');
-require('./index-b9kiPsW3.cjs');
-require('./types-DPBm2ycs.cjs');
+require('./index-ClvxzV4_.cjs');
+require('./types-BWU2O_1A.cjs');
 require('zod');
 require('node:child_process');
 require('node:fs');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-DGp07Mik.mjs';
-import './types-DdJKBH6T.mjs';
+import './index-DcTQ3012.mjs';
+import './types-BOWEIn3h.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:fs';

package/dist/lib.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-DPBm2ycs.cjs');
+var types = require('./types-BWU2O_1A.cjs');
 require('axios');
 require('node:fs');
 require('node:os');

package/dist/lib.d.cts

@@ -439,6 +439,7 @@ declare class ApiSessionClient extends EventEmitter {
     readonly coordinationLeaseGuard: CoordinationLeaseGuard;
     private coordinationLedgerLastReadAtMs;
     private readonly outboundQueue;
+    private readonly usageReportQueue;
     constructor(token: string, session: Session);
     connect(): void;
     connectAndWait(timeoutMs?: number): Promise<void>;
@@ -455,6 +456,7 @@ declare class ApiSessionClient extends EventEmitter {
     sendCodexMessage(body: any): void;
     sendAgentMessage(agentType: 'gemini' | 'codex' | 'claude' | 'opencode', body: any): void;
     sendClaudeSessionMessage(body: any): void;
+    sendUsageReport(report: any): void;
     updateSessionConfig(opts: {
         permissionMode?: string | null;
         modelMode?: string | null;

package/dist/lib.d.mts

@@ -439,6 +439,7 @@ declare class ApiSessionClient extends EventEmitter {
     readonly coordinationLeaseGuard: CoordinationLeaseGuard;
     private coordinationLedgerLastReadAtMs;
     private readonly outboundQueue;
+    private readonly usageReportQueue;
     constructor(token: string, session: Session);
     connect(): void;
     connectAndWait(timeoutMs?: number): Promise<void>;
@@ -455,6 +456,7 @@ declare class ApiSessionClient extends EventEmitter {
     sendCodexMessage(body: any): void;
     sendAgentMessage(agentType: 'gemini' | 'codex' | 'claude' | 'opencode', body: any): void;
     sendClaudeSessionMessage(body: any): void;
+    sendUsageReport(report: any): void;
     updateSessionConfig(opts: {
         permissionMode?: string | null;
         modelMode?: string | null;

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-DdJKBH6T.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-BOWEIn3h.mjs';
 import 'axios';
 import 'node:fs';
 import 'node:os';

package/dist/{runCodex-B0JRo8YP.mjs → runCodex-Csi1jhMD.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-DdJKBH6T.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-BOWEIn3h.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 buildProjectCapsule, t as trimIdent, g as autoFinalizeCoordinationWorkItem, j as detectScreenshotsForGate, k as applyCoordinationSideEffectsFromMcpToolResult, l as stopCaffeinate } from './index-DGp07Mik.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 buildProjectCapsule, t as trimIdent, g as autoFinalizeCoordinationWorkItem, j as detectScreenshotsForGate, k as applyCoordinationSideEffectsFromMcpToolResult, l as stopCaffeinate } from './index-DcTQ3012.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';
@@ -3409,6 +3409,38 @@ async function runCodex(opts) {
       markExecFinished(callId);
     }
     if (msg.type === "token_count") {
+      try {
+        const asNonNegativeInt = (v) => {
+          const n = typeof v === "number" ? v : Number(v);
+          if (!Number.isFinite(n) || n < 0) return null;
+          return Math.floor(n);
+        };
+        const pick = (obj, keys) => {
+          for (const k of keys) {
+            if (obj && typeof obj === "object" && k in obj) return obj[k];
+          }
+          return void 0;
+        };
+        const usageObj = msg?.usage && typeof msg.usage === "object" ? msg.usage : null;
+        const inputTokens = asNonNegativeInt(pick(usageObj, ["input_tokens", "inputTokens"])) ?? asNonNegativeInt(pick(msg, ["input_tokens", "inputTokens", "prompt_tokens", "promptTokens"])) ?? 0;
+        const outputTokens = asNonNegativeInt(pick(usageObj, ["output_tokens", "outputTokens"])) ?? asNonNegativeInt(pick(msg, ["output_tokens", "outputTokens", "completion_tokens", "completionTokens"])) ?? 0;
+        const cacheReadInputTokens = asNonNegativeInt(pick(usageObj, ["cache_read_input_tokens", "cacheReadInputTokens"])) ?? asNonNegativeInt(pick(msg, ["cache_read_input_tokens", "cacheReadInputTokens"])) ?? 0;
+        const cacheCreationInputTokens = asNonNegativeInt(pick(usageObj, ["cache_creation_input_tokens", "cacheCreationInputTokens"])) ?? asNonNegativeInt(pick(msg, ["cache_creation_input_tokens", "cacheCreationInputTokens"])) ?? 0;
+        const model = typeof msg?.model === "string" ? String(msg.model).trim() : null;
+        session.sendUsageReport({
+          provider: "codex",
+          model: model || null,
+          usage: {
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            cache_read_input_tokens: cacheReadInputTokens,
+            cache_creation_input_tokens: cacheCreationInputTokens
+          },
+          source: "codex.token_count",
+          timeMs: Date.now()
+        });
+      } catch {
+      }
       return;
     }
     if (msg.type === "patch_apply_begin") {
@@ -3702,9 +3734,10 @@ User: ${escapedUser}` : replayDeduped;
         }
         if (!skipAutoFinalize) {
           try {
+            const autoFinalizeCwd = String(coordinationProjectRootPath || "").trim() || process.cwd();
             const finalizeRes = await autoFinalizeCoordinationWorkItem({
               token: session.getAuthToken(),
-              cwd: process.cwd(),
+              cwd: autoFinalizeCwd,
               summary: message?.message ?? null
             });
             if (!finalizeRes.ok) {

package/dist/{runCodex-Bq_-aYHm.cjs → runCodex-D4m7yDQk.cjs}

@@ -2,7 +2,7 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-DPBm2ycs.cjs');
+var types = require('./types-BWU2O_1A.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-b9kiPsW3.cjs');
+var index = require('./index-ClvxzV4_.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');
@@ -3411,6 +3411,38 @@ async function runCodex(opts) {
       markExecFinished(callId);
     }
     if (msg.type === "token_count") {
+      try {
+        const asNonNegativeInt = (v) => {
+          const n = typeof v === "number" ? v : Number(v);
+          if (!Number.isFinite(n) || n < 0) return null;
+          return Math.floor(n);
+        };
+        const pick = (obj, keys) => {
+          for (const k of keys) {
+            if (obj && typeof obj === "object" && k in obj) return obj[k];
+          }
+          return void 0;
+        };
+        const usageObj = msg?.usage && typeof msg.usage === "object" ? msg.usage : null;
+        const inputTokens = asNonNegativeInt(pick(usageObj, ["input_tokens", "inputTokens"])) ?? asNonNegativeInt(pick(msg, ["input_tokens", "inputTokens", "prompt_tokens", "promptTokens"])) ?? 0;
+        const outputTokens = asNonNegativeInt(pick(usageObj, ["output_tokens", "outputTokens"])) ?? asNonNegativeInt(pick(msg, ["output_tokens", "outputTokens", "completion_tokens", "completionTokens"])) ?? 0;
+        const cacheReadInputTokens = asNonNegativeInt(pick(usageObj, ["cache_read_input_tokens", "cacheReadInputTokens"])) ?? asNonNegativeInt(pick(msg, ["cache_read_input_tokens", "cacheReadInputTokens"])) ?? 0;
+        const cacheCreationInputTokens = asNonNegativeInt(pick(usageObj, ["cache_creation_input_tokens", "cacheCreationInputTokens"])) ?? asNonNegativeInt(pick(msg, ["cache_creation_input_tokens", "cacheCreationInputTokens"])) ?? 0;
+        const model = typeof msg?.model === "string" ? String(msg.model).trim() : null;
+        session.sendUsageReport({
+          provider: "codex",
+          model: model || null,
+          usage: {
+            input_tokens: inputTokens,
+            output_tokens: outputTokens,
+            cache_read_input_tokens: cacheReadInputTokens,
+            cache_creation_input_tokens: cacheCreationInputTokens
+          },
+          source: "codex.token_count",
+          timeMs: Date.now()
+        });
+      } catch {
+      }
       return;
     }
     if (msg.type === "patch_apply_begin") {
@@ -3704,9 +3736,10 @@ User: ${escapedUser}` : replayDeduped;
         }
         if (!skipAutoFinalize) {
           try {
+            const autoFinalizeCwd = String(coordinationProjectRootPath || "").trim() || process.cwd();
             const finalizeRes = await index.autoFinalizeCoordinationWorkItem({
               token: session.getAuthToken(),
-              cwd: process.cwd(),
+              cwd: autoFinalizeCwd,
               summary: message?.message ?? null
             });
             if (!finalizeRes.ok) {

package/dist/{runGemini-DO9xzjyY.mjs → runGemini-CsLa2i5F.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-DdJKBH6T.mjs';
-import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, e as buildProjectCapsule, a as setLatestUserImages, b as MessageBuffer, w as withUserImagesMarker, r as registerKillSessionHandler, d as startFlockbayServer, m as extractUserImagesMarker, o as getLatestUserImages, P as PLATFORM_SYSTEM_PROMPT, g as autoFinalizeCoordinationWorkItem, E as ElicitationHub, j as detectScreenshotsForGate, l as stopCaffeinate } from './index-DGp07Mik.mjs';
+import { l as logger, b as packageJson, A as ApiClient, r as readSettings, p as projectPath, c as configuration } from './types-BOWEIn3h.mjs';
+import { s as shouldCountToolCall, c as consumeToolQuota, f as formatQuotaDeniedReason, h as hashObject, i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, e as buildProjectCapsule, a as setLatestUserImages, b as MessageBuffer, w as withUserImagesMarker, r as registerKillSessionHandler, d as startFlockbayServer, m as extractUserImagesMarker, o as getLatestUserImages, P as PLATFORM_SYSTEM_PROMPT, g as autoFinalizeCoordinationWorkItem, E as ElicitationHub, j as detectScreenshotsForGate, l as stopCaffeinate } from './index-DcTQ3012.mjs';
 import { spawn, spawnSync } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';
@@ -2977,6 +2977,36 @@ ${transcript}`;
           break;
         default:
           if (msg.type === "token-count") {
+            try {
+              const asNonNegativeInt = (v) => {
+                const n = typeof v === "number" ? v : Number(v);
+                if (!Number.isFinite(n) || n < 0) return null;
+                return Math.floor(n);
+              };
+              const pick = (obj, keys) => {
+                for (const k of keys) {
+                  if (obj && typeof obj === "object" && k in obj) return obj[k];
+                }
+                return void 0;
+              };
+              const raw = msg;
+              const usageObj = raw?.usage && typeof raw.usage === "object" ? raw.usage : raw?.usageMetadata && typeof raw.usageMetadata === "object" ? raw.usageMetadata : null;
+              const inputTokens = asNonNegativeInt(pick(usageObj, ["input_tokens", "inputTokens", "promptTokenCount", "prompt_tokens"])) ?? asNonNegativeInt(pick(raw, ["input_tokens", "inputTokens", "promptTokenCount", "prompt_tokens"])) ?? 0;
+              const outputTokens = asNonNegativeInt(pick(usageObj, ["output_tokens", "outputTokens", "candidatesTokenCount", "completion_tokens"])) ?? asNonNegativeInt(pick(raw, ["output_tokens", "outputTokens", "candidatesTokenCount", "completion_tokens"])) ?? 0;
+              const totalTokens = asNonNegativeInt(pick(usageObj, ["total_tokens", "totalTokens", "totalTokenCount"])) ?? asNonNegativeInt(pick(raw, ["total_tokens", "totalTokens", "totalTokenCount"])) ?? null;
+              session.sendUsageReport({
+                provider: "gemini",
+                model: typeof raw?.model === "string" ? String(raw.model).trim() : null,
+                usage: {
+                  input_tokens: inputTokens,
+                  output_tokens: outputTokens,
+                  ...totalTokens !== null ? { total_tokens: totalTokens } : {}
+                },
+                source: "gemini.token-count",
+                timeMs: Date.now()
+              });
+            } catch {
+            }
             session.sendCodexMessage({
               type: "token_count",
               ...msg,
@@ -3330,9 +3360,10 @@ ${originalUserMessage}` : originalUserMessage;
         if (!retryThisTurn) {
           if (!skipAutoFinalize) {
             try {
+              const autoFinalizeCwd = String(coordinationProjectRootPath || "").trim() || process.cwd();
               const finalizeRes = await autoFinalizeCoordinationWorkItem({
                 token: session.getAuthToken(),
-                cwd: process.cwd(),
+                cwd: autoFinalizeCwd,
                 summary: userMessageToShow
               });
               if (!finalizeRes.ok) {

package/dist/{runGemini-pQgdPy5x.cjs → runGemini-Dp2Noq-p.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-DPBm2ycs.cjs');
-var index = require('./index-b9kiPsW3.cjs');
+var types = require('./types-BWU2O_1A.cjs');
+var index = require('./index-ClvxzV4_.cjs');
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var fs = require('fs');
@@ -2979,6 +2979,36 @@ ${transcript}`;
           break;
         default:
           if (msg.type === "token-count") {
+            try {
+              const asNonNegativeInt = (v) => {
+                const n = typeof v === "number" ? v : Number(v);
+                if (!Number.isFinite(n) || n < 0) return null;
+                return Math.floor(n);
+              };
+              const pick = (obj, keys) => {
+                for (const k of keys) {
+                  if (obj && typeof obj === "object" && k in obj) return obj[k];
+                }
+                return void 0;
+              };
+              const raw = msg;
+              const usageObj = raw?.usage && typeof raw.usage === "object" ? raw.usage : raw?.usageMetadata && typeof raw.usageMetadata === "object" ? raw.usageMetadata : null;
+              const inputTokens = asNonNegativeInt(pick(usageObj, ["input_tokens", "inputTokens", "promptTokenCount", "prompt_tokens"])) ?? asNonNegativeInt(pick(raw, ["input_tokens", "inputTokens", "promptTokenCount", "prompt_tokens"])) ?? 0;
+              const outputTokens = asNonNegativeInt(pick(usageObj, ["output_tokens", "outputTokens", "candidatesTokenCount", "completion_tokens"])) ?? asNonNegativeInt(pick(raw, ["output_tokens", "outputTokens", "candidatesTokenCount", "completion_tokens"])) ?? 0;
+              const totalTokens = asNonNegativeInt(pick(usageObj, ["total_tokens", "totalTokens", "totalTokenCount"])) ?? asNonNegativeInt(pick(raw, ["total_tokens", "totalTokens", "totalTokenCount"])) ?? null;
+              session.sendUsageReport({
+                provider: "gemini",
+                model: typeof raw?.model === "string" ? String(raw.model).trim() : null,
+                usage: {
+                  input_tokens: inputTokens,
+                  output_tokens: outputTokens,
+                  ...totalTokens !== null ? { total_tokens: totalTokens } : {}
+                },
+                source: "gemini.token-count",
+                timeMs: Date.now()
+              });
+            } catch {
+            }
             session.sendCodexMessage({
               type: "token_count",
               ...msg,
@@ -3332,9 +3362,10 @@ ${originalUserMessage}` : originalUserMessage;
         if (!retryThisTurn) {
           if (!skipAutoFinalize) {
             try {
+              const autoFinalizeCwd = String(coordinationProjectRootPath || "").trim() || process.cwd();
               const finalizeRes = await index.autoFinalizeCoordinationWorkItem({
                 token: session.getAuthToken(),
-                cwd: process.cwd(),
+                cwd: autoFinalizeCwd,
                 summary: userMessageToShow
               });
               if (!finalizeRes.ok) {

package/dist/{types-DdJKBH6T.mjs → types-BOWEIn3h.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.30";
+var version = "0.10.31";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -2936,6 +2936,7 @@ class ApiSessionClient extends EventEmitter {
   coordinationLeaseGuard = new CoordinationLeaseGuard();
   coordinationLedgerLastReadAtMs = null;
   outboundQueue = [];
+  usageReportQueue = [];
   constructor(token, session) {
     super();
     this.token = token;
@@ -3090,6 +3091,15 @@ class ApiSessionClient extends EventEmitter {
       meta: { sentFrom: "cli" }
     });
   }
+  sendUsageReport(report) {
+    const payload = report && typeof report === "object" ? report : null;
+    if (!payload) return;
+    if (this.socket.connected) {
+      this.socket.emit("usage-report", payload);
+      return;
+    }
+    this.usageReportQueue.push(payload);
+  }
   async updateSessionConfig(opts) {
     await this.connectAndWait(15e3);
     return await new Promise((resolve) => {
@@ -3110,6 +3120,11 @@ class ApiSessionClient extends EventEmitter {
   }
   flush() {
     if (!this.socket.connected) return;
+    while (this.usageReportQueue.length > 0) {
+      const next = this.usageReportQueue.shift();
+      if (!next) continue;
+      this.socket.emit("usage-report", next);
+    }
     while (this.outboundQueue.length > 0) {
       const next = this.outboundQueue.shift();
       if (!next) continue;

package/dist/{types-DPBm2ycs.cjs → types-BWU2O_1A.cjs}

@@ -42,7 +42,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "flockbay";
-var version = "0.10.30";
+var version = "0.10.31";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -772,7 +772,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-DPBm2ycs.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-BWU2O_1A.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;
@@ -2957,6 +2957,7 @@ class ApiSessionClient extends node_events.EventEmitter {
   coordinationLeaseGuard = new CoordinationLeaseGuard();
   coordinationLedgerLastReadAtMs = null;
   outboundQueue = [];
+  usageReportQueue = [];
   constructor(token, session) {
     super();
     this.token = token;
@@ -3111,6 +3112,15 @@ class ApiSessionClient extends node_events.EventEmitter {
       meta: { sentFrom: "cli" }
     });
   }
+  sendUsageReport(report) {
+    const payload = report && typeof report === "object" ? report : null;
+    if (!payload) return;
+    if (this.socket.connected) {
+      this.socket.emit("usage-report", payload);
+      return;
+    }
+    this.usageReportQueue.push(payload);
+  }
   async updateSessionConfig(opts) {
     await this.connectAndWait(15e3);
     return await new Promise((resolve) => {
@@ -3131,6 +3141,11 @@ class ApiSessionClient extends node_events.EventEmitter {
   }
   flush() {
     if (!this.socket.connected) return;
+    while (this.usageReportQueue.length > 0) {
+      const next = this.usageReportQueue.shift();
+      if (!next) continue;
+      this.socket.emit("usage-report", next);
+    }
     while (this.outboundQueue.length > 0) {
       const next = this.outboundQueue.shift();
       if (!next) continue;

package/package.json

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

package/tools/unreal-mcp/upstream/MCPGameProject/Plugins/UnrealMCP/Source/UnrealMCP/Private/Commands/UnrealMCPEditorCommands.cpp

@@ -56,7 +56,7 @@
 #include "Components/SceneCaptureComponent2D.h"
 #include "Engine/TextureRenderTarget2D.h"
 
-static bool SavePngToFile(const FString& FilePath, int32 Width, int32 Height, const TArray<FColor>& Bitmap)
+static bool SavePngToFile(const FString& FilePath, int32 Width, int32 Height, TArray<FColor>& Bitmap)
 {
 	IImageWrapperModule& ImageWrapperModule = FModuleManager::LoadModuleChecked<IImageWrapperModule>(FName("ImageWrapper"));
 	TSharedPtr<IImageWrapper> Wrapper = ImageWrapperModule.CreateImageWrapper(EImageFormat::PNG);
@@ -65,6 +65,12 @@ static bool SavePngToFile(const FString& FilePath, int32 Width, int32 Height, co
 		return false;
 	}
 
+	// Normalize alpha: editor backbuffer alpha can be 0/undefined, which can make PNGs look dark/grey in viewers.
+	for (FColor& Pixel : Bitmap)
+	{
+		Pixel.A = 255;
+	}
+
 	if (!Wrapper->SetRaw(Bitmap.GetData(), Bitmap.Num() * sizeof(FColor), Width, Height, ERGBFormat::BGRA, 8))
 	{
 		return false;