fluxflow-cli 1.11.0 → 1.11.2

package/dist/fluxflow.js

@@ -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();
     };
@@ -1171,7 +1171,7 @@ var init_history = __esm({
     loadHistory = async () => {
       if (await fs5.pathExists(HISTORY_FILE)) {
         try {
-          return await fs5.readJson(HISTORY_FILE);
+          return readEncryptedJson(HISTORY_FILE, {});
         } catch (e) {
           return {};
         }
@@ -1189,8 +1189,7 @@ var init_history = __esm({
           messages: persistentMessages,
           updatedAt: Date.now()
         };
-        await fs5.ensureDir(path4.dirname(HISTORY_FILE));
-        await fs5.writeJson(HISTORY_FILE, history, { spaces: 2 });
+        writeEncryptedJson(HISTORY_FILE, history);
       });
     };
     saveChatTitle = async (id, title) => {
@@ -1202,15 +1201,14 @@ var init_history = __esm({
         } else {
           history[id] = { name: title, messages: [], updatedAt: Date.now() };
         }
-        await fs5.ensureDir(path4.dirname(HISTORY_FILE));
-        await fs5.writeJson(HISTORY_FILE, history, { spaces: 2 });
+        writeEncryptedJson(HISTORY_FILE, history);
       });
     };
     deleteChat = async (id) => {
       return withLock(async () => {
         const history = await loadHistory();
         delete history[id];
-        await fs5.writeJson(HISTORY_FILE, history, { spaces: 2 });
+        writeEncryptedJson(HISTORY_FILE, history);
         const temp = readEncryptedJson(TEMP_MEM_FILE, {});
         if (temp[id]) {
           delete temp[id];
@@ -1370,7 +1368,7 @@ 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, getImageQuotaLimit, checkImageQuota, getImageQuotaStats, recordImageGeneration;
+var 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();
@@ -1532,23 +1530,42 @@ var init_usage = __esm({
       }
       return true;
     };
+    getImageQuotaBuckets = (imageCalls) => {
+      const hourMs = 60 * 60 * 1e3;
+      if (!imageCalls || imageCalls.length === 0) {
+        return [];
+      }
+      const sortedCalls = [...imageCalls].sort((a, b) => a.timestamp - b.timestamp);
+      const buckets = [];
+      for (const call of sortedCalls) {
+        if (buckets.length > 0) {
+          const lastBucket = buckets[buckets.length - 1];
+          if (call.timestamp >= lastBucket.start && call.timestamp < lastBucket.end) {
+            lastBucket.calls.push(call);
+            lastBucket.spent += call.cost;
+            continue;
+          }
+        }
+        buckets.push({
+          start: call.timestamp,
+          end: call.timestamp + hourMs,
+          calls: [call],
+          spent: call.cost
+        });
+      }
+      return buckets;
+    };
     getImageQuotaLimit = (imageCalls, now) => {
       const hourMs = 60 * 60 * 1e3;
       if (!imageCalls || imageCalls.length === 0) {
         return 0.025;
       }
-      const oldestTimestamp = imageCalls[0].timestamp;
-      const startTime = Math.min(oldestTimestamp, now - 24 * hourMs);
-      const windows = [];
-      let currentEnd = now;
-      while (currentEnd > startTime) {
-        windows.unshift({ start: currentEnd - hourMs, end: currentEnd });
-        currentEnd -= hourMs;
+      const buckets = getImageQuotaBuckets(imageCalls);
+      if (buckets.length === 0) {
+        return 0.025;
       }
       const history = [];
-      for (const win of windows) {
-        const winCalls = imageCalls.filter((c) => c.timestamp >= win.start && c.timestamp < win.end);
-        const usage = winCalls.reduce((sum, c) => sum + c.cost, 0);
+      for (const bucket of buckets) {
         let limit = 0.025;
         if (history.length > 0) {
           const prev1 = history[history.length - 1];
@@ -1562,26 +1579,61 @@ var init_usage = __esm({
           if (consecutiveMax) {
             limit = 0.015;
           } else {
-            const prevLimit = prev1.limit;
-            const prevRatio = prev1.ratio;
-            if (prevRatio >= 0.8) {
-              limit = prevLimit === 0.015 ? 0.015 : prevLimit;
-            } else if (prevRatio < 0.4) {
-              limit = Math.min(0.025, prevLimit + 5e-3);
-            } else if (prevRatio >= 0.4 && prevRatio < 0.6) {
-              limit = Math.min(0.025, prevLimit + 4e-3);
+            const prevLimit2 = prev1.limit;
+            const prevRatio2 = prev1.ratio;
+            if (prevRatio2 >= 0.8) {
+              limit = prevLimit2 === 0.015 ? 0.015 : prevLimit2;
+            } else if (prevRatio2 < 0.4) {
+              limit = Math.min(0.025, prevLimit2 + 5e-3);
+            } else if (prevRatio2 >= 0.4 && prevRatio2 < 0.6) {
+              limit = Math.min(0.025, prevLimit2 + 4e-3);
             } else {
-              limit = Math.min(0.025, prevLimit + 2e-3);
+              limit = Math.min(0.025, prevLimit2 + 2e-3);
             }
           }
         }
-        const ratio = limit > 0 ? usage / limit : 0;
-        history.push({ limit, usage, ratio });
+        const ratio = limit > 0 ? bucket.spent / limit : 0;
+        history.push({ limit, spent: bucket.spent, ratio });
       }
-      if (history.length > 0) {
+      const lastBucket = buckets[buckets.length - 1];
+      if (now < lastBucket.end) {
         return history[history.length - 1].limit;
       }
-      return 0.025;
+      let currentLimit = history[history.length - 1].limit;
+      let prevLimit = currentLimit;
+      let prevRatio = history[history.length - 1].ratio;
+      let simulatedTime = lastBucket.end;
+      let consecutiveMaxCount = 0;
+      for (let k = history.length - 1; k >= 0; k--) {
+        if (history[k].ratio >= 0.8) {
+          consecutiveMaxCount++;
+        } else {
+          break;
+        }
+      }
+      while (simulatedTime <= now) {
+        let limit = 0.025;
+        const consecutiveMax = consecutiveMaxCount >= 2;
+        if (consecutiveMax) {
+          limit = 0.015;
+        } else {
+          if (prevRatio >= 0.8) {
+            limit = prevLimit === 0.015 ? 0.015 : prevLimit;
+          } else if (prevRatio < 0.4) {
+            limit = Math.min(0.025, prevLimit + 5e-3);
+          } else if (prevRatio >= 0.4 && prevRatio < 0.6) {
+            limit = Math.min(0.025, prevLimit + 4e-3);
+          } else {
+            limit = Math.min(0.025, prevLimit + 2e-3);
+          }
+        }
+        prevLimit = limit;
+        prevRatio = 0;
+        consecutiveMaxCount = 0;
+        simulatedTime += hourMs;
+        currentLimit = limit;
+      }
+      return currentLimit;
     };
     checkImageQuota = async (settings) => {
       const imageSettings = settings.imageSettings || { keyType: "Default", quality: "Low-High" };
@@ -1601,9 +1653,14 @@ var init_usage = __esm({
         stats.imageCalls = [];
       }
       const now = Date.now();
-      const oneHourAgo = now - 60 * 60 * 1e3;
-      const activeCalls = stats.imageCalls.filter((c) => c.timestamp >= oneHourAgo);
-      const totalSpent = activeCalls.reduce((sum, c) => sum + c.cost, 0);
+      const buckets = getImageQuotaBuckets(stats.imageCalls);
+      let totalSpent = 0;
+      if (buckets.length > 0) {
+        const lastBucket = buckets[buckets.length - 1];
+        if (now >= lastBucket.start && now < lastBucket.end) {
+          totalSpent = lastBucket.spent;
+        }
+      }
       const currentLimit = getImageQuotaLimit(stats.imageCalls, now);
       return totalSpent + currentCost <= currentLimit;
     };
@@ -1613,19 +1670,21 @@ var init_usage = __esm({
         stats.imageCalls = [];
       }
       const now = Date.now();
-      const oneHourAgo = now - 60 * 60 * 1e3;
-      const activeCalls = stats.imageCalls.filter((c) => c.timestamp >= oneHourAgo);
-      const totalSpent = activeCalls.reduce((sum, c) => sum + c.cost, 0);
-      const currentLimit = getImageQuotaLimit(stats.imageCalls, now);
-      const remaining = Math.max(0, currentLimit - totalSpent);
+      const buckets = getImageQuotaBuckets(stats.imageCalls);
+      let activeCalls = [];
+      let totalSpent = 0;
       let nextResetMin = 0;
-      let reclaimCost = 0;
-      if (activeCalls.length > 0) {
-        const earliestCall = activeCalls.reduce((min, c) => c.timestamp < min.timestamp ? c : min, activeCalls[0]);
-        const nextResetTimestamp = earliestCall.timestamp + 60 * 60 * 1e3;
-        nextResetMin = Math.max(0, Math.ceil((nextResetTimestamp - now) / (60 * 1e3)));
-        reclaimCost = earliestCall.cost;
+      if (buckets.length > 0) {
+        const lastBucket = buckets[buckets.length - 1];
+        if (now >= lastBucket.start && now < lastBucket.end) {
+          activeCalls = lastBucket.calls;
+          totalSpent = lastBucket.spent;
+          nextResetMin = Math.max(0, Math.ceil((lastBucket.end - now) / (60 * 1e3)));
+        }
       }
+      const currentLimit = getImageQuotaLimit(stats.imageCalls, now);
+      const remaining = Math.max(0, currentLimit - totalSpent);
+      const reclaimCost = totalSpent;
       return {
         totalSpent,
         remaining,
@@ -3740,6 +3799,7 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS STRIC
         let toolCallPointer = 0;
         let isThinkingLoop = false;
         let isStutteringLoop = false;
+        let isGeneralLoop = false;
         let isInitialAttempt = true;
         let accumulatedContext = "";
         let dedupeBuffer = "";
@@ -3964,6 +4024,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;
                 }
@@ -4237,8 +4298,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");
@@ -4317,6 +4380,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]...` };
@@ -4379,6 +4444,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 };

package/package.json

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