fluxflow-cli 1.18.19 → 1.18.21

package/dist/fluxflow.js

@@ -1123,10 +1123,15 @@ var init_arg_parser = __esm({
             i = argsString.length;
           }
         } else {
-          let endMatch = argsString.substring(i).match(/([^,\s\)]+)/);
-          if (endMatch) {
-            value = endMatch[1];
-            i += value.length;
+          let rest = argsString.substring(i);
+          let boundaryMatch = rest.match(/,\s*\w+\s*=|(?:\s*\)\s*(?:$|\]))/);
+          if (boundaryMatch) {
+            let boundaryIndex = boundaryMatch.index;
+            value = rest.substring(0, boundaryIndex).trim();
+            i += boundaryIndex;
+          } else {
+            value = rest.trim();
+            i = argsString.length;
           }
         }
         if (value === "true") value = true;
@@ -1163,11 +1168,10 @@ var init_main_tools = __esm({
     TOOL_PROTOCOL = (mode, osDetected) => `
 -- TOOL DEFINITIONS --
 Access to internal tools. MUST use the exact syntax on a new line: [tool:functions.ToolName(args)]
-STRICT POLICY
-- **MAX 3 TOOL CALLS PER TURN. Next Turn, verify results, plan next**${mode === "Flux" ? "\n- **File Tools >> Code in chat**" : ""}
-- Use contextually BEST tool, no brute force, no spamming
-- Use multiple search & replace on patch tool if same file/path
-
+MANDATORY TOOL POLICY:
+- **MAX 3 TOOL CALLS PER TURN. Next Turn, verify results, plan next**
+${mode === "" ? "- Prefer multiple search & replace on patch tool if same file/path\n" : ""}- Use contextually BEST tool, no brute force, no spamming
+${mode === "Flux" ? "- **File Tools >> Code in chat**\n" : ""}
 - COMMUNICATION TOOLS -
 1. [tool:functions.Ask(question="...", optionA="option::description", ...MAX 4)]. Ambiguity Resolution. Mandatory Triggers: Path Divergence, Security, Risk Mitigation. ask >> finish
 Suggest best options; don't ask for preferences
@@ -2210,6 +2214,7 @@ __export(paths_exports, {
   LEDGER_FILE: () => LEDGER_FILE,
   LOGS_DIR: () => LOGS_DIR,
   MEMORIES_FILE: () => MEMORIES_FILE,
+  PATHS_FILE: () => PATHS_FILE,
   SECRET_DIR: () => SECRET_DIR,
   SETTINGS_FILE: () => SETTINGS_FILE,
   TEMP_MEM_CHAT_FILE: () => TEMP_MEM_CHAT_FILE,
@@ -2220,7 +2225,7 @@ import os2 from "os";
 import path2 from "path";
 import fs2 from "fs";
 import crypto2 from "crypto";
-var FLUXFLOW_DIR, SETTINGS_FILE, externalDir, DATA_DIR, LOGS_DIR, SECRET_DIR, HISTORY_FILE, USAGE_FILE, MEMORIES_FILE, TEMP_MEM_FILE, TEMP_MEM_CHAT_FILE, BACKUPS_DIR, LEDGER_FILE;
+var FLUXFLOW_DIR, SETTINGS_FILE, externalDir, DATA_DIR, LOGS_DIR, SECRET_DIR, HISTORY_FILE, USAGE_FILE, MEMORIES_FILE, TEMP_MEM_FILE, TEMP_MEM_CHAT_FILE, BACKUPS_DIR, LEDGER_FILE, PATHS_FILE;
 var init_paths = __esm({
   "src/utils/paths.js"() {
     FLUXFLOW_DIR = path2.join(os2.homedir(), ".fluxflow");
@@ -2263,6 +2268,7 @@ var init_paths = __esm({
     TEMP_MEM_CHAT_FILE = path2.join(SECRET_DIR, "temp-memory-chat.json");
     BACKUPS_DIR = path2.join(DATA_DIR, "backups");
     LEDGER_FILE = path2.join(SECRET_DIR, "ledger.json");
+    PATHS_FILE = path2.join(SECRET_DIR, "path.json");
   }
 });
 
@@ -2453,6 +2459,7 @@ Mode: ${mode}${thinkingLevel !== "Fast" ? " (Thinking Mode)" : ""}. ${mode === "
 
 SYSTEM PRIORITY: [SYSTEM], [TOOL RESULT]
 HIGH PRIORITY: [STEERING HINT]
+USER PRIORITY: [USER]
 
 -- THINKING RULES --
 ${thinkingConfig}
@@ -4283,6 +4290,7 @@ var init_write_docx = __esm({
 
 // src/tools/search_keyword.js
 import { exec } from "child_process";
+import path13 from "path";
 var search_keyword;
 var init_search_keyword = __esm({
   "src/tools/search_keyword.js"() {
@@ -4295,14 +4303,14 @@ var init_search_keyword = __esm({
       let command = "";
       if (file) {
         if (isWindows) {
-          command = `powershell -Command "if (Test-Path '${file}') { Select-String -Path '${file}' -Pattern '${keyword}' | Select-Object -First 150 | ForEach-Object { $rel = Resolve-Path $_.Path -Relative; '{0}:{1}:' -f $rel, $_.LineNumber } } else { Write-Error 'File not found: ${file}' }"`;
+          command = `powershell -NoProfile -Command "if (Test-Path '${file}') { Select-String -Path '${file}' -Pattern '${keyword}' -ErrorAction SilentlyContinue | Select-Object -First 150 | ForEach-Object { '{0}|{1}' -f $_.Path, $_.LineNumber } } else { Write-Error 'File not found: ${file}' }"`;
         } else {
           command = `grep -HnI "${keyword}" "${file}" | head -n 150`;
         }
       } else {
         if (isWindows) {
           const excludePattern = excludes.join("|").replace(/\./g, "\\.");
-          command = `powershell -Command "Get-ChildItem -Path . -Recurse -File | Where-Object { $_.FullName -notmatch '${excludePattern}' } | Select-String -Pattern '${keyword}' | Select-Object -First 150 | ForEach-Object { $rel = Resolve-Path $_.Path -Relative; '{0}:{1}:' -f $rel, $_.LineNumber }"`;
+          command = `powershell -NoProfile -Command "Get-ChildItem -Path . -Recurse -File -ErrorAction SilentlyContinue | Where-Object { $_.FullName -notmatch '${excludePattern}' } | Select-String -Pattern '${keyword}' -ErrorAction SilentlyContinue | Select-Object -First 150 | ForEach-Object { '{0}|{1}' -f $_.Path, $_.LineNumber }"`;
         } else {
           const excludeDirArgs = excludes.map((d) => `--exclude-dir="${d}"`).join(" ");
           command = `grep -rnI ${excludeDirArgs} "${keyword}" . | head -n 150`;
@@ -4327,12 +4335,41 @@ var init_search_keyword = __esm({
           });
           if (filteredLines.length === 0) return resolve(`Found 0 matches for keyword: "${keyword}"${file ? ` in file: ${file}` : ""}`);
           const matches = filteredLines.slice(0, 150).map((line) => {
-            const firstColon = line.indexOf(":");
-            const secondColon = line.indexOf(":", firstColon + 1);
-            if (firstColon === -1 || secondColon === -1) return null;
-            const filePath = line.substring(0, firstColon).replace(/^(\.\/|\.\\)/, "");
-            const lineNum = line.substring(firstColon + 1, secondColon);
-            return `${filePath} ${lineNum}`;
+            if (line.includes("|")) {
+              const parts = line.split("|");
+              let rawPath = parts[0];
+              if (path13.isAbsolute(rawPath)) {
+                rawPath = path13.relative(process.cwd(), rawPath);
+              }
+              const filePath = rawPath.replace(/^(\.\/|\.\\)/, "").replace(/\\/g, "/");
+              const lineNum = parts[1];
+              return `${filePath} ${lineNum}`;
+            } else {
+              let rawPath, lineNum;
+              const driveMatch = line.match(/^([a-zA-Z]:)/);
+              if (driveMatch) {
+                const startSearch = 2;
+                const nextColon = line.indexOf(":", startSearch);
+                const thirdColon = line.indexOf(":", nextColon + 1);
+                if (nextColon !== -1 && thirdColon !== -1) {
+                  rawPath = line.substring(0, nextColon);
+                  lineNum = line.substring(nextColon + 1, thirdColon);
+                }
+              } else {
+                const firstColon = line.indexOf(":");
+                const secondColon = line.indexOf(":", firstColon + 1);
+                if (firstColon !== -1 && secondColon !== -1) {
+                  rawPath = line.substring(0, firstColon);
+                  lineNum = line.substring(firstColon + 1, secondColon);
+                }
+              }
+              if (!rawPath || !lineNum) return null;
+              if (path13.isAbsolute(rawPath)) {
+                rawPath = path13.relative(process.cwd(), rawPath);
+              }
+              const filePath = rawPath.replace(/^(\.\/|\.\\)/, "").replace(/\\/g, "/");
+              return `${filePath} ${lineNum}`;
+            }
           }).filter(Boolean);
           let output = `Found ${filteredLines.length} matches:
 
@@ -4350,7 +4387,7 @@ var init_search_keyword = __esm({
 
 // src/utils/settings.js
 import fs14 from "fs-extra";
-import path13 from "path";
+import path14 from "path";
 var DEFAULT_SETTINGS, loadSettings, migrateToExternal, saveSettings;
 var init_settings = __esm({
   "src/utils/settings.js"() {
@@ -4437,8 +4474,8 @@ var init_settings = __esm({
       const { FLUXFLOW_DIR: FLUXFLOW_DIR2 } = await Promise.resolve().then(() => (init_paths(), paths_exports));
       const folders = ["logs", "secret"];
       for (const folder of folders) {
-        const src = path13.join(FLUXFLOW_DIR2, folder);
-        const dest = path13.join(newPath, folder);
+        const src = path14.join(FLUXFLOW_DIR2, folder);
+        const dest = path14.join(newPath, folder);
         try {
           if (await fs14.exists(src)) {
             await fs14.ensureDir(dest);
@@ -4468,7 +4505,7 @@ var init_settings = __esm({
         if (updated.imageSettings) {
           updated.imageSettings = { ...updated.imageSettings, apiKey: "" };
         }
-        await fs14.ensureDir(path13.dirname(SETTINGS_FILE));
+        await fs14.ensureDir(path14.dirname(SETTINGS_FILE));
         writeAesEncryptedJson(SETTINGS_FILE, updated);
         return true;
       } catch (err) {
@@ -4489,7 +4526,7 @@ var init_fallback_key = __esm({
 
 // src/tools/generate_image.js
 import fs15 from "fs-extra";
-import path14 from "path";
+import path15 from "path";
 var injectPngMetadata, generate_image;
 var init_generate_image = __esm({
   "src/tools/generate_image.js"() {
@@ -4669,12 +4706,12 @@ var init_generate_image = __esm({
           "Seed": String(seed)
         };
         finalBuffer = injectPngMetadata(finalBuffer, metadata);
-        const absolutePath = path14.resolve(process.cwd(), outputPath);
-        await fs15.ensureDir(path14.dirname(absolutePath));
+        const absolutePath = path15.resolve(process.cwd(), outputPath);
+        await fs15.ensureDir(path15.dirname(absolutePath));
         await RevertManager.recordFileChange(absolutePath);
         await fs15.writeFile(absolutePath, finalBuffer);
         await recordImageGeneration(settings);
-        const ext = path14.extname(outputPath).toLowerCase();
+        const ext = path15.extname(outputPath).toLowerCase();
         const mimeMap = {
           ".jpg": "image/jpeg",
           ".jpeg": "image/jpeg",
@@ -4842,6 +4879,13 @@ var init_tools = __esm({
       AddMemoryScore: addMemScore
     };
     dispatchTool = async (toolName, args, context = {}) => {
+      if (context.mode && context.mode.toLowerCase() === "flow") {
+        const normalized = toolName.toLowerCase();
+        const isWebOrAsk = normalized.startsWith("web") || normalized.startsWith("ask");
+        if (!isWebOrAsk) {
+          return `ERROR: Tool [${toolName}] is restricted in Flow mode.`;
+        }
+      }
       const tool = TOOL_MAP[toolName];
       if (!tool) {
         return `ERROR: Tool [${toolName}] not found in registry.`;
@@ -4857,7 +4901,7 @@ var init_tools = __esm({
 
 // src/utils/ai.js
 import { GoogleGenAI, ThinkingLevel, HarmBlockThreshold, HarmCategory } from "@google/genai";
-import path15 from "path";
+import path16 from "path";
 import fs16 from "fs";
 var client, TERMINATION_SIGNAL, stripAnsi2, signalTermination, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, consolidatePastMemories, getAIStream;
 var init_ai = __esm({
@@ -4899,7 +4943,7 @@ var init_ai = __esm({
       try {
         const pArgs = parseArgs(argsStr);
         const filePath = pArgs.path || pArgs.targetFile || pArgs.TargetFile || pArgs.directory;
-        return filePath ? path15.basename(filePath.replace(/["']/g, "").replace(/\\/g, "/")) : null;
+        return filePath ? path16.basename(filePath.replace(/["']/g, "").replace(/\\/g, "/")) : null;
       } catch (e) {
         return null;
       }
@@ -5066,9 +5110,9 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
             process.stdout.write(`\x1B]0;Finalizing Error\x07`);
           }
           await new Promise((resolve) => setTimeout(resolve, 1e3));
-          const janitorErrDir = path15.join(LOGS_DIR, "janitor");
+          const janitorErrDir = path16.join(LOGS_DIR, "janitor");
           if (!fs16.existsSync(janitorErrDir)) fs16.mkdirSync(janitorErrDir, { recursive: true });
-          fs16.appendFileSync(path15.join(janitorErrDir, "error.log"), `ERROR [Attempt ${attempts}/${MAX_JANITOR_RETRIES + 1}] [${date}]: ${String(janitorErr)}
+          fs16.appendFileSync(path16.join(janitorErrDir, "error.log"), `ERROR [Attempt ${attempts}/${MAX_JANITOR_RETRIES + 1}] [${date}]: ${String(janitorErr)}
 
 `);
           if (attempts > MAX_JANITOR_RETRIES) break;
@@ -5077,8 +5121,8 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
         }
       }
       if (attempts) {
-        const janitorErrDir = path15.join(LOGS_DIR, "janitor");
-        fs16.appendFileSync(path15.join(janitorErrDir, "error.log"), `-----------------------------------------------------------------------------
+        const janitorErrDir = path16.join(LOGS_DIR, "janitor");
+        fs16.appendFileSync(path16.join(janitorErrDir, "error.log"), `-----------------------------------------------------------------------------
 
 
 `);
@@ -5394,10 +5438,10 @@ ${newMemoryListStr}
           }
         }
       } catch (err) {
-        const janitorLogDir = path15.join(LOGS_DIR, "janitor");
+        const janitorLogDir = path16.join(LOGS_DIR, "janitor");
         if (!fs16.existsSync(janitorLogDir)) fs16.mkdirSync(janitorLogDir, { recursive: true });
         fs16.appendFileSync(
-          path15.join(janitorLogDir, "error.log"),
+          path16.join(janitorLogDir, "error.log"),
           `[${(/* @__PURE__ */ new Date()).toLocaleString()}] Past memory batch consolidation error: ${err.message}
 `
         );
@@ -5601,16 +5645,16 @@ ${newMemoryListStr}
             if (COLLAPSED_DIRS_GLOBAL.includes(entry.name)) continue;
             if (entry.isDirectory()) {
               currentCount.value++;
-              countFolders(path15.join(dir, entry.name), currentCount, depth + 1);
+              countFolders(path16.join(dir, entry.name), currentCount, depth + 1);
             }
           }
           return currentCount.value;
         };
         const getDirTree = (dir, maxDepth, prefix = "", depth = 1) => {
           const entries = safeReaddirWithTypes(dir);
-          const sep = path15.sep;
+          const sep = path16.sep;
           if (entries.length > 100) {
-            return `${prefix}\u2514\u2500\u2500 ${path15.basename(dir)}${sep} ...100+ files...
+            return `${prefix}\u2514\u2500\u2500 ${path16.basename(dir)}${sep} ...100+ files...
 `;
           }
           let result = "";
@@ -5628,7 +5672,7 @@ ${newMemoryListStr}
           ];
           finalItems.forEach((item, index) => {
             const isLast = index === finalItems.length - 1;
-            const filePath = path15.join(dir, item.name);
+            const filePath = path16.join(dir, item.name);
             const connector = isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 ";
             const childPrefix = prefix + (isLast ? "    " : "\u2502   ");
             if (item.isCollapsed) {
@@ -5671,9 +5715,14 @@ ${newMemoryListStr}
         else if (totalFolders > 128) dynamicMaxDepth = 8;
         else if (totalFolders > 64) dynamicMaxDepth = 9;
         else if (totalFolders > 32) dynamicMaxDepth = 10;
+        const chatPaths = readEncryptedJson(PATHS_FILE, {});
+        const lastCwd = chatPaths[chatId];
+        const cwdMismatch = lastCwd ? lastCwd !== process.cwd() : false;
+        chatPaths[chatId] = process.cwd();
+        writeEncryptedJson(PATHS_FILE, chatPaths);
         let dirStructure = process.cwd() + "\n" + getDirTree(process.cwd(), dynamicMaxDepth);
         const firstUserMsg = `[SYSTEM METADATA (PRIORITY: DYNAMIC)] Time: ${dateTimeStr} | v${versionFluxflow2}
-CWD: ${process.cwd()}
+CWD: ${process.cwd()}${cwdMismatch ? ` (CWD Mismatch! Previous Path: ${lastCwd})` : ""}
 **DIRECTORY STRUCTURE**
 ${dirStructure}
 ${memoryPrompt}
@@ -5888,12 +5937,12 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITI
                       if (keyword) {
                         detail = keyword.replace(/["']/g, "");
                       } else if (filePath) {
-                        detail = path15.basename(filePath.replace(/["']/g, "").replace(/\\/g, "/"));
+                        detail = path16.basename(filePath.replace(/["']/g, "").replace(/\\/g, "/"));
                       } else {
                         const m = partialArgs.match(/(?:path|targetFile|TargetFile|directory|keyword)\s*=\s*\\?["']?([^\\"' \),]+)/);
                         if (m) {
                           const val = m[1].replace(/["']/g, "");
-                          detail = potentialTool === "search_keyword" ? val : path15.basename(val.replace(/\\/g, "/"));
+                          detail = potentialTool === "search_keyword" ? val : path16.basename(val.replace(/\\/g, "/"));
                         }
                       }
                     }
@@ -6053,7 +6102,7 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITI
                       let totalLines = "...";
                       let actualEndLine = eLine;
                       try {
-                        const absPath = path15.resolve(process.cwd(), targetPath2);
+                        const absPath = path16.resolve(process.cwd(), targetPath2);
                         if (fs16.existsSync(absPath)) {
                           const content = fs16.readFileSync(absPath, "utf8");
                           const lines = content.split("\n").length;
@@ -6075,8 +6124,8 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITI
                       }
                     } else if (normToolName === "list_files" || normToolName === "read_folder") {
                       const action = normToolName === "list_files" ? "List" : "Viewed";
-                      const path17 = parseArgs(toolCall.args).path;
-                      label = `\u{1F4C2} ${action}: ${path17 === "." ? "./" : path17}`;
+                      const path18 = parseArgs(toolCall.args).path;
+                      label = `\u{1F4C2} ${action}: ${path18 === "." ? "./" : path18}`;
                     } else if (normToolName === "write_file" || normToolName === "update_file") {
                       const action = normToolName === "write_file" ? "Created" : "Edited";
                       label = `\u{1F4BE} ${action}: ${parseArgs(toolCall.args).path || "..."}`;
@@ -6098,7 +6147,7 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITI
                       const { command } = parseArgs(toolCall.args);
                       if (command && settings.systemSettings && settings.systemSettings.allowExternalAccess === false) {
                         const riskyPatterns = [/[a-zA-Z]:[\\\/]/i, /^\//, /\.\.[\\\/]/, /\/etc\//, /\/var\//, /\/root\//, /\/bin\//, /\/usr\//];
-                        const currentDrive = path15.resolve(process.cwd()).substring(0, 3).toLowerCase();
+                        const currentDrive = path16.resolve(process.cwd()).substring(0, 3).toLowerCase();
                         const isViolating = riskyPatterns.some((pattern) => {
                           if (pattern.source === "[a-zA-Z]:[\\\\\\/]") {
                             const driveMatch = command.match(/[a-zA-Z]:[\\\/]/i);
@@ -6127,8 +6176,8 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITI
                     const targetPath = parsedArgs.path || parsedArgs.targetPath || null;
                     if (targetPath) {
                       const isExternalOff = settings.systemSettings && settings.systemSettings.allowExternalAccess === false;
-                      const absoluteTarget = path15.resolve(targetPath);
-                      const absoluteCwd = path15.resolve(process.cwd());
+                      const absoluteTarget = path16.resolve(targetPath);
+                      const absoluteCwd = path16.resolve(process.cwd());
                       if (isExternalOff && !absoluteTarget.startsWith(absoluteCwd)) {
                         const denyMsg = `Access Denied. You are not allowed to access files outside the current workspace.`;
                         if (normToolName === "write_file" || normToolName === "update_file") {
@@ -6272,7 +6321,8 @@ ${boxBottom}` };
                       history,
                       onChunk: (chunk2) => settings.onExecChunk ? settings.onExecChunk(chunk2) : null,
                       onAskUser: settings.onAskUser,
-                      systemSettings: settings.systemSettings
+                      systemSettings: settings.systemSettings,
+                      mode
                     });
                     yield { type: "spinner", content: true };
                     if (process.stdout.isTTY) {
@@ -6398,9 +6448,9 @@ ${boxBottom}` };
               const errMsg = err.status || err.error && err.error.message || String(err);
               const errLog = String(err);
               const date = (/* @__PURE__ */ new Date()).toLocaleString();
-              const agentErrDir = path15.join(LOGS_DIR, "agent");
+              const agentErrDir = path16.join(LOGS_DIR, "agent");
               if (!fs16.existsSync(agentErrDir)) fs16.mkdirSync(agentErrDir, { recursive: true });
-              fs16.appendFileSync(path15.join(agentErrDir, "error.log"), `ERROR [${date}]: ${errLog}
+              fs16.appendFileSync(path16.join(agentErrDir, "error.log"), `ERROR [${date}]: ${errLog}
 
 ----------------------------------------------------------------------
 
@@ -6444,7 +6494,7 @@ ${recoveryText}`
                   yield { type: "status", content: `Error Occured. Recovering Stream...` };
                 } else {
                   throw new Error(`Stream collapsed too many times. (Failed to resolve ${MAX_RETRIES} times)
-Error Log can be found in ${path15.join(LOGS_DIR, "agent", "error.log")}`);
+Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
                 }
               } else {
                 if (retryCount <= MAX_RETRIES) {
@@ -6461,7 +6511,7 @@ Error Log can be found in ${path15.join(LOGS_DIR, "agent", "error.log")}`);
                   yield { type: "status", content: `Trying to reach ${modelName}...` };
                 } else {
                   throw new Error(`Model ${modelName} cannot be reached. (Failed ${MAX_RETRIES} times)
-Error Log can be found in ${path15.join(LOGS_DIR, "agent", "error.log")}`);
+Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
                 }
               }
             }
@@ -6987,7 +7037,7 @@ import os4 from "os";
 import React13, { useState as useState10, useEffect as useEffect7, useRef as useRef3, useMemo as useMemo2 } from "react";
 import { Box as Box13, Text as Text13, useInput as useInput7, useStdout } from "ink";
 import fs18 from "fs-extra";
-import path16 from "path";
+import path17 from "path";
 import { exec as exec3 } from "child_process";
 import { fileURLToPath } from "url";
 import TextInput4 from "ink-text-input";
@@ -7041,6 +7091,16 @@ function App({ args = [] }) {
       } else if (arg === "--external-access" && args[i + 1]) {
         parsed.externalAccess = args[i + 1].toLowerCase();
         i++;
+      } else if (arg === "--mode" && args[i + 1]) {
+        const val = args[i + 1];
+        const lower = val.toLowerCase();
+        if (["flux", "flow"].includes(lower)) {
+          let mapped = "Flux";
+          if (lower === "flux") mapped = "Flux";
+          else if (lower === "flow") mapped = "Flow";
+          parsed.mode = mapped;
+        }
+        i++;
       } else if (arg === "--thinking" && args[i + 1]) {
         const val = args[i + 1];
         const lower = val.toLowerCase();
@@ -7446,7 +7506,11 @@ function App({ args = [] }) {
         });
       }
       const saved = await loadSettings();
-      setMode(saved.mode);
+      if (parsedArgs.mode) {
+        setMode(parsedArgs.mode);
+      } else {
+        setMode(saved.mode);
+      }
       if (parsedArgs.thinking) {
         setThinkingLevel(parsedArgs.thinking);
       } else {
@@ -8062,7 +8126,7 @@ ${hintText}`, color: "magenta" }];
         }
         case "/export": {
           const exportFile = `export-fluxflow-${chatId}.txt`;
-          const exportPath = path16.join(process.cwd(), exportFile);
+          const exportPath = path17.join(process.cwd(), exportFile);
           const exportLines = [];
           let insideAgentBlock = false;
           for (let i = 0; i < messages.length; i++) {
@@ -8223,7 +8287,7 @@ ${list || "No saved chats found."}`, isMeta: true }];
 # SKILLS & WORKFLOWS
 - [Define custom step-by-step recipes for this project here]
 `;
-            const filePath = path16.join(process.cwd(), "FluxFlow.md");
+            const filePath = path17.join(process.cwd(), "FluxFlow.md");
             if (fs18.pathExistsSync(filePath)) {
               setMessages((prev) => {
                 setCompletedIndex(prev.length + 1);
@@ -9375,7 +9439,7 @@ var init_app = __esm({
     CHANGELOG_URL = "https://fluxflow-cli.onrender.com/changelog.html";
     linesAdded = 0;
     linesRemoved = 0;
-    packageJsonPath = path16.join(path16.dirname(fileURLToPath(import.meta.url)), "../package.json");
+    packageJsonPath = path17.join(path17.dirname(fileURLToPath(import.meta.url)), "../package.json");
     packageJson = JSON.parse(fs18.readFileSync(packageJsonPath, "utf8"));
     versionFluxflow = packageJson.version;
     updatedOn = packageJson.date || "2026-05-20";
@@ -9496,14 +9560,14 @@ var init_app = __esm({
               if (["node_modules", ".git", ".gemini", "dist", "build", ".next", ".cache", "out"].includes(file)) {
                 continue;
               }
-              const filePath = path16.join(currentDir, file);
+              const filePath = path17.join(currentDir, file);
               const stat = fs18.statSync(filePath);
               if (stat.isDirectory()) {
                 scan(filePath);
               } else {
                 fileList.push({
                   name: file,
-                  relativePath: path16.relative(process.cwd(), filePath)
+                  relativePath: path17.relative(process.cwd(), filePath)
                 });
               }
             }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "fluxflow-cli",
-	"version": "1.18.19",
-	"date": "2026-06-01",
+	"version": "1.18.21",
+	"date": "2026-06-02",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",