fluxflow-cli 1.11.1 → 1.11.3

package/dist/fluxflow.js

@@ -173,7 +173,7 @@ var init_ChatLayout = __esm({
     };
     cleanSignals = (text) => {
       if (!text) return text;
-      let result = text;
+      let result = text.replace(/<\/think>(\r?\n){2}/gi, "</think>").replace(/(\r?\n){2}(?=\[?(?:tool:functions|tool\.functions|\s*turn\s*:))/gi, "");
       const trigger = "tool:functions.";
       while (true) {
         const lowerResult = result.toLowerCase();
@@ -1095,7 +1095,7 @@ ${TOOL_PROTOCOL(mode)}
 ${projectContextBlock}
 
 -- MEMORY RULES --
-- Memory: ${isMemoryEnabled ? "Use to subtly personalize. Auto Saves" : "OFF. Decline Saves"}
+- Memory: ${isMemoryEnabled ? "Use to subtly personalize. Auto Saves" : "OFF. Decline saving new memories"}
 - Time: Logs are timestamped. RELATIVE TIME REFERENCE e.g. few mins ago
 
 -- SECURITY RULES --
@@ -1109,7 +1109,7 @@ ${projectContextBlock}
 
 -- RESPONSE RULES --
 - End with [turn: continue] for more steps or [turn: finish] when done
-- Always end with [turn: continue] if called any tools
+- Tool Called? No post tool chat until [turn: continue]
 - Task Complete? End loop with [turn: finish]
 [/SYSTEM]`.trim();
     };
@@ -1368,11 +1368,25 @@ var init_history = __esm({
 // src/utils/usage.js
 import fs6 from "fs-extra";
 import path5 from "path";
-var cachedUsage, writeTimeout, lastWriteTime, isDirty, defaultStats, loadUsageFromFile, flushUsage, queueFlush, initUsage, forceFlushUsage, getDailyUsage, incrementUsage, addToUsage, checkQuota, getImageQuotaBuckets, getImageQuotaLimit, checkImageQuota, getImageQuotaStats, recordImageGeneration;
+import os3 from "os";
+var getLocalBackupPath, BACKUP_FILE, generateSaveId, cachedUsage, writeTimeout, lastWriteTime, isDirty, defaultStats, loadUsageFromFile, flushUsage, queueFlush, initUsage, forceFlushUsage, getDailyUsage, incrementUsage, addToUsage, checkQuota, getImageQuotaBuckets, getImageQuotaLimit, checkImageQuota, getImageQuotaStats, recordImageGeneration;
 var init_usage = __esm({
   "src/utils/usage.js"() {
     init_paths();
     init_crypto();
+    getLocalBackupPath = () => {
+      if (process.platform === "win32") {
+        const localAppData = process.env.LOCALAPPDATA || path5.join(os3.homedir(), "AppData", "Local");
+        return path5.join(localAppData, "FxFl", "backups", "backup.json");
+      }
+      if (process.platform === "darwin") {
+        return path5.join(os3.homedir(), "Library", "Application Support", "FxFl", "backups", "backup.json");
+      }
+      const xdgDataHome = process.env.XDG_DATA_HOME || path5.join(os3.homedir(), ".local", "share");
+      return path5.join(xdgDataHome, "fxfl", "backups", "backup.json");
+    };
+    BACKUP_FILE = getLocalBackupPath();
+    generateSaveId = () => Math.random().toString(36).substring(2) + Date.now().toString(36);
     cachedUsage = null;
     writeTimeout = null;
     lastWriteTime = 0;
@@ -1390,28 +1404,67 @@ var init_usage = __esm({
     };
     loadUsageFromFile = async () => {
       const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
+      let primaryData = null;
+      let backupData = null;
       try {
         if (await fs6.exists(USAGE_FILE)) {
           const rawContent = (await fs6.readFile(USAGE_FILE, "utf8")).trim();
-          let data;
           if (rawContent.startsWith("{") || rawContent.startsWith("[")) {
-            data = JSON.parse(rawContent);
+            primaryData = JSON.parse(rawContent);
           } else {
-            data = JSON.parse(decryptAes(rawContent));
+            primaryData = JSON.parse(decryptAes(rawContent));
           }
-          if (data && data.date === today && data.stats) {
-            const mergedStats = { ...defaultStats, ...data.stats };
-            if (!Array.isArray(mergedStats.imageCalls)) {
-              mergedStats.imageCalls = [];
-            }
-            return {
-              ...data,
-              stats: mergedStats
-            };
+        }
+      } catch (err) {
+      }
+      try {
+        if (await fs6.exists(BACKUP_FILE)) {
+          const rawContent = (await fs6.readFile(BACKUP_FILE, "utf8")).trim();
+          if (rawContent.startsWith("{") || rawContent.startsWith("[")) {
+            backupData = JSON.parse(rawContent);
+          } else {
+            backupData = JSON.parse(decryptAes(rawContent));
           }
         }
       } catch (err) {
       }
+      let resolvedData = null;
+      if (primaryData && backupData) {
+        if (primaryData.saveId !== backupData.saveId) {
+          resolvedData = primaryData;
+          try {
+            await fs6.ensureDir(path5.dirname(BACKUP_FILE));
+            await fs6.copy(USAGE_FILE, BACKUP_FILE);
+          } catch (e) {
+          }
+        } else {
+          resolvedData = primaryData;
+        }
+      } else if (primaryData && !backupData) {
+        resolvedData = primaryData;
+        try {
+          await fs6.ensureDir(path5.dirname(BACKUP_FILE));
+          await fs6.copy(USAGE_FILE, BACKUP_FILE);
+        } catch (e) {
+        }
+      } else if (!primaryData && backupData) {
+        resolvedData = backupData;
+        try {
+          await fs6.ensureDir(path5.dirname(USAGE_FILE));
+          await fs6.copy(BACKUP_FILE, USAGE_FILE);
+        } catch (e) {
+        }
+      }
+      if (resolvedData && resolvedData.date === today && resolvedData.stats) {
+        const mergedStats = { ...defaultStats, ...resolvedData.stats };
+        if (!Array.isArray(mergedStats.imageCalls)) {
+          mergedStats.imageCalls = [];
+        }
+        return {
+          ...resolvedData,
+          stats: mergedStats
+        };
+      }
       return { date: today, stats: { ...defaultStats } };
     };
     flushUsage = async () => {
@@ -1449,6 +1502,7 @@ var init_usage = __esm({
             }
           }
         }
+        cachedUsage.saveId = generateSaveId();
         const tempFile = USAGE_FILE + ".tmp";
         const encryptedStr = encryptAes(JSON.stringify(cachedUsage, null, 2));
         await fs6.writeFile(tempFile, encryptedStr, "utf8");
@@ -1456,6 +1510,11 @@ var init_usage = __esm({
         await fs6.fsync(fd);
         await fs6.close(fd);
         await fs6.rename(tempFile, USAGE_FILE);
+        try {
+          await fs6.ensureDir(path5.dirname(BACKUP_FILE));
+          await fs6.copy(USAGE_FILE, BACKUP_FILE);
+        } catch (backupErr) {
+        }
         isDirty = false;
         lastWriteTime = Date.now();
       } catch (e) {
@@ -2790,6 +2849,26 @@ var init_write_pdf = __esm({
           ]
         });
         const page = await browser.newPage();
+        let resolvedContent = content;
+        const imgRegex = /<img[^>]+src=["']([^"']+)["']/gi;
+        let match;
+        while ((match = imgRegex.exec(content)) !== null) {
+          const originalSrc = match[1];
+          if (!originalSrc || originalSrc.startsWith("http://") || originalSrc.startsWith("https://") || originalSrc.startsWith("data:")) {
+            continue;
+          }
+          try {
+            const imgPath = path11.resolve(process.cwd(), originalSrc);
+            if (await fs12.pathExists(imgPath)) {
+              const ext = path11.extname(imgPath).toLowerCase().replace(".", "") || "png";
+              const mime = ext === "jpg" ? "jpeg" : ext === "svg" ? "svg+xml" : ext;
+              const base64 = await fs12.readFile(imgPath, "base64");
+              const dataUri = `data:image/${mime};base64,${base64}`;
+              resolvedContent = resolvedContent.split(originalSrc).join(dataUri);
+            }
+          } catch (e) {
+          }
+        }
         const styledContent = `
             <style>
                 @page {
@@ -2819,7 +2898,7 @@ var init_write_pdf = __esm({
                 }
             </style>
             <div class="watermark">Generated by FluxFlow CLI (AI)</div>
-            ${content}
+            ${resolvedContent}
         `;
         await page.setContent(styledContent, { waitUntil: "networkidle0", timeout: 18e4 });
         const pdfBytes = await page.pdf({
@@ -3795,10 +3874,12 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS STRIC
         let lastToolSniffed = null;
         let lastToolDetail = null;
         let lastToolEventTime = null;
+        let lastToolFinishedAt = 0;
         let toolResults = [];
         let toolCallPointer = 0;
         let isThinkingLoop = false;
         let isStutteringLoop = false;
+        let isGeneralLoop = false;
         let isInitialAttempt = true;
         let accumulatedContext = "";
         let dedupeBuffer = "";
@@ -4023,6 +4104,7 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS STRIC
                 if (respRepetitionRatio > repetitionThresholdResponse) {
                   yield { type: "status", content: `Response Loop Detected. Re-centering...` };
                   isThinkingLoop = false;
+                  isGeneralLoop = true;
                   await new Promise((resolve) => setTimeout(resolve, 3e3));
                   break;
                 }
@@ -4221,6 +4303,12 @@ ${boxBottom}` };
                       }
                     }
                   }
+                  if (lastToolFinishedAt > 0) {
+                    const timeSinceLastTool = Date.now() - lastToolFinishedAt;
+                    if (timeSinceLastTool < 1e3) {
+                      await new Promise((resolve) => setTimeout(resolve, 1e3 - timeSinceLastTool));
+                    }
+                  }
                   const effectiveStart = lastToolEventTime || Date.now();
                   yield { type: "spinner", content: false };
                   let result = await dispatchTool(normToolName, toolCall.args, {
@@ -4234,6 +4322,7 @@ ${boxBottom}` };
                     process.stdout.write(`\x1B]0;Working...\x07`);
                   }
                   const toolEnd = Date.now();
+                  lastToolFinishedAt = toolEnd;
                   yield { type: "tool_time", content: toolEnd - effectiveStart };
                   lastToolEventTime = toolEnd;
                   let binaryPart = null;
@@ -4296,8 +4385,10 @@ ${boxBottom}` };
             const hasFinish2 = /\[\s*(turn\s*:)?\s*finish\s*\]/i.test(signalSafeText2.toLowerCase());
             const hasContinue = /\[\s*(turn\s*:)?\s*continue\s*\]/i.test(signalSafeText2.toLowerCase());
             const didCallTool = toolResults.length > 0 || lastToolSniffed !== null;
-            if (!hasFinish2 && !hasContinue && !didCallTool && signalSafeText2.length > 0) {
-              throw new Error("Silent stream cutoff (500): Model stream closed cleanly but missing turn finish/continue signals.");
+            const pureOutputText = signalSafeText2.replace(/<think>[\s\S]*?<\/think>/gi, "").trim();
+            const endsNormally = /[.!?}"'`’“”]$|```$/s.test(pureOutputText);
+            if (!hasFinish2 && !hasContinue && !didCallTool && signalSafeText2.length > 0 && !endsNormally && !isThinkingLoop && !isStutteringLoop && !isGeneralLoop) {
+              throw new Error("Silent stream cutoff (500): Model stream closed cleanly but cut off mid-sentence without signals.");
             }
             success = true;
             await incrementUsage("agent");
@@ -4376,6 +4467,8 @@ Error Log can be found in ${path15.join(LOGS_DIR, "agent", "error.log")}`);
             } else {
               if (retryCount <= MAX_RETRIES) {
                 retryCount++;
+                inStreamRetryCount = 1;
+                accumulatedContext = "";
                 const waitTime = Math.min(1e3 * Math.pow(2, retryCount - 1), 32e3);
                 isInitialAttempt = true;
                 yield { type: "status", content: `Retrying Connection (${retryCount}/${MAX_RETRIES}) [${(waitTime / 1e3).toFixed(0)}s]...` };
@@ -4438,6 +4531,7 @@ ${timestamp}`;
           modifiedHistory.push({ role: "user", text: `[SYSTEM] ${isStutteringLoop && !isThinkingLoop ? `STUTTERING DETECTED by Internal System. Re-calibrate your response & proceed.` : `${isThinkingLoop ? " OVER-THINKING" : " LOOP"} DETECTED by Internal System${isThinkingLoop ? " for current EFFORT_LEVEL" : ""}. ${isThinkingLoop ? "If you have planned the task, prioritize the execution/output. " : "If you have finished your task use [turn: finish] else continue."}`}` });
           isThinkingLoop = false;
           isStutteringLoop = false;
+          isGeneralLoop = false;
         }
       }
       yield { type: "status", content: null };
@@ -4686,7 +4780,7 @@ var app_exports = {};
 __export(app_exports, {
   default: () => App
 });
-import os3 from "os";
+import os4 from "os";
 import React10, { useState as useState7, useEffect as useEffect5, useRef as useRef2, useMemo } from "react";
 import { Box as Box10, Text as Text10, useInput as useInput4, useStdout } from "ink";
 import Spinner2 from "ink-spinner";
@@ -4861,7 +4955,7 @@ function App() {
   const [messages, setMessages] = useState7(() => {
     const logoMsg = { id: "logo-" + Date.now(), role: "system", text: FLUX_LOGO, isLogo: true, isMeta: true };
     const welcomeMsg = { id: "welcome", role: "system", text: "\u{1F30A}\u26A1 Welcome to Flux Flow! Type /help for commands.", isMeta: true };
-    const isHomeDir = process.cwd() === os3.homedir();
+    const isHomeDir = process.cwd() === os4.homedir();
     const isSystemDir = (() => {
       const cwd = process.cwd().toLowerCase();
       if (process.platform === "win32") {
@@ -4889,7 +4983,7 @@ function App() {
         id: "home-warning",
         role: "system",
         text: `[SECURITY ALERT] HOME DIRECTORY DETECTED`,
-        subText: `You are currently in ${os3.homedir()}. Working here is high-risk as the agent may modify system-sensitive configurations. Please move to a project folder for safety.`,
+        subText: `You are currently in ${os4.homedir()}. Working here is high-risk as the agent may modify system-sensitive configurations. Please move to a project folder for safety.`,
         isHomeWarning: true,
         isMeta: true
       });
@@ -5298,7 +5392,8 @@ ${hintText}`, color: "magenta" }];
                 const resumedMsgs = [...target.messages];
                 const hasLogo = resumedMsgs[0]?.text?.includes("\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557");
                 if (!hasLogo) {
-                  resumedMsgs.unshift({ id: "welcome-" + Date.now(), role: "system", text: FLUX_LOGO + "\n\n\u{1F30A}\u26A1 Resuming Flux Flow Session...\n" });
+                  resumedMsgs.unshift({ id: "welcome-" + Date.now(), role: "system", text: "\u{1F30A}\u26A1 Resuming Flux Flow Session...", isMeta: true });
+                  resumedMsgs.unshift({ id: "logo-" + Date.now(), role: "system", text: FLUX_LOGO, isLogo: true, isMeta: true });
                 }
                 setMessages(resumedMsgs);
                 setMessages((prev) => [...prev, { id: "sys-" + Date.now(), role: "system", text: `\u{1F4E1} SESSION RESUMED: [${targetId}]`, isMeta: true }]);
@@ -5314,8 +5409,11 @@ ${hintText}`, color: "magenta" }];
           break;
         }
         case "/clear": {
-          setMessages([{ id: "welcome-" + Date.now(), role: "system", text: FLUX_LOGO + "\n\n\u{1F30A}\u26A1 Welcome back to Flux Flow! Context cleared.\n", isMeta: true }]);
-          setCompletedIndex(1);
+          setMessages([
+            { id: "logo-" + Date.now(), role: "system", text: FLUX_LOGO, isLogo: true, isMeta: true },
+            { id: "welcome-" + Date.now(), role: "system", text: "\u{1F30A}\u26A1 Welcome back to Flux Flow! Context cleared.", isMeta: true }
+          ]);
+          setCompletedIndex(2);
           setChatId(generateChatId());
           setSessionStats({ tokens: 0 });
           setIsExpanded(false);
@@ -5474,21 +5572,22 @@ ${hintText}`, color: "magenta" }];
           let formattedLevel;
           if (parts[1]) {
             let val = parts[1].toLowerCase();
+            const isBypass = parts.includes("--bypass");
             formattedLevel = val.charAt(0).toUpperCase() + val.slice(1);
             if (val === "xhigh") {
               formattedLevel = "xHigh";
             }
-            if (mode === "Flow" && (formattedLevel === "Medium" || formattedLevel === "High" || formattedLevel === "xHigh")) {
+            if (!isBypass && mode === "Flow" && (formattedLevel === "Medium" || formattedLevel === "High" || formattedLevel === "xHigh")) {
               setMessages((prev) => {
                 setCompletedIndex(prev.length + 1);
                 return [...prev, { id: Date.now(), role: "system", text: `\u274C [RESTRICTED] "${formattedLevel}" is restricted in Flow mode. Switch to Flux to enable Higher Thinking Levels.`, isMeta: true }];
               });
             } else {
               setThinkingLevel(formattedLevel);
-              const s2 = emojiSpace(2);
+              const s2 = emojiSpace(1);
               setMessages((prev) => {
                 setCompletedIndex(prev.length + 1);
-                return [...prev, { id: Date.now(), role: "system", text: `\u{1F527}${s2}[SYSTEM] Thinking level set to ${formattedLevel}`, isMeta: true }];
+                return [...prev, { id: Date.now(), role: "system", text: `\u{1F527} [SYSTEM] Thinking level set to ${formattedLevel}${isBypass ? ` (Bypass Activated \u{1F575}\uFE0F${s2})` : ""}`, isMeta: true }];
               });
             }
           } else {
@@ -6671,7 +6770,7 @@ var init_app = __esm({
     packageJsonPath = path16.join(path16.dirname(fileURLToPath(import.meta.url)), "../package.json");
     packageJson = JSON.parse(fs18.readFileSync(packageJsonPath, "utf8"));
     versionFluxflow = packageJson.version;
-    updatedOn = "2026-05-17";
+    updatedOn = "2026-05-20";
     ResolutionModal = ({ data, onResolve, onEdit }) => /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "gray", padding: 0, width: "100%" }, /* @__PURE__ */ React10.createElement(Box10, { paddingX: 1 }, /* @__PURE__ */ React10.createElement(Text10, { color: "magenta", bold: true, underline: true }, "\u{1F7E3} STEERING HINT RESOLUTION")), /* @__PURE__ */ React10.createElement(Box10, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, null, "The agent already finished the task before your hint was consumed.")), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1, backgroundColor: "#222", paddingX: 2, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { italic: true, color: "gray" }, '"', data, '"')), /* @__PURE__ */ React10.createElement(Box10, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, { color: "cyan" }, "How would you like to proceed?")), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 0 }, /* @__PURE__ */ React10.createElement(
       CommandMenu,
       {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fluxflow-cli",
-	"version": "1.11.1",
+	"version": "1.11.3",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",