fluxflow-cli 1.8.9 → 1.8.11

package/TOOLS.md

@@ -14,6 +14,7 @@ Flux Flow provides a robust set of tools that allow the AI to interact with the
 | **View/Read Files** | ✅ | ❌ |
 | **Write/Update Files** | ✅ | ❌ |
 | **Execute Commands** | ✅ | ❌ |
+| **Search Keyword** | ✅ | ❌ |
 
 ---
 
@@ -37,6 +38,7 @@ Flux Flow provides a robust set of tools that allow the AI to interact with the
 - **`view_file`**: Reads the content of a file.
   - **Native Multimodality**: Supports analyzing images (JPG, PNG, WEBP) and PDF documents. The tool automatically detects binary formats and encodes them for AI analysis.
   - **Text Reading**: Supports specific line ranges (`start_line`, `end_line`) to manage context size efficiently.
+- **`search_keyword`**: Performs a global project search for a specific string or keyword. Returns file paths and line numbers where matches are found, making it essential for navigation and impact analysis.
 
 ### ✍️ Code Editing
 - **`write_file`**: Creates a new file or completely overwrites an existing one with new content.

package/dist/fluxflow.js

@@ -721,7 +721,7 @@ Prefer write_file tool to write code instead of chat by default.
     - DEV & FILE TOOLS ARE NOT AVAILABLE IN FLOW MODE. If you need to access files, tell the user to switch to FLUX MODE (manually by user).`.trim()}
 -----------------
 
-Results will be provided in the next loop as: [TOOL_RESULT]: [content]
+Results will be provided in the next loop as: [TOOL_RESULT]: [content] under <user> tag. Treat them as SYSTEM MESSAGES. True user messages will be prefixed as 'USER_PROMPT' by the system.
 WHEN CALLING TOOLS, YOU **MUST** end your response with '[turn: continue]'. NEVER use '[turn: finish]' in the same turn as a tool call. After receiving the [TOOL_RESULT], acknowledge the output and verify if the goal is met; only then may you use '[turn: finish]', otherwise use '[turn: continue]'.
 Do NOT over-use tools. Use them only when strictly necessary for the user's objective. You can stack multiple tool calls 1-by-1.
 Distinguish clearly between tool discussion and execution. Use the 'tool:' prefix ONLY when calling a function. When discussing tools with the user, refer to them by name as nouns (e.g., 'write_file', 'list_files') to avoid accidental triggers and context bloat. Even in your <think> ... </think> tags, do not use the 'tool:' prefix when planning to select a tool.
@@ -2430,7 +2430,7 @@ var init_terminal = __esm({
 import { GoogleGenAI, ThinkingLevel, HarmBlockThreshold, HarmCategory } from "@google/genai";
 import path16 from "path";
 import fs16 from "fs";
-var client, TERMINATION_SIGNAL, signalTermination, detectToolCalls, initAI, getAIStream;
+var client, TERMINATION_SIGNAL, signalTermination, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, getAIStream;
 var init_ai = __esm({
   "src/utils/ai.js"() {
     init_prompts();
@@ -2446,6 +2446,138 @@ var init_ai = __esm({
     signalTermination = () => {
       TERMINATION_SIGNAL = true;
     };
+    getActiveToolContext = (text) => {
+      const toolRegex = /(?:\[?\s*tool:functions\.)([a-z0-9_]+)\s*\(/gi;
+      let match;
+      while ((match = toolRegex.exec(text)) !== null) {
+        const startIdx = match.index + match[0].length - 1;
+        let balance = 0;
+        let inString = null;
+        let isEscaped = false;
+        let closed = false;
+        for (let i = startIdx; i < text.length; i++) {
+          const char = text[i];
+          if (!inString && (char === '"' || char === "'" || char === "`")) {
+            inString = char;
+            isEscaped = false;
+          } else if (inString && char === inString && !isEscaped) {
+            inString = null;
+          }
+          if (!inString) {
+            if (char === "(") balance++;
+            else if (char === ")") balance--;
+            if (balance === 0) {
+              closed = true;
+              toolRegex.lastIndex = i + 1;
+              break;
+            }
+          }
+          if (char === "\\") isEscaped = !isEscaped;
+          else isEscaped = false;
+        }
+        if (!closed) {
+          return { inside: true, toolName: match[1], startIndex: match.index };
+        }
+      }
+      return { inside: false };
+    };
+    getContextSafeText = (text, stripThoughts = true) => {
+      const toolRegex = /(?:\[?\s*tool:functions\.)([a-z0-9_]+)\s*\(/gi;
+      let result = "";
+      let lastIdx = 0;
+      let match;
+      while ((match = toolRegex.exec(text)) !== null) {
+        const before = text.substring(lastIdx, match.index);
+        result += stripThoughts ? before.replace(/<think>[\s\S]*?(?:<\/think>|$)/gi, "") : before;
+        const startIdx = match.index + match[0].length - 1;
+        let balance = 0;
+        let inString = null;
+        let isEscaped = false;
+        let endIdx = -1;
+        for (let i = startIdx; i < text.length; i++) {
+          const char = text[i];
+          if (!inString && (char === '"' || char === "'" || char === "`")) {
+            inString = char;
+            isEscaped = false;
+          } else if (inString && char === inString && !isEscaped) {
+            inString = null;
+          }
+          if (!inString) {
+            if (char === "(") balance++;
+            else if (char === ")") balance--;
+            if (balance === 0) {
+              endIdx = i;
+              break;
+            }
+          }
+          if (char === "\\") isEscaped = !isEscaped;
+          else isEscaped = false;
+        }
+        if (endIdx !== -1) {
+          result += "tool:functions." + match[1] + "()";
+          lastIdx = endIdx + 1;
+          toolRegex.lastIndex = lastIdx;
+        } else {
+          result += "tool:functions." + match[1] + "(";
+          lastIdx = text.length;
+          break;
+        }
+      }
+      if (lastIdx < text.length) {
+        result += stripThoughts ? text.substring(lastIdx).replace(/<think>[\s\S]*?(?:<\/think>|$)/gi, "") : text.substring(lastIdx);
+      }
+      return result;
+    };
+    contextSafeReplace = (text, regex, replacement) => {
+      const toolRegex = /(?:\[?\s*tool:functions\.)([a-z0-9_]+)\s*\(/gi;
+      let result = "";
+      let lastIdx = 0;
+      let match;
+      while ((match = toolRegex.exec(text)) !== null) {
+        const before = text.substring(lastIdx, match.index);
+        result += before.replace(regex, replacement);
+        const startIdx = match.index + match[0].length - 1;
+        let balance = 0;
+        let inString = null;
+        let isEscaped = false;
+        let endIdx = -1;
+        for (let i = startIdx; i < text.length; i++) {
+          const char = text[i];
+          if (!inString && (char === '"' || char === "'" || char === "`")) {
+            inString = char;
+            isEscaped = false;
+          } else if (inString && char === inString && !isEscaped) {
+            inString = null;
+          }
+          if (!inString) {
+            if (char === "(") balance++;
+            else if (char === ")") balance--;
+            if (balance === 0) {
+              endIdx = i;
+              break;
+            }
+          }
+          if (char === "\\") isEscaped = !isEscaped;
+          else isEscaped = false;
+        }
+        if (endIdx !== -1) {
+          result += text.substring(match.index, endIdx + 1);
+          lastIdx = endIdx + 1;
+          toolRegex.lastIndex = lastIdx;
+        } else {
+          result += text.substring(match.index);
+          lastIdx = text.length;
+          break;
+        }
+      }
+      if (lastIdx < text.length) {
+        result += text.substring(lastIdx).replace(regex, replacement);
+      }
+      return result;
+    };
+    getSanitizedText = (text) => {
+      return getContextSafeText(text, true);
+    };
     detectToolCalls = (text) => {
       const results = [];
       const toolRegex = /(?:\[?\s*tool:functions\.)([a-z0-9_]+)\s*\(/gi;
@@ -2550,22 +2682,34 @@ var init_ai = __esm({
             yield { type: "status", content: "Steering Hint Injected." };
           }
         }
-        yield { type: "turn_reset", content: true };
-        const contents = modifiedHistory.filter((msg) => (msg.role === "user" || msg.role === "agent" || msg.role === "system") && !String(msg.id).startsWith("welcome") && !msg.isMeta).map((msg) => {
-          const parts = [{ text: msg.text }];
-          if (msg.binaryPart) {
-            parts.push(msg.binaryPart);
-          }
-          return {
-            role: msg.role === "user" || msg.role === "system" ? "user" : "model",
-            parts
-          };
-        });
         let stream;
         let success = false;
         let retryCount = 0;
-        while (retryCount <= MAX_RETRIES && !success) {
+        let turnText = "";
+        let lastToolSniffed = null;
+        let lastToolEventTime = null;
+        let toolResults = [];
+        let toolCallPointer = 0;
+        let isThinkingLoop = false;
+        let isInitialAttempt = true;
+        let accumulatedContext = "";
+        while (retryCount <= MAX_RETRIES && !success && !TERMINATION_SIGNAL) {
           try {
+            if (isInitialAttempt) {
+              yield { type: "turn_reset", content: true };
+              isInitialAttempt = false;
+              accumulatedContext = "";
+            }
+            const contents = modifiedHistory.filter((msg) => (msg.role === "user" || msg.role === "agent" || msg.role === "system") && !String(msg.id).startsWith("welcome") && !msg.isMeta).map((msg) => {
+              const parts = [{ text: msg.text }];
+              if (msg.binaryPart) {
+                parts.push(msg.binaryPart);
+              }
+              return {
+                role: msg.role === "user" || msg.role === "system" ? "user" : "model",
+                parts
+              };
+            });
             if (!await checkQuota("agent", settings)) {
               throw new Error("Error: Daily Quota Exausted for Agent");
             }
@@ -2613,226 +2757,266 @@ var init_ai = __esm({
                 }
               }
             });
-            success = true;
+            turnText = "";
+            lastToolSniffed = null;
+            lastToolEventTime = null;
+            toolResults = [];
+            toolCallPointer = 0;
             yield { type: "model_update", content: null };
             yield { type: "status", content: "Working..." };
-          } catch (err) {
-            const errMsg = err.status || err.error && err.error.message || String(err);
-            const errLog = String(err);
-            const date = (/* @__PURE__ */ new Date()).toLocaleString();
-            const agentErrDir = path16.join(LOGS_DIR, "agent");
-            if (!fs16.existsSync(agentErrDir)) fs16.mkdirSync(agentErrDir, { recursive: true });
-            fs16.appendFileSync(path16.join(agentErrDir, "error.log"), `ERROR [${date}]: ${errLog}
-`);
-            if (retryCount < MAX_RETRIES) {
-              retryCount++;
-              const waitTime = Math.floor(Math.random() * (2e3 - 800 + 1)) + 800;
-              yield { type: "status", content: `Retrying (${retryCount}/${MAX_RETRIES + 1})...` };
-              await new Promise((resolve) => setTimeout(resolve, waitTime));
-            } else {
-              throw new Error(`Model cannot be reached: ${errMsg}. (Failed ${MAX_RETRIES + 1} times)`);
-            }
-          }
-        }
-        let turnText = "";
-        let lastToolSniffed = null;
-        let lastToolEventTime = null;
-        let toolResults = [];
-        let toolCallPointer = 0;
-        for await (const chunk of stream) {
-          if (TERMINATION_SIGNAL) break;
-          if (chunk.text) {
-            turnText += chunk.text;
-            yield { type: "text", content: chunk.text };
-            if (turnText.includes("tool:functions.")) {
-              if (!lastToolEventTime) lastToolEventTime = Date.now();
-              const parts = turnText.split("tool:functions.");
-              const potentialTool = parts[parts.length - 1].split("(")[0].trim();
-              if (potentialTool && /^[a-z_]+$/.test(potentialTool) && potentialTool !== lastToolSniffed) {
-                lastToolSniffed = potentialTool;
-                yield { type: "status", content: `Working (${potentialTool})...` };
+            let dedupeBuffer = "";
+            let isDedupeActive = accumulatedContext.length > 0;
+            for await (const chunk of stream) {
+              if (TERMINATION_SIGNAL) {
+                yield { type: "status", content: "Termination Signal Received." };
+                await new Promise((resolve) => setTimeout(resolve, 1500));
+                break;
               }
-            }
-            const thinkBlocks = turnText.match(/<think>([\s\S]*?)(?:<\/think>|$)/gi) || [];
-            const thinkContent = thinkBlocks.join("").trim();
-            const sentences = thinkContent.split(/[.!?]\s+/);
-            const uniqueSentences = new Set(sentences);
-            const repetitionRatio = sentences.length > 10 ? (sentences.length - uniqueSentences.size) / sentences.length : 0;
-            const wordCount = thinkContent.split(/\s+/).filter((w) => w.length > 0).length;
-            let repetitionThreshold = 0.4;
-            let isOverVerbose = wordCount > 2500;
-            if (repetitionRatio > repetitionThreshold || isOverVerbose) {
-              const reason = repetitionRatio > repetitionThreshold ? "Circular Thinking Detected" : "Rambling Detected";
-              yield { type: "status", content: `${reason}. Re-centering...` };
-              await new Promise((resolve) => setTimeout(resolve, 3e3));
-              break;
-            }
-            const allToolsFound = detectToolCalls(turnText);
-            while (allToolsFound.length > toolCallPointer) {
-              const toolCall = allToolsFound[toolCallPointer];
-              yield { type: "status", content: `Working (${toolCall.toolName})...` };
-              let label = "";
-              if (toolCall.toolName === "web_search") {
-                const { query, limit = 10 } = parseArgs(toolCall.args);
-                label = `\u{1F50D} SEARCHING: "${query}" (${limit})`.toUpperCase();
-              } else if (toolCall.toolName === "web_scrape") {
-                const url = parseArgs(toolCall.args).url || "...";
-                label = `\u{1F4D6} READING SITE: ${url}`.toUpperCase();
-              } else if (toolCall.toolName === "view_file") {
-                const { path: targetPath2, StartLine, EndLine, start_line, end_line } = parseArgs(toolCall.args);
-                const rawStart = StartLine || start_line;
-                const rawEnd = EndLine || end_line;
-                const sLine = parseInt(rawStart) || 1;
-                const eLine = parseInt(rawEnd) || (rawStart ? sLine + 800 : 800);
-                let totalLines = "...";
-                let actualEndLine = eLine;
-                try {
-                  const absPath = path16.resolve(process.cwd(), targetPath2);
-                  if (fs16.existsSync(absPath)) {
-                    const content = fs16.readFileSync(absPath, "utf8");
-                    const lines = content.split("\n").length;
-                    totalLines = lines;
-                    actualEndLine = Math.min(eLine, lines);
+              if (chunk.text) {
+                if (isDedupeActive) {
+                  dedupeBuffer += chunk.text;
+                  if (dedupeBuffer.length >= accumulatedContext.length) {
+                    if (dedupeBuffer.startsWith(accumulatedContext)) {
+                      const newText = dedupeBuffer.substring(accumulatedContext.length);
+                      if (newText) {
+                        turnText += newText;
+                        yield { type: "text", content: newText };
+                      }
+                      isDedupeActive = false;
+                    } else {
+                      turnText += dedupeBuffer;
+                      yield { type: "text", content: dedupeBuffer };
+                      isDedupeActive = false;
+                    }
                   }
-                } catch (e) {
-                }
-                const pathLower = targetPath2.toLowerCase();
-                const isPdf = pathLower.endsWith(".pdf");
-                const isImage = /\.(png|jpg|jpeg|webp|gif|bmp)$/.test(pathLower);
-                if (isPdf) {
-                  label = `\u{1F4C4} ANALYZING PDF: ${targetPath2}`.toUpperCase();
-                } else if (isImage) {
-                  label = `\u{1F4F8} ANALYZING IMAGE: ${targetPath2}`.toUpperCase();
                 } else {
-                  label = `\u{1F4C4} READING FILE: ${targetPath2}. LINES ${sLine} - ${actualEndLine} FROM ${totalLines}`.toUpperCase();
+                  turnText += chunk.text;
+                  yield { type: "text", content: chunk.text };
                 }
-              } else if (toolCall.toolName === "list_files" || toolCall.toolName === "read_folder") {
-                const action = toolCall.toolName === "list_files" ? "LISTING" : "DISCOVERING";
-                label = `\u{1F4C2} ${action} DIRECTORY: ${parseArgs(toolCall.args).path || "."}`.toUpperCase();
-              } else if (toolCall.toolName === "write_file" || toolCall.toolName === "update_file") {
-                const action = toolCall.toolName === "write_file" ? "WRITING" : "PATCHING";
-                label = `\u{1F4BE} ${action} FILE: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
-              } else if (toolCall.toolName === "write_pdf") {
-                label = `\u{1F4D1} GENERATING PDF: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
-              } else if (toolCall.toolName === "write_docx") {
-                label = `\u{1F4DD} GENERATING DOCX: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
-              } else if (toolCall.toolName === "write_pptx") {
-                label = `\u{1F4CA} GENERATING PPTX: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
-              } else if (toolCall.toolName === "search_keyword") {
-                const { keyword } = parseArgs(toolCall.args);
-                label = `\u{1F50E} SEARCHING KEYWORD: "${keyword}"`.toUpperCase();
-              } else if (toolCall.toolName === "exec_command" || toolCall.toolName === "ask") {
-                label = "";
-              } else {
-                label = `EXECUTING ${toolCall.toolName}`.toUpperCase();
-              }
-              if (label) {
-                const boxWidth = Math.min(label.length + 4, 115);
-                const boxTop = `\u256D${"\u2500".repeat(boxWidth)}\u256E`;
-                const boxMid = `\u2502 ${label.padEnd(boxWidth - 2).substring(0, boxWidth - 2)} \u2502`;
-                const boxBottom = `\u2570${"\u2500".repeat(boxWidth)}\u256F`;
-                yield { type: "visual_feedback", content: `
+                const signalSafeText2 = getSanitizedText(turnText);
+                const toolContext = getActiveToolContext(turnText);
+                if (toolContext.inside) {
+                  if (!lastToolEventTime) lastToolEventTime = Date.now();
+                  const potentialTool = toolContext.toolName;
+                  if (potentialTool && /^[a-z_]+$/.test(potentialTool) && potentialTool !== lastToolSniffed) {
+                    lastToolSniffed = potentialTool;
+                    yield { type: "status", content: `Working (${potentialTool})...` };
+                  }
+                }
+                const contextSafeText = getContextSafeText(turnText, false);
+                const thinkBlocks = contextSafeText.match(/<think>([\s\S]*?)(?:<\/think>|$)/gi) || [];
+                const thinkContent = thinkBlocks.join("").trim();
+                const sentences = thinkContent.split(/[.!?]\s+/);
+                const uniqueSentences = new Set(sentences);
+                const repetitionRatio = sentences.length > 10 ? (sentences.length - uniqueSentences.size) / sentences.length : 0;
+                const wordCount = thinkContent.split(/\s+/).filter((w) => w.length > 0).length;
+                let repetitionThreshold = 0.4;
+                let isOverVerbose = wordCount > 2500;
+                if (repetitionRatio > repetitionThreshold || isOverVerbose) {
+                  const reason = repetitionRatio > repetitionThreshold ? "Thinking Loop Detected" : "Rambling Detected";
+                  yield { type: "status", content: `${reason}. Re-centering...` };
+                  isThinkingLoop = true;
+                  await new Promise((resolve) => setTimeout(resolve, 3e3));
+                  break;
+                }
+                const toolActionableText = turnText.replace(/<think>[\s\S]*?(?:<\/think>|$)/gi, "");
+                const allToolsFound = detectToolCalls(toolActionableText);
+                while (allToolsFound.length > toolCallPointer) {
+                  const toolCall = allToolsFound[toolCallPointer];
+                  yield { type: "status", content: `Working (${toolCall.toolName})...` };
+                  let label = "";
+                  if (toolCall.toolName === "web_search") {
+                    const { query, limit = 10 } = parseArgs(toolCall.args);
+                    label = `\u{1F50D} SEARCHING: "${query}" (${limit})`.toUpperCase();
+                  } else if (toolCall.toolName === "web_scrape") {
+                    const url = parseArgs(toolCall.args).url || "...";
+                    label = `\u{1F4D6} READING SITE: ${url}`.toUpperCase();
+                  } else if (toolCall.toolName === "view_file") {
+                    const { path: targetPath2, StartLine, EndLine, start_line, end_line } = parseArgs(toolCall.args);
+                    const rawStart = StartLine || start_line;
+                    const rawEnd = EndLine || end_line;
+                    const sLine = parseInt(rawStart) || 1;
+                    const eLine = parseInt(rawEnd) || (rawStart ? sLine + 800 : 800);
+                    let totalLines = "...";
+                    let actualEndLine = eLine;
+                    try {
+                      const absPath = path16.resolve(process.cwd(), targetPath2);
+                      if (fs16.existsSync(absPath)) {
+                        const content = fs16.readFileSync(absPath, "utf8");
+                        const lines = content.split("\n").length;
+                        totalLines = lines;
+                        actualEndLine = Math.min(eLine, lines);
+                      }
+                    } catch (e) {
+                    }
+                    const pathLower = targetPath2.toLowerCase();
+                    const isPdf = pathLower.endsWith(".pdf");
+                    const isImage = /\.(png|jpg|jpeg|webp|gif|bmp)$/.test(pathLower);
+                    if (isPdf) {
+                      label = `\u{1F4C4} ANALYZING PDF: ${targetPath2}`.toUpperCase();
+                    } else if (isImage) {
+                      label = `\u{1F4F8} ANALYZING IMAGE: ${targetPath2}`.toUpperCase();
+                    } else {
+                      label = `\u{1F4C4} READING FILE: ${targetPath2}. LINES ${sLine} - ${actualEndLine} FROM ${totalLines}`.toUpperCase();
+                    }
+                  } else if (toolCall.toolName === "list_files" || toolCall.toolName === "read_folder") {
+                    const action = toolCall.toolName === "list_files" ? "LISTING" : "DISCOVERING";
+                    label = `\u{1F4C2} ${action} DIRECTORY: ${parseArgs(toolCall.args).path || "."}`.toUpperCase();
+                  } else if (toolCall.toolName === "write_file" || toolCall.toolName === "update_file") {
+                    const action = toolCall.toolName === "write_file" ? "WRITING" : "PATCHING";
+                    label = `\u{1F4BE} ${action} FILE: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
+                  } else if (toolCall.toolName === "write_pdf") {
+                    label = `\u{1F4D1} GENERATING PDF: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
+                  } else if (toolCall.toolName === "write_docx") {
+                    label = `\u{1F4DD} GENERATING DOCX: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
+                  } else if (toolCall.toolName === "write_pptx") {
+                    label = `\u{1F4CA} GENERATING PPTX: ${parseArgs(toolCall.args).path || "..."}`.toUpperCase();
+                  } else if (toolCall.toolName === "search_keyword") {
+                    const { keyword } = parseArgs(toolCall.args);
+                    label = `\u{1F50E} SEARCHING KEYWORD: "${keyword}"`.toUpperCase();
+                  } else if (toolCall.toolName === "exec_command" || toolCall.toolName === "ask") {
+                    label = "";
+                  } else {
+                    label = `EXECUTING ${toolCall.toolName}`.toUpperCase();
+                  }
+                  if (label) {
+                    const boxWidth = Math.min(label.length + 4, 115);
+                    const boxTop = `\u256D${"\u2500".repeat(boxWidth)}\u256E`;
+                    const boxMid = `\u2502 ${label.padEnd(boxWidth - 2).substring(0, boxWidth - 2)} \u2502`;
+                    const boxBottom = `\u2570${"\u2500".repeat(boxWidth)}\u256F`;
+                    yield { type: "visual_feedback", content: `
 
 ${boxTop}
 ${boxMid}
 ${boxBottom}
 ` };
-              }
-              if (toolCall.toolName === "exec_command") {
-                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 = 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);
-                      return driveMatch && driveMatch[0].toLowerCase() !== currentDrive;
+                  }
+                  if (toolCall.toolName === "exec_command") {
+                    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 = 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);
+                          return driveMatch && driveMatch[0].toLowerCase() !== currentDrive;
+                        }
+                        return pattern.test(command);
+                      });
+                      if (isViolating) {
+                        const denyMsg = `Access Denied. Terminal is prohibited from accessing system drives (C://) or external directories while "External Workspace Access" is disabled.`;
+                        toolResults.push({ role: "user", text: `[TOOL_RESULT]: ERROR: ${denyMsg}` });
+                        yield { type: "tool_result", content: `[TOOL_RESULT]: ERROR: ${denyMsg}` };
+                        toolCallPointer++;
+                        continue;
+                      }
+                    }
+                    if (settings.onExecStart) settings.onExecStart(command || "Unknown");
+                    yield { type: "exec_start" };
+                  }
+                  const parsedArgs = parseArgs(toolCall.args);
+                  const targetPath = parsedArgs.path || parsedArgs.targetPath || null;
+                  if (targetPath) {
+                    const isExternalOff = settings.systemSettings && settings.systemSettings.allowExternalAccess === false;
+                    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. To enable this, ask the user to turn on "External Workspace Access" in /settings.`;
+                      toolResults.push({ role: "user", text: `[TOOL_RESULT]: ERROR: ${denyMsg}` });
+                      yield { type: "tool_result", content: `[TOOL_RESULT]: ERROR: ${denyMsg}` };
+                      toolCallPointer++;
+                      continue;
                     }
-                    return pattern.test(command);
+                  }
+                  if (settings.onToolApproval) {
+                    let shouldPrompt = toolCall.toolName === "write_file" || toolCall.toolName === "update_file" || toolCall.toolName === "exec_command";
+                    if (shouldPrompt) {
+                      const approval = await settings.onToolApproval(toolCall.toolName, toolCall.args);
+                      if (approval === "deny") {
+                        if (toolCall.toolName === "exec_command" && settings.onExecEnd) settings.onExecEnd();
+                        const denyMsg = `Permission Denied: User rejected the ${toolCall.toolName === "exec_command" ? "terminal execution" : "file edit"}.`;
+                        toolResults.push({ role: "user", text: `[TOOL_RESULT]: ERROR: ${denyMsg}` });
+                        yield { type: "tool_result", content: `[TOOL_RESULT]: ERROR: ${denyMsg}` };
+                        toolCallPointer++;
+                        continue;
+                      }
+                    }
+                  }
+                  const effectiveStart = lastToolEventTime || Date.now();
+                  let result = await dispatchTool(toolCall.toolName, toolCall.args, {
+                    chatId,
+                    history,
+                    onChunk: (chunk2) => settings.onExecChunk ? settings.onExecChunk(chunk2) : null,
+                    onAskUser: settings.onAskUser
                   });
-                  if (isViolating) {
-                    const denyMsg = `Access Denied. Terminal is prohibited from accessing system drives (C://) or external directories while "External Workspace Access" is disabled.`;
-                    toolResults.push({ role: "user", text: `[TOOL_RESULT]: ERROR: ${denyMsg}` });
-                    yield { type: "tool_result", content: `[TOOL_RESULT]: ERROR: ${denyMsg}` };
-                    toolCallPointer++;
-                    continue;
+                  const toolEnd = Date.now();
+                  yield { type: "tool_time", content: toolEnd - effectiveStart };
+                  lastToolEventTime = toolEnd;
+                  let binaryPart = null;
+                  if (typeof result === "object" && result.binaryPart) {
+                    binaryPart = result.binaryPart;
+                    result = result.text;
                   }
-                }
-                if (settings.onExecStart) settings.onExecStart(command || "Unknown");
-                yield { type: "exec_start" };
-              }
-              const parsedArgs = parseArgs(toolCall.args);
-              const targetPath = parsedArgs.path || parsedArgs.targetPath || null;
-              if (targetPath) {
-                const isExternalOff = settings.systemSettings && settings.systemSettings.allowExternalAccess === false;
-                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. To enable this, ask the user to turn on "External Workspace Access" in /settings.`;
-                  toolResults.push({ role: "user", text: `[TOOL_RESULT]: ERROR: ${denyMsg}` });
-                  yield { type: "tool_result", content: `[TOOL_RESULT]: ERROR: ${denyMsg}` };
-                  toolCallPointer++;
-                  continue;
-                }
-              }
-              if (settings.onToolApproval) {
-                let shouldPrompt = toolCall.toolName === "write_file" || toolCall.toolName === "update_file" || toolCall.toolName === "exec_command";
-                if (shouldPrompt) {
-                  const approval = await settings.onToolApproval(toolCall.toolName, toolCall.args);
-                  if (approval === "deny") {
-                    if (toolCall.toolName === "exec_command" && settings.onExecEnd) settings.onExecEnd();
-                    const denyMsg = `Permission Denied: User rejected the ${toolCall.toolName === "exec_command" ? "terminal execution" : "file edit"}.`;
-                    toolResults.push({ role: "user", text: `[TOOL_RESULT]: ERROR: ${denyMsg}` });
-                    yield { type: "tool_result", content: `[TOOL_RESULT]: ERROR: ${denyMsg}` };
-                    toolCallPointer++;
-                    continue;
+                  if (toolCall.toolName === "exec_command" && settings.onExecEnd) {
+                    await new Promise((resolve) => setTimeout(resolve, 800));
+                    settings.onExecEnd();
+                  }
+                  const isSuccess = result && !result.startsWith("ERROR:");
+                  if (isSuccess) {
+                    await incrementUsage("toolSuccess");
+                    if (settings.onToolResult) settings.onToolResult("success");
+                  } else {
+                    await incrementUsage("toolFailure");
+                    if (settings.onToolResult) settings.onToolResult("failure");
+                  }
+                  const aiContent = `[TOOL_RESULT]: ${result.split(/\r?\n/).filter((line) => !line.includes("[UI_CONTEXT]")).join("\n")}`;
+                  toolResults.push({ role: "user", text: aiContent, binaryPart });
+                  let uiContent = `[TOOL_RESULT]: ${result}`;
+                  if (toolCall.toolName === "view_file" || toolCall.toolName === "web_scrape") {
+                    uiContent = `[TOOL_RESULT]: ${label} (Context Locked for UI Clarity)`;
                   }
+                  yield { type: "tool_result", content: uiContent, aiContent, binaryPart, toolName: toolCall.toolName };
+                  if (toolCall.toolName === "memory" && result.includes("SUCCESS")) yield { type: "memory_updated" };
+                  toolCallPointer++;
                 }
               }
-              const effectiveStart = lastToolEventTime || Date.now();
-              let result = await dispatchTool(toolCall.toolName, toolCall.args, {
-                chatId,
-                history,
-                onChunk: (chunk2) => settings.onExecChunk ? settings.onExecChunk(chunk2) : null,
-                onAskUser: settings.onAskUser
-              });
-              const toolEnd = Date.now();
-              yield { type: "tool_time", content: toolEnd - effectiveStart };
-              lastToolEventTime = toolEnd;
-              let binaryPart = null;
-              if (typeof result === "object" && result.binaryPart) {
-                binaryPart = result.binaryPart;
-                result = result.text;
-              }
-              if (toolCall.toolName === "exec_command" && settings.onExecEnd) {
-                await new Promise((resolve) => setTimeout(resolve, 800));
-                settings.onExecEnd();
+              lastUsage = chunk.usageMetadata;
+              if (lastUsage) {
+                yield { type: "liveTokens", content: lastUsage.totalTokenCount };
               }
-              const isSuccess = result && !result.startsWith("ERROR:");
-              if (isSuccess) {
-                await incrementUsage("toolSuccess");
-                if (settings.onToolResult) settings.onToolResult("success");
+            }
+            if (TERMINATION_SIGNAL) break;
+            success = true;
+            await incrementUsage("agent");
+          } catch (err) {
+            const errMsg = err.status || err.error && err.error.message || String(err);
+            const errLog = String(err);
+            const date = (/* @__PURE__ */ new Date()).toLocaleString();
+            const agentErrDir = path16.join(LOGS_DIR, "agent");
+            if (!fs16.existsSync(agentErrDir)) fs16.mkdirSync(agentErrDir, { recursive: true });
+            fs16.appendFileSync(path16.join(agentErrDir, "error.log"), `ERROR [${date}]: ${errLog}
+`);
+            if (retryCount < MAX_RETRIES) {
+              retryCount++;
+              const waitTime = Math.floor(Math.random() * (2e3 - 800 + 1)) + 800;
+              if (turnText.trim().length > 0) {
+                modifiedHistory.push({ role: "agent", text: turnText });
+                if (toolResults.length > 0) {
+                  toolResults.forEach((tr) => modifiedHistory.push(tr));
+                }
+                modifiedHistory.push({ role: "user", text: "[SYSTEM] Response got cut for internal error, continue from checkpoint seamlessly and DON'T repeat what you already said!" });
+                accumulatedContext += turnText;
+                yield { type: "status", content: `Recovering & Continuing (${retryCount}/${MAX_RETRIES + 1})...` };
               } else {
-                await incrementUsage("toolFailure");
-                if (settings.onToolResult) settings.onToolResult("failure");
+                isInitialAttempt = true;
+                yield { type: "status", content: `Retrying (${retryCount}/${MAX_RETRIES + 1})...` };
               }
-              const aiContent = `[TOOL_RESULT]: ${result.split(/\r?\n/).filter((line) => !line.includes("[UI_CONTEXT]")).join("\n")}`;
-              toolResults.push({ role: "user", text: aiContent, binaryPart });
-              let uiContent = `[TOOL_RESULT]: ${result}`;
-              if (toolCall.toolName === "view_file" || toolCall.toolName === "web_scrape") {
-                uiContent = `[TOOL_RESULT]: ${label} (Context Locked for UI Clarity)`;
-              }
-              yield { type: "tool_result", content: uiContent, aiContent, binaryPart, toolName: toolCall.toolName };
-              if (toolCall.toolName === "memory" && result.includes("SUCCESS")) yield { type: "memory_updated" };
-              toolCallPointer++;
+              await new Promise((resolve) => setTimeout(resolve, waitTime));
+            } else {
+              throw new Error(`Model cannot be reached: ${errMsg}. (Failed ${MAX_RETRIES + 1} times)`);
             }
           }
-          lastUsage = chunk.usageMetadata;
-          if (lastUsage) {
-            yield { type: "liveTokens", content: lastUsage.totalTokenCount };
-          }
         }
-        await incrementUsage("agent");
         if (lastUsage) {
           await addToUsage("tokens", lastUsage.totalTokenCount || 0);
           yield { type: "usage", content: lastUsage };
@@ -2843,10 +3027,11 @@ ${boxBottom}
         if (thinkMatch) {
           textToProcess = turnText.replace(/<think>[\s\S]*?<\/think>/i, "");
         }
-        const hasFinish = /\[\s*(turn\s*:)?\s*finish\s*\]/i.test(turnText.toLowerCase());
+        const signalSafeText = getSanitizedText(turnText);
+        const hasFinish = /\[\s*(turn\s*:)?\s*finish\s*\]/i.test(signalSafeText.toLowerCase());
         const shouldContinue = toolCallPointer > 0;
         yield { type: "status", content: "Working..." };
-        const cleanedTurnText = turnText.replace(/\[\s*(turn\s*:)?\s*(continue|finish)\s*\]/gi, "").trim();
+        const cleanedTurnText = contextSafeReplace(turnText, /\[\s*(turn\s*:)?\s*(continue|finish)\s*\]/gi, "").trim();
         let isActuallyFinished = hasFinish && !shouldContinue;
         if (isActuallyFinished) {
           yield { type: "status", content: "Finalizing..." };
@@ -2956,7 +3141,8 @@ ${timestamp}`;
         if (toolResults.length > 0) {
           toolResults.forEach((tr) => modifiedHistory.push(tr));
         } else {
-          modifiedHistory.push({ role: "user", text: "[SYSTEM]: LOOP DETECTED by Internal System. If you have finished your task use [turn: finish] else continue." });
+          modifiedHistory.push({ role: "user", text: `[SYSTEM]: ${isThinkingLoop ? "OVER-THINKING " : ""}LOOP DETECTED by Internal System. ${isThinkingLoop ? "If you have planned the task, prioritize the execution/output. " : "If you have finished your task use [turn: finish] else continue."}` });
+          isThinkingLoop = false;
         }
       }
       yield { type: "status", content: null };
@@ -4641,7 +4827,7 @@ Selection: ${val}`,
           }
         ));
       case "approval":
-        return /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 2, paddingY: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { color: "yellow", bold: true, underline: true }, "\u{1F6E1}\uFE0F SECURITY GATE: FILE WRITE PERMISSION"), /* @__PURE__ */ React10.createElement(Text10, { marginTop: 1 }, "The agent is attempting to modify: ", /* @__PURE__ */ React10.createElement(Text10, { color: "cyan" }, parseArgs(pendingApproval?.args || "{}").path || "Unknown File")), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1, borderStyle: "single", borderColor: "#333", paddingX: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text10, { color: "gray" }, "--- PROPOSED CONTENT / DIFF ---"), (() => {
+        return /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 2, paddingY: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { color: "yellow", bold: true, underline: true }, "\u{1F510} SECURITY GATE: FILE WRITE PERMISSION"), /* @__PURE__ */ React10.createElement(Text10, { marginTop: 1 }, "The agent is attempting to modify: ", /* @__PURE__ */ React10.createElement(Text10, { color: "cyan" }, parseArgs(pendingApproval?.args || "{}").path || "Unknown File")), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1, borderStyle: "single", borderColor: "#333", paddingX: 1, flexDirection: "column" }, /* @__PURE__ */ React10.createElement(Text10, { color: "gray" }, "--- PROPOSED CONTENT / DIFF ---"), (() => {
           const args = parseArgs(pendingApproval?.args || "{}");
           const oldVal = args.TargetContent || args.content_to_replace || null;
           const newVal = args.content || args.ReplacementContent || args.content_to_add || args.replacementContent || null;
@@ -4655,7 +4841,7 @@ Selection: ${val}`,
             title: "Action Required",
             items: [
               { label: "\u2705 Accept this time", value: "allow" },
-              { label: "\u{1F6E1}\uFE0F Accept for this session", value: "always" },
+              { label: "\u{1F510} Accept for this session", value: "always" },
               { label: "\u274C Don't accept", value: "deny" }
             ],
             onSelect: (item) => {
@@ -4731,7 +4917,7 @@ Selection: ${val}`,
           }
         );
       case "terminalApproval":
-        return /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 2, paddingY: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { color: "red", bold: true, underline: true }, "\u{1F6E1}\uFE0F SECURITY GATE: TERMINAL COMMAND OVERSIGHT"), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, null, "Agent requested to run: ", /* @__PURE__ */ React10.createElement(Text10, { color: "yellow", bold: true }, parseArgs(pendingApproval?.args || "{}").command || "Unknown Command"))), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(
+        return /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "red", paddingX: 2, paddingY: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { color: "red", bold: true, underline: true }, "\u{1F510} SECURITY GATE: TERMINAL COMMAND OVERSIGHT"), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, null, "Agent requested to run: ", /* @__PURE__ */ React10.createElement(Text10, { color: "yellow", bold: true }, parseArgs(pendingApproval?.args || "{}").command || "Unknown Command"))), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(
           CommandMenu,
           {
             title: "Risk Assessment Required",
@@ -4869,8 +5055,8 @@ var init_app = __esm({
     init_text();
     SESSION_START_TIME = Date.now();
     CHANGELOG_URL = "https://fluxflow-cli.onrender.com/changelog.html";
-    versionFluxflow = "1.8.9";
-    updatedOn = "2026-05-08";
+    versionFluxflow = "1.8.11";
+    updatedOn = "2026-05-09";
     ResolutionModal = ({ data, onResolve, onEdit }) => /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "magenta", paddingX: 2, paddingY: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { color: "magenta", bold: true, underline: true }, "\u{1F7E3} STEERING HINT RESOLUTION"), /* @__PURE__ */ React10.createElement(Text10, { marginTop: 1 }, "The agent already finished the task before your hint was consumed."), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1, backgroundColor: "#222", paddingX: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { italic: true, color: "gray" }, '"', data, '"')), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, { color: "cyan" }, "How would you like to proceed?")), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(
       CommandMenu,
       {

package/package.json

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