flockbay 0.10.16 → 0.10.17

package/dist/{index-Cau-_Qvn.cjs → index-BxBuBx7C.cjs}

@@ -3,7 +3,7 @@
 var chalk = require('chalk');
 var os = require('node:os');
 var node_crypto = require('node:crypto');
-var types = require('./types-SUAKq-K0.cjs');
+var types = require('./types-CGQhv7Z-.cjs');
 var node_child_process = require('node:child_process');
 var path = require('node:path');
 var node_readline = require('node:readline');
@@ -1272,7 +1272,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-Cau-_Qvn.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-BxBuBx7C.cjs', document.baseURI).href)));
 const __dirname$1 = path.join(__filename$1, "..");
 function getGlobalClaudeVersion(claudeExecutable) {
   try {
@@ -11665,6 +11665,29 @@ async function startDaemonDetachedOrExit(opts) {
         const auth = await types.readCredentials().catch(() => null);
         const settings = await types.readSettings().catch(() => null);
         const daemon = await types.readDaemonState().catch(() => null);
+        const desiredOrgId = auth?.orgId ? String(auth.orgId).trim() : "";
+        const desiredMachineId = settings?.machineId ? String(settings.machineId).trim() : "";
+        const daemonOrgId = typeof status?.orgId === "string" ? status.orgId.trim() : "";
+        const daemonMachineId = typeof status?.machineId === "string" ? status.machineId.trim() : "";
+        const daemonServerUrl = typeof status?.serverUrl === "string" ? status.serverUrl.trim() : "";
+        const desiredServerUrl = String(types.configuration.serverUrl || "").trim();
+        const orgMismatch = desiredOrgId && daemonOrgId && desiredOrgId !== daemonOrgId;
+        const machineMismatch = desiredMachineId && daemonMachineId && desiredMachineId !== daemonMachineId;
+        const serverMismatch = desiredServerUrl && daemonServerUrl && desiredServerUrl !== daemonServerUrl;
+        if ((orgMismatch || machineMismatch || serverMismatch) && !opts?.restartAttempted) {
+          console.error("");
+          console.error(chalk.yellow("Daemon is running with different settings than the current CLI profile."));
+          if (serverMismatch) console.error(chalk.gray(`Daemon server: ${daemonServerUrl || "unknown"}`));
+          if (desiredServerUrl) console.error(chalk.gray(`CLI server:   ${desiredServerUrl}`));
+          if (orgMismatch) console.error(chalk.gray(`Daemon org:   ${daemonOrgId || "unknown"}`));
+          if (desiredOrgId) console.error(chalk.gray(`CLI org:     ${desiredOrgId}`));
+          if (machineMismatch) console.error(chalk.gray(`Daemon machine: ${daemonMachineId || "unknown"}`));
+          if (desiredMachineId) console.error(chalk.gray(`CLI machine:    ${desiredMachineId}`));
+          console.error(chalk.gray("Restarting daemon to apply current login/pairing..."));
+          await stopDaemon();
+          await startDaemonDetachedOrExit({ ...opts, restartAttempted: true });
+          return;
+        }
         console.log(chalk.bold("\nFlockbay ready\n"));
         console.log(chalk.gray(`Profile:  ${types.configuration.profile}`));
         console.log(chalk.gray(`Server:   ${types.configuration.serverUrl}`));
@@ -11934,7 +11957,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-DzP3VUa-.cjs'); });
+      const { runCodex } = await Promise.resolve().then(function () { return require('./runCodex-DuCGwO2K.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -12029,7 +12052,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-CpmehDQ2.cjs'); });
+      const { runGemini } = await Promise.resolve().then(function () { return require('./runGemini-B25LZ4Cw.cjs'); });
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {

package/dist/{index-DtmFQzXY.mjs → index-CHm9r89K.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 getLatestDaemonLog } from './types-CwzNqYEx.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 getLatestDaemonLog } from './types-DuhcLxar.mjs';
 import { spawn, execFileSync, execSync } from 'node:child_process';
 import path, { resolve, join, dirname } from 'node:path';
 import { createInterface } from 'node:readline';
@@ -11643,6 +11643,29 @@ async function startDaemonDetachedOrExit(opts) {
         const auth = await readCredentials().catch(() => null);
         const settings = await readSettings().catch(() => null);
         const daemon = await readDaemonState().catch(() => null);
+        const desiredOrgId = auth?.orgId ? String(auth.orgId).trim() : "";
+        const desiredMachineId = settings?.machineId ? String(settings.machineId).trim() : "";
+        const daemonOrgId = typeof status?.orgId === "string" ? status.orgId.trim() : "";
+        const daemonMachineId = typeof status?.machineId === "string" ? status.machineId.trim() : "";
+        const daemonServerUrl = typeof status?.serverUrl === "string" ? status.serverUrl.trim() : "";
+        const desiredServerUrl = String(configuration.serverUrl || "").trim();
+        const orgMismatch = desiredOrgId && daemonOrgId && desiredOrgId !== daemonOrgId;
+        const machineMismatch = desiredMachineId && daemonMachineId && desiredMachineId !== daemonMachineId;
+        const serverMismatch = desiredServerUrl && daemonServerUrl && desiredServerUrl !== daemonServerUrl;
+        if ((orgMismatch || machineMismatch || serverMismatch) && !opts?.restartAttempted) {
+          console.error("");
+          console.error(chalk.yellow("Daemon is running with different settings than the current CLI profile."));
+          if (serverMismatch) console.error(chalk.gray(`Daemon server: ${daemonServerUrl || "unknown"}`));
+          if (desiredServerUrl) console.error(chalk.gray(`CLI server:   ${desiredServerUrl}`));
+          if (orgMismatch) console.error(chalk.gray(`Daemon org:   ${daemonOrgId || "unknown"}`));
+          if (desiredOrgId) console.error(chalk.gray(`CLI org:     ${desiredOrgId}`));
+          if (machineMismatch) console.error(chalk.gray(`Daemon machine: ${daemonMachineId || "unknown"}`));
+          if (desiredMachineId) console.error(chalk.gray(`CLI machine:    ${desiredMachineId}`));
+          console.error(chalk.gray("Restarting daemon to apply current login/pairing..."));
+          await stopDaemon();
+          await startDaemonDetachedOrExit({ ...opts, restartAttempted: true });
+          return;
+        }
         console.log(chalk.bold("\nFlockbay ready\n"));
         console.log(chalk.gray(`Profile:  ${configuration.profile}`));
         console.log(chalk.gray(`Server:   ${configuration.serverUrl}`));
@@ -11912,7 +11935,7 @@ ${engineRoot}`, {
   } else if (subcommand === "codex") {
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runCodex } = await import('./runCodex-Di9eHddq.mjs');
+      const { runCodex } = await import('./runCodex-DudVDqNh.mjs');
       let startedBy = void 0;
       let sessionId = void 0;
       for (let i = 1; i < args.length; i++) {
@@ -12007,7 +12030,7 @@ ${engineRoot}`, {
     }
     try {
       await chdirToNearestUprojectRootIfPresent();
-      const { runGemini } = await import('./runGemini-BS6sBU_V.mjs');
+      const { runGemini } = await import('./runGemini-Ddu8UCOS.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-Cau-_Qvn.cjs');
-require('./types-SUAKq-K0.cjs');
+require('./index-BxBuBx7C.cjs');
+require('./types-CGQhv7Z-.cjs');
 require('zod');
 require('node:child_process');
 require('node:fs');

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import 'chalk';
-import './index-DtmFQzXY.mjs';
-import './types-CwzNqYEx.mjs';
+import './index-CHm9r89K.mjs';
+import './types-DuhcLxar.mjs';
 import 'zod';
 import 'node:child_process';
 import 'node:fs';

package/dist/lib.cjs

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

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-CwzNqYEx.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-DuhcLxar.mjs';
 import 'axios';
 import 'node:fs';
 import 'node:os';

package/dist/{runCodex-DzP3VUa-.cjs → runCodex-DuCGwO2K.cjs}

@@ -2,7 +2,7 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-SUAKq-K0.cjs');
+var types = require('./types-CGQhv7Z-.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-Cau-_Qvn.cjs');
+var index = require('./index-BxBuBx7C.cjs');
 require('axios');
 require('node:events');
 require('socket.io-client');

package/dist/{runCodex-Di9eHddq.mjs → runCodex-DudVDqNh.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-CwzNqYEx.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, b as packageJson } from './types-DuhcLxar.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-DtmFQzXY.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-CHm9r89K.mjs';
 import 'axios';
 import 'node:events';
 import 'socket.io-client';

package/dist/{runGemini-CpmehDQ2.cjs → runGemini-B25LZ4Cw.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-SUAKq-K0.cjs');
-var index = require('./index-Cau-_Qvn.cjs');
+var types = require('./types-CGQhv7Z-.cjs');
+var index = require('./index-BxBuBx7C.cjs');
 var node_child_process = require('node:child_process');
 var sdk = require('@agentclientprotocol/sdk');
 var fs = require('fs');

package/dist/{runGemini-BS6sBU_V.mjs → runGemini-Ddu8UCOS.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-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 { l as logger, b as packageJson, A as ApiClient, r as readSettings, p as projectPath, c as configuration } from './types-DuhcLxar.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-CHm9r89K.mjs';
 import { spawn, spawnSync } from 'node:child_process';
 import { ndJsonStream, ClientSideConnection } from '@agentclientprotocol/sdk';
 import { existsSync, readFileSync, mkdirSync, writeFileSync } from 'fs';

package/dist/{types-SUAKq-K0.cjs → types-CGQhv7Z-.cjs}

@@ -42,7 +42,7 @@ function _interopNamespaceDefault(e) {
 var z__namespace = /*#__PURE__*/_interopNamespaceDefault(z);
 
 var name = "flockbay";
-var version = "0.10.16";
+var version = "0.10.17";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -197,7 +197,7 @@ function parseProfileFromProcessArgs() {
   const args = process.argv.slice(2);
   for (let i = 0; i < args.length; i++) {
     const a = String(args[i] || "");
-    if (a === "--profile") {
+    if (a === "--profile" || a === "-profile" || a === "-p") {
       const v = String(args[i + 1] || "").trim();
       if (v && !v.startsWith("-")) return v;
     }
@@ -205,6 +205,10 @@ function parseProfileFromProcessArgs() {
       const v = a.slice("--profile=".length).trim();
       if (v) return v;
     }
+    if (a.startsWith("-profile=")) {
+      const v = a.slice("-profile=".length).trim();
+      if (v) return v;
+    }
   }
   return "";
 }
@@ -766,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-SUAKq-K0.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-CGQhv7Z-.cjs', document.baseURI).href))));
 function projectPath() {
   const path = path$1.resolve(__dirname$1, "..");
   return path;

package/dist/{types-CwzNqYEx.mjs → types-DuhcLxar.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.16";
+var version = "0.10.17";
 var description = "Flockbay CLI (local agent + daemon)";
 var author = "Eduardo Orellana";
 var license = "UNLICENSED";
@@ -176,7 +176,7 @@ function parseProfileFromProcessArgs() {
   const args = process.argv.slice(2);
   for (let i = 0; i < args.length; i++) {
     const a = String(args[i] || "");
-    if (a === "--profile") {
+    if (a === "--profile" || a === "-profile" || a === "-p") {
       const v = String(args[i + 1] || "").trim();
       if (v && !v.startsWith("-")) return v;
     }
@@ -184,6 +184,10 @@ function parseProfileFromProcessArgs() {
       const v = a.slice("--profile=".length).trim();
       if (v) return v;
     }
+    if (a.startsWith("-profile=")) {
+      const v = a.slice("-profile=".length).trim();
+      if (v) return v;
+    }
   }
   return "";
 }

package/package.json

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