fluxflow-cli 2.6.4 → 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
@@ -2157,11 +2159,11 @@ ${mode === "Flux" ? "- **File Tools >> Code in chat**\n" : ""}
 
 ${mode === "Flux" ? `- PROJECT TOOLS (path = relative to CWD, path separator: '/') -
 1. [tool:functions.ReadFile(path="...", startLine=number, endLine=number)]. ${aiProvider !== "Google" ? `${isMultiModal ? `Supports images/docs. User gives image/doc: VIEW FIRST` : `No Multimodal support`}` : `Supports images/docs. User gives image/doc: VIEW FIRST`}
-2. [tool:functions.FileMap(path="path/file")]. Shows file structure, dependency, functions, variable maps. Token Efficient than ReadFile. Understand File? FileMap >>> ReadFile
+2. [tool:functions.FileMap(path="path/file")]. Shows file structure, dependency, functions, variable maps. Token Efficient than ReadFile
 3. [tool:functions.ReadFolder(path="...")]. Detailed DIR stats
 4. [tool:functions.PatchFile(path="...", replaceContent1="exact string", newContent1="...", ...MAX 10)]. Surgical Patch. **Multiple patch on same file/path? Use replaceContent2, newContent2 etc >>> multiple spams**. Unsure? ReadFile >> guessing. **MUST VERIFY DIFF**
 5. [tool:functions.WriteFile(path="...", content="...")]. Creates/Overwrites. File Exist? PatchFile > WriteFile. Verify Imports
-6. [tool:functions.SearchKeyword(keyword="...", file="optional")]. Global project search. If 'file' is provided, searches only that file. Finds definitions/logic without reading every file
+6. [tool:functions.SearchKeyword(keyword="...", file="optional")]. Global project search. If 'file' is provided, searches only that file. Finds definitions/logic without reading every file. Usage: Can search for relevent lines/logic area to read specifically for edit
 7. [tool:functions.Run(command="...")]. Runs ${osDetected === "Windows" ? isPsAvailable() ? `${isPtyAvailable ? "Interactive " : ""}WINDOWS POWERSHELL ONLY` : `${isPtyAvailable ? "Interactive " : ""}WINDOWS CMD ONLY` : `${isPtyAvailable ? "Interactive " : ""}BASH`} command. Destructive/Irreversible ops -> Ask user. **TOOL DENY RULE APPLIES**. **1 CALL LIMIT OR 3 CONSECUTIVE RUN TOOL ONLY**
 8. [tool:functions.WritePDF(path="...", content="...", orientation="...")]. PROACTIVE A4 PAGE BREAKS MUST IN CSS. HTML/CSS for PREMIUM layout
 9. [tool:functions.WriteDoc(path="...", content="...")]. A4 Word document
@@ -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) {
         }
       }
@@ -5579,46 +5595,70 @@ var init_parsers = __esm({
 import fs18 from "fs-extra";
 import path17 from "path";
 import { createRequire } from "module";
+function sanitize(text, limit = 50) {
+  if (!text) return "";
+  const clean = text.replace(/\s+/g, " ").trim();
+  return clean.length > limit ? clean.substring(0, limit - 3) + "..." : clean;
+}
 function getDisplayName(node) {
-  if (node.type === "element" || node.type === "script_element" || node.type === "style_element") {
-    const startTag = node.childForFieldName("start_tag") || node.children.find((c) => c.type === "start_tag");
-    if (startTag) {
-      const tagName2 = startTag.childForFieldName("name") || startTag.children.find((c) => c.type === "tag_name");
-      return tagName2 ? tagName2.text : null;
-    }
-    const tagName = node.children.find((c) => c.type === "tag_name");
-    return tagName ? tagName.text : null;
+  const type = node.type;
+  if (type === "if_statement") {
+    const cond = node.childForFieldName("condition");
+    return cond ? `if (${sanitize(cond.text, 40)})` : "if";
   }
-  if (node.type === "jsx_element" || node.type === "jsx_self_closing_element") {
-    const openingNode = node.childForFieldName("opening_element") || node;
-    const nameNode2 = openingNode.childForFieldName("name");
-    return nameNode2 ? nameNode2.text : null;
+  if (type === "else_clause") return "else";
+  if (type === "while_statement" || type === "do_statement") {
+    const cond = node.childForFieldName("condition");
+    return `${type.split("_")[0]} (${cond ? sanitize(cond.text, 40) : ""})`;
   }
-  if (node.type === "import_declaration" || node.type === "import_from_statement" || node.type === "import_statement" || node.type === "preproc_include") {
-    return node.text.split("\n")[0].trim();
+  if (type === "for_statement" || type === "for_in_statement" || type === "for_of_statement") {
+    const text = node.text.split("\n")[0];
+    const match = text.match(/for\s*(?:await\s*)?\((.*)\)/);
+    if (match) return `for (${sanitize(match[1], 40)})`;
+    return "for";
   }
-  if (node.type === "function_definition" || node.type === "function_declaration") {
-    const declarator = node.childForFieldName("declarator");
-    if (declarator) {
-      const id = declarator.descendantsOfType("identifier")[0] || declarator.descendantsOfType("field_identifier")[0];
-      if (id) return id.text;
-    }
+  if (type === "switch_statement") {
+    const val = node.childForFieldName("value");
+    return `switch (${val ? sanitize(val.text, 40) : ""})`;
+  }
+  if (type === "try_statement") return "try";
+  if (type === "catch_clause") return "catch";
+  if (type === "element" || type === "script_element" || type === "style_element" || type === "jsx_element" || type === "jsx_self_closing_element") {
+    const opening = node.childForFieldName("opening_element") || node.childForFieldName("start_tag") || node.children.find((c) => c.type === "start_tag") || node;
+    const tagName = opening.childForFieldName("name") || opening.childForFieldName("tag_name") || opening.children.find((c) => c.type === "tag_name");
+    return tagName ? `<${sanitize(tagName.text, 30)}>` : null;
+  }
+  if (["import_declaration", "import_from_statement", "import_statement", "preproc_include"].includes(type)) {
+    return sanitize(node.text.split("\n")[0], 60);
+  }
+  if (type === "pair") {
+    const key = node.childForFieldName("key");
+    return key ? sanitize(key.text.replace(/["']/g, ""), 40) : null;
+  }
+  if (type === "assignment_expression") {
+    const left = node.childForFieldName("left");
+    return left ? `${sanitize(left.text, 30)} = ...` : null;
+  }
+  if (type === "variable_declarator") {
+    const id = node.childForFieldName("name") || node.children.find((c) => ["identifier", "object_pattern", "array_pattern"].includes(c.type));
+    return id ? sanitize(id.text, 40) : null;
   }
-  const nameNode = node.childForFieldName("name") || node.children.find((c) => c.type === "identifier" || c.type === "variable_declarator" || c.type === "type_identifier" || c.type === "field_identifier");
+  const nameNode = node.childForFieldName("name") || node.childForFieldName("declarator") || node.children.find((c) => ["identifier", "type_identifier", "field_identifier", "property_identifier", "shorthand_property_identifier"].includes(c.type));
   if (nameNode) {
-    if (nameNode.type === "variable_declarator") {
-      const idNode = nameNode.childForFieldName("name") || nameNode.children.find((c) => c.type === "identifier");
-      return idNode ? idNode.text : null;
+    if (nameNode.type.includes("declarator")) {
+      const id = nameNode.descendantsOfType("identifier")[0] || nameNode.descendantsOfType("field_identifier")[0];
+      if (id) return sanitize(id.text, 40);
     }
-    return nameNode.text;
+    return sanitize(nameNode.text, 40);
   }
-  if (node.type === "lexical_declaration" || node.type === "variable_declaration") {
-    const decl = node.children.find((c) => c.type === "variable_declarator");
-    if (decl) return getDisplayName(decl);
-  }
-  if (node.type === "method_definition" || node.type === "function_declaration") {
-    const id = node.childForFieldName("name") || node.children.find((c) => c.type === "identifier");
-    if (id) return id.text;
+  if (["arrow_function", "function_expression", "function_declaration"].includes(type)) {
+    let p = node.parent;
+    while (p && p.type !== "program") {
+      const pName = getDisplayName(p);
+      if (pName) return pName;
+      if (!PASSTHROUGH_TYPES.has(p.type)) break;
+      p = p.parent;
+    }
   }
   return null;
 }
@@ -5639,36 +5679,43 @@ function getNextInterestingNodes(node) {
 function toCamelCase(str) {
   return str.replace(/_([a-z])/g, (g) => g[1].toUpperCase());
 }
-function traverse(node, depth = 0, isLast = true, prefix = "") {
-  const MAX_DEPTH = 6;
+function traverse(node, depth = 0, isLast = true, prefix = "", parentName = null) {
+  const MAX_DEPTH = 12;
   if (depth > MAX_DEPTH) return "";
   const type = node.type;
+  const name = getDisplayName(node);
   const isInteresting = INTERESTING_TYPES.has(type) || depth === 0;
+  const children = getNextInterestingNodes(node);
+  const isPassthrough = isInteresting && depth > 0 && (PASSTHROUGH_TYPES.has(type) && children.length > 0 || name !== null && name === parentName && children.length > 0);
   let result = "";
   let nextPrefix = prefix;
-  if (isInteresting) {
+  let nextDepth = depth;
+  let nextParentName = parentName;
+  if (isInteresting && !isPassthrough) {
     const startLine = node.startPosition.row + 1;
     const endLine = node.endPosition.row + 1;
-    const name = getDisplayName(node);
     const camelType = toCamelCase(type);
     const label = name ? `${camelType} [${name}]` : camelType;
     if (depth === 0) {
       result += `\u{1F4C1} ROOT (Lines: ${startLine}-${endLine})
 `;
+      nextPrefix = prefix;
     } else {
       result += `${prefix}${isLast ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 "}${label} (Lines: ${startLine}-${endLine})
 `;
       nextPrefix += isLast ? "    " : "\u2502   ";
     }
+    nextDepth = depth + 1;
+    nextParentName = name;
   }
-  const childrenToProcess = getNextInterestingNodes(node);
-  childrenToProcess.forEach((child, index) => {
-    const lastChild = index === childrenToProcess.length - 1;
-    result += traverse(child, depth + 1, lastChild, isInteresting ? nextPrefix : prefix);
+  children.forEach((child, index) => {
+    const isLastChildInLoop = index === children.length - 1;
+    const effectiveIsLast = isPassthrough ? isLast && isLastChildInLoop : isLastChildInLoop;
+    result += traverse(child, nextDepth, effectiveIsLast, nextPrefix, nextParentName);
   });
   return result;
 }
-var require2, TreeSitter, isParserInitialized, INTERESTING_TYPES, file_map;
+var require2, TreeSitter, isParserInitialized, INTERESTING_TYPES, PASSTHROUGH_TYPES, file_map;
 var init_file_map = __esm({
   "src/tools/file_map.js"() {
     init_parsers();
@@ -5682,15 +5729,21 @@ var init_file_map = __esm({
       "function_declaration",
       "method_definition",
       "arrow_function",
+      "function_expression",
       "if_statement",
+      "else_clause",
       "for_statement",
+      "for_in_statement",
+      "for_of_statement",
       "while_statement",
       "do_statement",
       "switch_statement",
       "try_statement",
-      "variable_declaration",
-      "lexical_declaration",
+      "catch_clause",
+      "variable_declarator",
       "export_statement",
+      "lexical_declaration",
+      "variable_declaration",
       "interface_declaration",
       "type_alias_declaration",
       "enum_declaration",
@@ -5705,6 +5758,8 @@ var init_file_map = __esm({
       "preproc_include",
       "method_declaration",
       "constructor_declaration",
+      "assignment_expression",
+      "pair",
       // C/C++
       "class_specifier",
       "struct_specifier",
@@ -5715,6 +5770,7 @@ var init_file_map = __esm({
       "script_element",
       "style_element"
     ]);
+    PASSTHROUGH_TYPES = /* @__PURE__ */ new Set(["export_statement", "lexical_declaration", "variable_declaration", "variable_declarator", "pair", "assignment_expression"]);
     file_map = async (args) => {
       let filePath;
       try {
@@ -5763,7 +5819,7 @@ var init_file_map = __esm({
         parser.setLanguage(Lang);
         const sourceCode = await fs18.readFile(absolutePath, "utf8");
         const tree = parser.parse(sourceCode);
-        const map = traverse(tree.rootNode);
+        const map = traverse(tree.rootNode, 0, true, " ");
         return `\u{1F4C4} File Map for: ${filePath}
 ${map}`;
       } catch (err) {
@@ -7938,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;
                     }
                   }
@@ -10636,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;
@@ -12535,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,7 +1,7 @@
 {
 	"name": "fluxflow-cli",
-	"version": "2.6.4",
-	"date": "2026-06-14",
+	"version": "2.6.6",
+	"date": "2026-06-15",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",