fluxflow-cli 2.6.5 → 2.6.6

package/dist/fluxflow.js

@@ -12,6 +12,7 @@ var __export = (target, all) => {
 // src/utils/paths.js
 var paths_exports = {};
 __export(paths_exports, {
+  ACTIVE_TX_FILE: () => ACTIVE_TX_FILE,
   BACKUPS_DIR: () => BACKUPS_DIR,
   CONTEXT_FILE: () => CONTEXT_FILE,
   DATA_DIR: () => DATA_DIR,
@@ -32,7 +33,7 @@ import os from "os";
 import path from "path";
 import fs from "fs";
 import crypto 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, PATHS_FILE, CONTEXT_FILE, PARSER_DIR;
+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, ACTIVE_TX_FILE, PATHS_FILE, CONTEXT_FILE, PARSER_DIR;
 var init_paths = __esm({
   "src/utils/paths.js"() {
     FLUXFLOW_DIR = path.join(os.homedir(), ".fluxflow");
@@ -75,6 +76,7 @@ var init_paths = __esm({
     TEMP_MEM_CHAT_FILE = path.join(SECRET_DIR, "temp-memory-chat.json");
     BACKUPS_DIR = path.join(DATA_DIR, "backups");
     LEDGER_FILE = path.join(SECRET_DIR, "ledger.json");
+    ACTIVE_TX_FILE = path.join(SECRET_DIR, "active_tx.json");
     PATHS_FILE = path.join(SECRET_DIR, "path.json");
     CONTEXT_FILE = path.join(SECRET_DIR, "context.json");
     PARSER_DIR = path.join(DATA_DIR, "parsers");
@@ -2146,7 +2148,7 @@ Access to internal tools. MUST use the exact syntax on a new line: [tool:functio
 
 **TOOL USAGE POLICY:**
 - **MAX 3 TOOL CALLS PER TURN. Next Turn, verify tool results, plan next**
-${mode === "Flux" ? "- USE multiple search & replace on patch tool if editing same file/path with many changes \u2190 **MANDATORY where possible**\n- Tool execution denied? MUST use  'Ask' tool immediately to ask for reason/changes. NEVER END RESPONSE OR PROCEED BLINDLY \u2190 **MANDATORY**\n- FileMap >> ReadFile for understandling files efficiently\n- Want a spefific word/varible to find across project? SearchKeyword >> Guessing/ReadFile" : ""}- No brute force, no spamming of tools
+${mode === "Flux" ? "- USE multiple search & replace on patch tool if editing same file/path with many changes \u2190 **HIGHLY PREFERRED**\n- Tool execution denied? MUST use  'Ask' tool immediately to ask for reason/changes. NEVER END RESPONSE OR PROCEED BLINDLY \u2190 **MANDATORY**\n- FileMap >> ReadFile for understandling files efficiently\n- Want a spefific word/varible to find across project? SearchKeyword >> Guessing/ReadFile" : ""}- No brute force, no spamming of tools
 ${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
@@ -3422,6 +3424,51 @@ Current date and Time: ${(/* @__PURE__ */ new Date()).toLocaleString([], { year:
 // src/utils/revert.js
 import fs6 from "fs-extra";
 import path5 from "path";
+async function performRestoration(change, tx) {
+  try {
+    if (change.type === "create") {
+      if (await fs6.pathExists(change.filePath)) {
+        await fs6.chmod(change.filePath, 438).catch(() => {
+        });
+        await fs6.remove(change.filePath);
+      }
+    } else if (change.type === "update") {
+      if (!change.backupFile) return;
+      const backupPath = path5.join(BACKUPS_DIR, tx.chatId, change.backupFile);
+      if (await fs6.pathExists(backupPath)) {
+        const encrypted = await fs6.readFile(backupPath, "utf8");
+        const decrypted = decryptAes(encrypted);
+        if (await fs6.pathExists(change.filePath)) {
+          await fs6.chmod(change.filePath, 438).catch(() => {
+          });
+        }
+        await fs6.writeFile(change.filePath, decrypted, "utf8");
+      } else {
+        console.warn(`[RevertManager] Backup file missing: ${backupPath}`);
+      }
+    }
+  } catch (err) {
+    throw new Error(`Restoration failed for ${path5.basename(change.filePath)}: ${err.message}`);
+  }
+}
+async function restoreWithRetry(change, tx, maxAttempts = 7) {
+  let attempt = 0;
+  while (attempt < maxAttempts) {
+    try {
+      await performRestoration(change, tx);
+      return true;
+    } catch (err) {
+      attempt++;
+      if (attempt >= maxAttempts) {
+        console.error(`[RevertManager] Permanent failure: ${change.filePath}. ${err.message}`);
+        return false;
+      }
+      const delay = Math.min(100 * Math.pow(2, attempt - 1), 5e3);
+      await new Promise((resolve) => setTimeout(resolve, delay));
+    }
+  }
+  return false;
+}
 var currentTransaction, RevertManager;
 var init_revert = __esm({
   "src/utils/revert.js"() {
@@ -3430,9 +3477,6 @@ var init_revert = __esm({
     fs6.ensureDirSync(BACKUPS_DIR);
     currentTransaction = null;
     RevertManager = {
-      /**
-       * Initializes a new transaction before a prompt starts processing.
-       */
       async startTransaction(chatId, promptText) {
         currentTransaction = {
           id: `tx_prompt_${Date.now()}`,
@@ -3442,122 +3486,101 @@ var init_revert = __esm({
           changes: [],
           reverted: false
         };
+        writeEncryptedJson(ACTIVE_TX_FILE, currentTransaction);
       },
-      /**
-       * Records a file change under the active prompt transaction.
-       */
       async recordFileChange(absolutePath, forcedContent = null) {
         if (!currentTransaction) return;
         try {
           const alreadyBackedUp = currentTransaction.changes.some((c) => c.filePath === absolutePath);
           if (alreadyBackedUp) return;
           const fileExists = await fs6.pathExists(absolutePath);
-          let type = fileExists && !forcedContent ? "update" : forcedContent ? "update" : "create";
-          if (!fileExists && !forcedContent) type = "create";
+          let type = fileExists || forcedContent ? "update" : "create";
           let backupFile = null;
-          if (fileExists || forcedContent) {
-            type = "update";
+          if (type === "update") {
             const fileName = path5.basename(absolutePath);
             backupFile = `${currentTransaction.id}_${fileName}.bak`;
             const chatBackupDir = path5.join(BACKUPS_DIR, currentTransaction.chatId);
             await fs6.ensureDir(chatBackupDir);
             const backupPath = path5.join(chatBackupDir, backupFile);
-            let content;
-            if (forcedContent !== null) {
-              content = forcedContent;
+            let content = forcedContent !== null ? forcedContent : await fs6.readFile(absolutePath, "utf8").catch(() => null);
+            if (content !== null) {
+              writeEncryptedJson(backupPath, { data: encryptAes(content) });
             } else {
-              try {
-                content = await fs6.readFile(absolutePath, "utf8");
-              } catch (readErr) {
-                console.warn(`[RevertManager] Could not read file for backup: ${absolutePath}. ${readErr.message}`);
-                type = "create";
-                backupFile = null;
-              }
-            }
-            if (backupFile) {
-              const encrypted = encryptAes(content);
-              await fs6.writeFile(backupPath, encrypted, "utf8");
+              type = "create";
+              backupFile = null;
             }
           }
-          currentTransaction.changes.push({
-            filePath: absolutePath,
-            type,
-            backupFile
-          });
+          currentTransaction.changes.push({ filePath: absolutePath, type, backupFile });
+          writeEncryptedJson(ACTIVE_TX_FILE, currentTransaction);
         } catch (err) {
-          console.error(`[RevertManager] Error recording file change for ${absolutePath}:`, err.message);
         }
       },
-      /**
-       * Finalizes the transaction and saves it to ledger.json.
-       */
       async commitTransaction() {
         if (!currentTransaction) return;
-        const ledger = readEncryptedJson(LEDGER_FILE, []);
-        ledger.push(currentTransaction);
-        if (ledger.length > 512e3) {
-          const removed = ledger.shift();
-          if (removed.changes) {
-            for (const change of removed.changes) {
-              if (change.backupFile) {
-                const backupPath = path5.join(BACKUPS_DIR, removed.chatId, change.backupFile);
-                await fs6.remove(backupPath);
+        try {
+          const ledger = readEncryptedJson(LEDGER_FILE, []);
+          ledger.push(currentTransaction);
+          if (ledger.length > 512e3) {
+            const removed = ledger.shift();
+            if (removed.changes) {
+              for (const change of removed.changes) {
+                if (change.backupFile) {
+                  await fs6.remove(path5.join(BACKUPS_DIR, removed.chatId, change.backupFile)).catch(() => {
+                  });
+                }
               }
             }
           }
+          writeEncryptedJson(LEDGER_FILE, ledger);
+          await fs6.remove(ACTIVE_TX_FILE).catch(() => {
+          });
+        } catch (err) {
+        } finally {
+          currentTransaction = null;
+        }
+      },
+      async recoverCrashedTransaction() {
+        try {
+          if (await fs6.pathExists(ACTIVE_TX_FILE)) {
+            const orphanedTx = readEncryptedJson(ACTIVE_TX_FILE, null);
+            if (orphanedTx?.changes?.length > 0) {
+              const ledger = readEncryptedJson(LEDGER_FILE, []);
+              if (!ledger.some((t) => t.id === orphanedTx.id)) {
+                ledger.push(orphanedTx);
+                writeEncryptedJson(LEDGER_FILE, ledger);
+              }
+            }
+            await fs6.remove(ACTIVE_TX_FILE).catch(() => {
+            });
+          }
+        } catch (e) {
         }
-        writeEncryptedJson(LEDGER_FILE, ledger);
-        currentTransaction = null;
       },
-      /**
-       * Reverts the codebase to a state immediately before the target transaction.
-       * Reverts the target transaction and all subsequent ones in reverse sequential order.
-       * Returns the target prompt text so it can be loaded back into the user input.
-       */
       async rollbackToBefore(txId) {
-        const ledger = readEncryptedJson(LEDGER_FILE, null);
+        let ledger = readEncryptedJson(LEDGER_FILE, null);
         if (!ledger) throw new Error("No transaction ledger found.");
         const targetIndex = ledger.findIndex((t) => t.id === txId);
         if (targetIndex === -1) throw new Error(`Transaction [${txId}] not found.`);
         const chatId = ledger[targetIndex].chatId;
         const targetPrompt = ledger[targetIndex].prompt;
         const toRevert = ledger.slice(targetIndex).filter((t) => t.chatId === chatId && !t.reverted).reverse();
+        console.log(`[RevertManager] Starting sequential rollback of ${toRevert.length} transactions...`);
         for (const tx of toRevert) {
           for (const change of [...tx.changes].reverse()) {
-            if (change.type === "create") {
-              if (await fs6.pathExists(change.filePath)) {
-                await fs6.remove(change.filePath);
-              }
-            } else if (change.type === "update") {
-              const backupPath = path5.join(BACKUPS_DIR, tx.chatId, change.backupFile);
-              if (await fs6.pathExists(backupPath)) {
-                const encrypted = await fs6.readFile(backupPath, "utf8");
-                const decrypted = decryptAes(encrypted);
-                await fs6.writeFile(change.filePath, decrypted, "utf8");
-              }
-            }
+            await restoreWithRetry(change, tx);
           }
-          tx.reverted = true;
-        }
-        for (const tx of toRevert) {
           for (const change of tx.changes) {
             if (change.backupFile) {
               const backupPath = path5.join(BACKUPS_DIR, tx.chatId, change.backupFile);
-              await fs6.remove(backupPath);
+              await fs6.remove(backupPath).catch(() => {
+              });
             }
           }
+          ledger = ledger.filter((t) => t.id !== tx.id);
+          writeEncryptedJson(LEDGER_FILE, ledger);
         }
-        const updatedLedger = ledger.filter((t) => !toRevert.some((r) => r.id === t.id));
-        writeEncryptedJson(LEDGER_FILE, updatedLedger);
-        return {
-          success: true,
-          chatId,
-          targetPrompt
-        };
+        return { success: true, chatId, targetPrompt };
       },
-      /**
-       * Gets all non-reverted prompt transactions for a specific chat.
-       */
       async getChatHistory(chatId) {
         try {
           const ledger = readEncryptedJson(LEDGER_FILE, []);
@@ -3566,19 +3589,12 @@ var init_revert = __esm({
           return [];
         }
       },
-      /**
-       * Cleans up all transaction logs and backups associated with a deleted chat.
-       */
       async deleteChatBackups(chatId) {
         try {
-          const chatBackupDir = path5.join(BACKUPS_DIR, chatId);
-          await fs6.remove(chatBackupDir);
+          await fs6.remove(path5.join(BACKUPS_DIR, chatId));
           let ledger = readEncryptedJson(LEDGER_FILE, []);
-          const originalLength = ledger.length;
-          ledger = ledger.filter((t) => t.chatId !== chatId);
-          if (ledger.length !== originalLength) {
-            writeEncryptedJson(LEDGER_FILE, ledger);
-          }
+          const clean = ledger.filter((t) => t.chatId !== chatId);
+          if (ledger.length !== clean.length) writeEncryptedJson(LEDGER_FILE, clean);
         } catch (e) {
         }
       }
@@ -7978,7 +7994,14 @@ ${activeSummaryBlock}${thinkingLevel != "Fast" && aiProvider === "Google" ? `${m
                       activeBufferType = null;
                       remaining = combined.substring(endIdx + endTag.length);
                     } else {
-                      toolCallBuffer += remaining;
+                      const MAX_BUFFER = 512;
+                      if (combined.length > MAX_BUFFER) {
+                        msgs.push({ type: "text", content: combined });
+                        toolCallBuffer = "";
+                      } else {
+                        toolCallBuffer = combined;
+                      }
+                      remaining = "";
                       break;
                     }
                   }
@@ -10676,6 +10699,7 @@ function App({ args = [] }) {
       cleanupOldLogs(LOGS_DIR);
       performVersionCheck(false, freshSettings);
       await initUsage();
+      await RevertManager.recoverCrashedTransaction();
       if (parsedArgs.resume) {
         const h = await loadHistory();
         const id = parsedArgs.resume;
@@ -12575,7 +12599,7 @@ Selection: ${val}`,
                 if (result.success) {
                   const { targetPrompt } = result;
                   deleteChatSummary(chatId);
-                  const targetIdx = messages.findIndex(
+                  const targetIdx = messages.findLastIndex(
                     (m) => m.role === "user" && m.text && (m.text.startsWith(targetPrompt) || m.text.includes(targetPrompt))
                   );
                   let newMsgs = [...messages];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fluxflow-cli",
-	"version": "2.6.5",
+	"version": "2.6.6",
 	"date": "2026-06-15",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [