flockbay 0.10.48 → 0.10.51

package/README.md

@@ -1,60 +1,60 @@
-# Flockbay CLI
-
-Code on the go controlling Claude/Codex sessions from your mobile device.
-
-Code anywhere.
-
-Flockbay CLI is the command-line tool for running and controlling Flockbay sessions (including daemon and Codex mode).
-
-## Installation
-
-```bash
-npm install -g flockbay
-```
-
-## Usage
-
-```bash
-flockbay
-```
-
-This will:
-1. Start a Claude Code session
-2. Display a QR code to connect from your mobile device
-3. Allow real-time session sharing between Claude Code and your mobile app
-
-## Commands
-
-- `flockbay auth` – Manage authentication
-- `flockbay codex` – Start Codex mode
-- `flockbay connect` – Store AI vendor API keys in Flockbay
-- `flockbay notify` – Send a push notification to your devices
-- `flockbay daemon` – Manage background service
-- `flockbay doctor` – System diagnostics & troubleshooting
-
-## Options
-
-- `-h, --help` - Show help
-- `-v, --version` - Show version
-- `-m, --model <model>` - Claude model to use (default: sonnet)
-- `-p, --permission-mode <mode>` - Permission mode: auto, default, or plan
-- `--claude-env KEY=VALUE` - Set environment variable for Claude Code (e.g., for [claude-code-router](https://github.com/musistudio/claude-code-router))
-- `--claude-arg ARG` - Pass additional argument to Claude CLI
-
-Run `flockbay --help` for the complete list of options.
-
-## Requirements
-
-- Node.js >= 20.0.0
-  - Required by `eventsource-parser@3.0.5`, which is required by
-  `@modelcontextprotocol/sdk`, which we used to implement permission forwarding
-  to mobile app
-- Claude CLI installed & logged in (`claude` command available in PATH)
-
-## Windows UX note
-
-- Codex MCP child processes are started with hidden console windows to prevent blank `cmd.exe` popups during session startup.
-
-## License
-
-Proprietary. Copyright (c) 2024-2026 Flockbay. All rights reserved.
+# Flockbay CLI
+
+Code on the go controlling Claude/Codex sessions from your mobile device.
+
+Code anywhere.
+
+Flockbay CLI is the command-line tool for running and controlling Flockbay sessions (including daemon and Codex mode).
+
+## Installation
+
+```bash
+npm install -g flockbay
+```
+
+## Usage
+
+```bash
+flockbay
+```
+
+This will:
+1. Start a Claude Code session
+2. Display a QR code to connect from your mobile device
+3. Allow real-time session sharing between Claude Code and your mobile app
+
+## Commands
+
+- `flockbay auth` – Manage authentication
+- `flockbay codex` – Start Codex mode
+- `flockbay connect` – Store AI vendor API keys in Flockbay
+- `flockbay notify` – Send a push notification to your devices
+- `flockbay daemon` – Manage background service
+- `flockbay doctor` – System diagnostics & troubleshooting
+
+## Options
+
+- `-h, --help` - Show help
+- `-v, --version` - Show version
+- `-m, --model <model>` - Claude model to use (default: sonnet)
+- `-p, --permission-mode <mode>` - Permission mode: auto, default, or plan
+- `--claude-env KEY=VALUE` - Set environment variable for Claude Code (e.g., for [claude-code-router](https://github.com/musistudio/claude-code-router))
+- `--claude-arg ARG` - Pass additional argument to Claude CLI
+
+Run `flockbay --help` for the complete list of options.
+
+## Requirements
+
+- Node.js >= 20.0.0
+  - Required by `eventsource-parser@3.0.5`, which is required by
+  `@modelcontextprotocol/sdk`, which we used to implement permission forwarding
+  to mobile app
+- Claude CLI installed & logged in (`claude` command available in PATH)
+
+## Windows UX note
+
+- Codex MCP child processes are started with hidden console windows to prevent blank `cmd.exe` popups during session startup.
+
+## License
+
+Proprietary. Copyright (c) 2024-2026 Flockbay. All rights reserved.

package/bin/flockbay-mcp.mjs

@@ -1,62 +1,62 @@
-#!/usr/bin/env node
-
-import { execFileSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-
-// Ensure Node flags to reduce noisy warnings on stdout (which could interfere with MCP).
-const hasNoWarnings = process.execArgv.includes('--no-warnings');
-const hasNoDeprecation = process.execArgv.includes('--no-deprecation');
-
-const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
-const distEntrypoint = join(projectRoot, 'dist', 'codex', 'flockbayMcpStdioBridge.mjs');
-const devEntrypoint = join(projectRoot, 'src', 'codex', 'flockbayMcpStdioBridge.ts');
-const entrypoint = existsSync(distEntrypoint) ? distEntrypoint : devEntrypoint;
-const useTsx = entrypoint.endsWith('.ts');
-const invokedCwd = process.cwd();
-
-function resolveTsxImportArgs() {
-  if (!useTsx) return [];
-  const candidates = [
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.mjs'),
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.js'),
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.mjs'),
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.js'),
-  ];
-  const resolved = candidates.find(existsSync);
-  return resolved ? ['--import', toNodeSpecifier(resolved)] : ['--import', 'tsx'];
-}
-
-function toNodeSpecifier(p) {
-  if (process.platform !== 'win32') return p;
-  if (!/^[a-zA-Z]:[\\/]/.test(p)) return p;
-  return pathToFileURL(p).href;
-}
-
-if (!hasNoWarnings || !hasNoDeprecation || useTsx) {
-  try {
-    execFileSync(
-      process.execPath,
-      [
-        '--no-warnings',
-        '--no-deprecation',
-        ...resolveTsxImportArgs(),
-        entrypoint,
-        ...process.argv.slice(2),
-      ],
-      {
-        stdio: 'inherit',
-        ...(useTsx ? { cwd: projectRoot } : {}),
-        env: {
-          ...process.env,
-          ...(useTsx ? { FLOCKBAY_INVOKED_CWD: invokedCwd } : {}),
-        },
-      },
-    );
-  } catch (error) {
-    process.exit(error?.status || 1);
-  }
-} else {
-  await import('../dist/codex/flockbayMcpStdioBridge.mjs');
-}
+#!/usr/bin/env node
+
+import { execFileSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+// Ensure Node flags to reduce noisy warnings on stdout (which could interfere with MCP).
+const hasNoWarnings = process.execArgv.includes('--no-warnings');
+const hasNoDeprecation = process.execArgv.includes('--no-deprecation');
+
+const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+const distEntrypoint = join(projectRoot, 'dist', 'codex', 'flockbayMcpStdioBridge.mjs');
+const devEntrypoint = join(projectRoot, 'src', 'codex', 'flockbayMcpStdioBridge.ts');
+const entrypoint = existsSync(distEntrypoint) ? distEntrypoint : devEntrypoint;
+const useTsx = entrypoint.endsWith('.ts');
+const invokedCwd = process.cwd();
+
+function resolveTsxImportArgs() {
+  if (!useTsx) return [];
+  const candidates = [
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.mjs'),
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.js'),
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.mjs'),
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.js'),
+  ];
+  const resolved = candidates.find(existsSync);
+  return resolved ? ['--import', toNodeSpecifier(resolved)] : ['--import', 'tsx'];
+}
+
+function toNodeSpecifier(p) {
+  if (process.platform !== 'win32') return p;
+  if (!/^[a-zA-Z]:[\\/]/.test(p)) return p;
+  return pathToFileURL(p).href;
+}
+
+if (!hasNoWarnings || !hasNoDeprecation || useTsx) {
+  try {
+    execFileSync(
+      process.execPath,
+      [
+        '--no-warnings',
+        '--no-deprecation',
+        ...resolveTsxImportArgs(),
+        entrypoint,
+        ...process.argv.slice(2),
+      ],
+      {
+        stdio: 'inherit',
+        ...(useTsx ? { cwd: projectRoot } : {}),
+        env: {
+          ...process.env,
+          ...(useTsx ? { FLOCKBAY_INVOKED_CWD: invokedCwd } : {}),
+        },
+      },
+    );
+  } catch (error) {
+    process.exit(error?.status || 1);
+  }
+} else {
+  await import('../dist/codex/flockbayMcpStdioBridge.mjs');
+}

package/bin/flockbay.mjs

@@ -1,95 +1,95 @@
-#!/usr/bin/env node
-
-import { execFileSync } from 'node:child_process';
-import { existsSync, statSync } from 'node:fs';
-import { dirname, join } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-
-// Ensure Node flags to reduce noisy warnings on stdout.
-const hasNoWarnings = process.execArgv.includes('--no-warnings');
-const hasNoDeprecation = process.execArgv.includes('--no-deprecation');
-
-const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
-const distEntrypoint = join(projectRoot, 'dist', 'index.mjs');
-const devEntrypoint = join(projectRoot, 'src', 'index.ts');
-const entrypoint = (() => {
-  const forceSrc = process.env.FLOCKBAY_USE_SRC === '1';
-  const forceDist = process.env.FLOCKBAY_USE_DIST === '1';
-
-  const hasDist = existsSync(distEntrypoint);
-  const hasDev = existsSync(devEntrypoint);
-
-  if (forceSrc && hasDev) return devEntrypoint;
-  if (forceDist && hasDist) return distEntrypoint;
-
-  if (hasDist && hasDev) {
-    try {
-      const devTime = statSync(devEntrypoint).mtimeMs;
-      const distTime = statSync(distEntrypoint).mtimeMs;
-      if (devTime > distTime) return devEntrypoint;
-    } catch {
-      // ignore
-    }
-    return distEntrypoint;
-  }
-
-  return hasDist ? distEntrypoint : devEntrypoint;
-})();
-const useTsx = entrypoint.endsWith('.ts');
-const invokedCwd = process.cwd();
-
-function rewriteTopLevelAliases(args) {
-  const cmd = args[0];
-  if (cmd === 'install') return ['daemon', 'install', ...args.slice(1)];
-  if (cmd === 'uninstall') return ['daemon', 'uninstall', ...args.slice(1)];
-  return args;
-}
-
-function resolveTsxImportArgs() {
-  if (!useTsx) return [];
-  const candidates = [
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.mjs'),
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.js'),
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.mjs'),
-    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.js'),
-  ];
-  const resolved = candidates.find(existsSync);
-  return resolved ? ['--import', toNodeSpecifier(resolved)] : ['--import', 'tsx'];
-}
-
-function toNodeSpecifier(p) {
-  if (process.platform !== 'win32') return p;
-  if (!/^[a-zA-Z]:[\\/]/.test(p)) return p;
-  return pathToFileURL(p).href;
-}
-
-const rewrittenArgs = rewriteTopLevelAliases(process.argv.slice(2));
-
-if (!hasNoWarnings || !hasNoDeprecation || useTsx) {
-  try {
-    execFileSync(
-      process.execPath,
-      [
-        '--no-warnings',
-        '--no-deprecation',
-        ...resolveTsxImportArgs(),
-        entrypoint,
-        ...rewrittenArgs,
-      ],
-      {
-        stdio: 'inherit',
-        ...(useTsx ? { cwd: projectRoot } : {}),
-        env: {
-          ...process.env,
-          ...(useTsx ? { FLOCKBAY_INVOKED_CWD: invokedCwd } : {}),
-        },
-      },
-    );
-  } catch (error) {
-    process.exit(error?.status || 1);
-  }
-} else {
-  // When running via direct import, mutate argv so the entrypoint sees the same aliases.
-  process.argv.splice(2, process.argv.length - 2, ...rewrittenArgs);
-  await import('../dist/index.mjs');
-}
+#!/usr/bin/env node
+
+import { execFileSync } from 'node:child_process';
+import { existsSync, statSync } from 'node:fs';
+import { dirname, join } from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+
+// Ensure Node flags to reduce noisy warnings on stdout.
+const hasNoWarnings = process.execArgv.includes('--no-warnings');
+const hasNoDeprecation = process.execArgv.includes('--no-deprecation');
+
+const projectRoot = dirname(dirname(fileURLToPath(import.meta.url)));
+const distEntrypoint = join(projectRoot, 'dist', 'index.mjs');
+const devEntrypoint = join(projectRoot, 'src', 'index.ts');
+const entrypoint = (() => {
+  const forceSrc = process.env.FLOCKBAY_USE_SRC === '1';
+  const forceDist = process.env.FLOCKBAY_USE_DIST === '1';
+
+  const hasDist = existsSync(distEntrypoint);
+  const hasDev = existsSync(devEntrypoint);
+
+  if (forceSrc && hasDev) return devEntrypoint;
+  if (forceDist && hasDist) return distEntrypoint;
+
+  if (hasDist && hasDev) {
+    try {
+      const devTime = statSync(devEntrypoint).mtimeMs;
+      const distTime = statSync(distEntrypoint).mtimeMs;
+      if (devTime > distTime) return devEntrypoint;
+    } catch {
+      // ignore
+    }
+    return distEntrypoint;
+  }
+
+  return hasDist ? distEntrypoint : devEntrypoint;
+})();
+const useTsx = entrypoint.endsWith('.ts');
+const invokedCwd = process.cwd();
+
+function rewriteTopLevelAliases(args) {
+  const cmd = args[0];
+  if (cmd === 'install') return ['daemon', 'install', ...args.slice(1)];
+  if (cmd === 'uninstall') return ['daemon', 'uninstall', ...args.slice(1)];
+  return args;
+}
+
+function resolveTsxImportArgs() {
+  if (!useTsx) return [];
+  const candidates = [
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.mjs'),
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'esm', 'index.js'),
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.mjs'),
+    join(projectRoot, 'node_modules', 'tsx', 'dist', 'index.js'),
+  ];
+  const resolved = candidates.find(existsSync);
+  return resolved ? ['--import', toNodeSpecifier(resolved)] : ['--import', 'tsx'];
+}
+
+function toNodeSpecifier(p) {
+  if (process.platform !== 'win32') return p;
+  if (!/^[a-zA-Z]:[\\/]/.test(p)) return p;
+  return pathToFileURL(p).href;
+}
+
+const rewrittenArgs = rewriteTopLevelAliases(process.argv.slice(2));
+
+if (!hasNoWarnings || !hasNoDeprecation || useTsx) {
+  try {
+    execFileSync(
+      process.execPath,
+      [
+        '--no-warnings',
+        '--no-deprecation',
+        ...resolveTsxImportArgs(),
+        entrypoint,
+        ...rewrittenArgs,
+      ],
+      {
+        stdio: 'inherit',
+        ...(useTsx ? { cwd: projectRoot } : {}),
+        env: {
+          ...process.env,
+          ...(useTsx ? { FLOCKBAY_INVOKED_CWD: invokedCwd } : {}),
+        },
+      },
+    );
+  } catch (error) {
+    process.exit(error?.status || 1);
+  }
+} else {
+  // When running via direct import, mutate argv so the entrypoint sees the same aliases.
+  process.argv.splice(2, process.argv.length - 2, ...rewrittenArgs);
+  await import('../dist/index.mjs');
+}

package/dist/{index-BLsRYyPq.mjs → index-DZjyS6UX.mjs}

@@ -2,7 +2,7 @@ import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(im
 import * as os from 'node:os';
 import os__default, { homedir } from 'node:os';
 import { randomUUID, createCipheriv, randomBytes, createHash as createHash$1 } from 'node:crypto';
-import { l as logger, b as projectPath, d as backoff, e as delay, R as RawJSONLinesSchema, c as configuration, f as readDaemonState, g as clearDaemonState, p as packageJson, r as readSettings, h as readCredentials, u as updateSettings, o as openBrowser, w as writeCredentials, j as unrealMcpPythonDir, k as acquireDaemonLock, m as writeDaemonState, n as ApiMachineClient, q as releaseDaemonLock, s as sendUnrealMcpTcpCommand, A as ApiClient, v as validatePath, t as run, x as run$1, y as buildShellInvocation, z as clearCredentials, B as clearMachineId, C as authenticateCodex, D as syncCodexCliAuth, E as authenticateClaude, F as authenticateGemini, i as installUnrealMcpPluginToEngine, G as buildAndInstallUnrealMcpPlugin, H as installUnrealMcpPluginToProject, I as getLatestDaemonLog, J as normalizeServerUrlForNode } from './types-KJ7kAYwk.mjs';
+import { l as logger, e as projectPath, f as backoff, g as delay, R as RawJSONLinesSchema, c as configuration, h as readDaemonState, j as clearDaemonState, p as packageJson, r as readSettings, k as readCredentials, u as updateSettings, o as openBrowser, w as writeCredentials, m as unrealMcpPythonDir, n as acquireDaemonLock, s as writeDaemonState, t as ApiMachineClient, v as releaseDaemonLock, x as sendUnrealMcpTcpCommand, A as ApiClient, y as validatePath, z as run, B as run$1, C as buildShellInvocation, D as clearCredentials, E as clearMachineId, F as authenticateCodex, G as syncCodexCliAuth, H as authenticateClaude, I as authenticateGemini, d as installUnrealMcpPluginToEngine, J as buildAndInstallUnrealMcpPlugin, i as installUnrealMcpPluginToProject, b as isInstalledEngineRoot, K as getLatestDaemonLog, L as normalizeServerUrlForNode } from './types-DRXvc8Nt.mjs';
 import { spawn, execFileSync, execSync } from 'node:child_process';
 import * as path from 'node:path';
 import path__default, { resolve, join, dirname } from 'node:path';
@@ -2030,11 +2030,24 @@ function normalizeFilePathToken(token) {
 function resolveCandidatePath(candidate, cwd) {
   const raw = normalizeFilePathToken(candidate);
   if (!raw) return raw;
+  const isWindowsPath = (value) => {
+    const v = String(value || "").trim();
+    if (!v) return false;
+    if (/^[a-zA-Z]:[\\/]/.test(v)) return true;
+    if (v.startsWith("\\\\")) return true;
+    return false;
+  };
+  const isPosixPath = (value) => String(value || "").trim().startsWith("/");
+  const resolveApi = (() => {
+    if (isWindowsPath(raw) || isWindowsPath(cwd)) return path__default.win32;
+    if (isPosixPath(raw) || isPosixPath(cwd)) return path__default.posix;
+    return path__default;
+  })();
   if (raw.startsWith("~/")) {
     const home = process.env.HOME || process.env.USERPROFILE || "";
-    if (home) return path__default.join(home, raw.slice(2));
+    if (home) return resolveApi.join(home, raw.slice(2));
   }
-  return path__default.isAbsolute(raw) ? raw : path__default.resolve(cwd, raw);
+  return resolveApi.isAbsolute(raw) ? raw : resolveApi.resolve(cwd, raw);
 }
 function isImageBlock(block) {
   if (!block || typeof block !== "object") return false;
@@ -15190,7 +15203,7 @@ async function authAndSetupMachineIfNeeded() {
         process.exit(1);
       }
       try {
-        const { migrateUnrealMcpToFlockbayMcp } = await import('./migratePlugin-BPUAeqI_.mjs');
+        const { migrateUnrealMcpToFlockbayMcp } = await import('./migratePlugin-CnpWYW1E.mjs');
         const result = migrateUnrealMcpToFlockbayMcp({
           engineRoot,
           projectUprojectPath: project || void 0,
@@ -15300,19 +15313,36 @@ async function authAndSetupMachineIfNeeded() {
       if (!parsed.skipUnreal) {
         const engineRoot = readArgValue(startArgs, "--engine-root") || (process.env.UE_ENGINE_ROOT || "").trim() || (process.env.ENGINE_ROOT || "").trim() || null;
         if (engineRoot) {
-          const shouldInstall = await promptYesNo(`Install Flockbay MCP plugin into this Unreal Engine folder?
-${engineRoot}`, {
-            defaultYes: true
-          });
-          if (shouldInstall) {
-            const result = installUnrealMcpPluginToEngine(engineRoot);
-            if (result.ok) {
-              console.log(`Flockbay MCP plugin installed: ${result.destDir}`);
-              process.env.FLOCKBAY_UNREAL_MCP_ENABLED = "1";
-              process.env.ENGINE_ROOT = engineRoot;
-            } else {
-              console.error(chalk.yellow("Flockbay MCP plugin install skipped:"));
-              console.error(chalk.gray(result.errorMessage));
+          const installedEngine = isInstalledEngineRoot(engineRoot);
+          const detection = await detectUnrealProject(process.cwd());
+          const uproject = detection.ok ? detection.uprojectFile : null;
+          const promptTarget = installedEngine ? uproject ? `Install Flockbay MCP plugin into this Unreal project?
+${uproject}` : null : `Install Flockbay MCP plugin into this Unreal Engine folder?
+${engineRoot}`;
+          if (installedEngine && !uproject) {
+            console.error(chalk.yellow("Unreal MCP plugin install skipped:"));
+            console.error(
+              chalk.gray(
+                [
+                  "This engine appears to be an Installed Build (Epic Launcher).",
+                  "Engine-scope install can break builds. Run `flockbay start` from a project folder, or pass --project <path> to install as a project plugin."
+                ].join("\n")
+              )
+            );
+          } else {
+            const shouldInstall = await promptYesNo(promptTarget, {
+              defaultYes: true
+            });
+            if (shouldInstall) {
+              const result = installedEngine && uproject ? installUnrealMcpPluginToProject(uproject) : installUnrealMcpPluginToEngine(engineRoot);
+              if (result.ok) {
+                console.log(`Flockbay MCP plugin installed: ${result.destDir}`);
+                process.env.FLOCKBAY_UNREAL_MCP_ENABLED = "1";
+                process.env.ENGINE_ROOT = engineRoot;
+              } else {
+                console.error(chalk.yellow("Flockbay MCP plugin install skipped:"));
+                console.error(chalk.gray(result.errorMessage));
+              }
             }
           }
         }
@@ -15329,7 +15359,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await import('./runCodex-BkdEucuI.mjs');
+      const { runCodex } = await import('./runCodex-Dhkynhhh.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -15431,7 +15461,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await import('./runGemini-p_aKQRTi.mjs');
+      const { runGemini } = await import('./runGemini-Dq5_59Us.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {