fluxflow-cli 1.8.32 → 1.8.33

package/dist/fluxflow.js

@@ -173,7 +173,7 @@ var init_ChatLayout = __esm({
           }
         }
       }
-      return result.replace(/^\[TOOL_RESULT\]:\s*/gi, "").split("\n").filter((line) => !line.trim().startsWith("SUCCESS:") && !line.trim().startsWith("ERROR:")).join("\n").replace(/\[\s*(turn\s*:)?\s*(continue|finish)\s*\]/gi, "").replace(/\[\s*(turn\s*:)?\s*(continue|finish)?\s*$/gi, "").replace(/\n\s*turn\s*:\s*(continue|finish)\s*$/gi, "").replace(/\n\nResponded on .*/g, "").replace(/\n\n\[Prompted on: .*\]/g, "").replace(/(\$?\\?\/?\\rightarrow\$?|\$\\rightarrow\$)/gi, "\u2192").replace(/(\$?\\?\/?\\leftarrow\$?|\$\\leftarrow\$)/gi, "\u2190").replace(/(\$?\\?\/?\\uparrow\$?|\$\\uparrow\$)/gi, "\u2191").replace(/(\$?\\?\/?\\downarrow\$?|\$\\downarrow\$)/gi, "\u2193").replace(/(\$?\\?\/?\\leftrightarrow\$?|\$\\leftrightarrow\$)/gi, "\u2194").replace(/\[\/n\]/g, "\\\\n").trim();
+      return result.replace(/^\[TOOL_RESULT\]:\s*/gi, "").split("\n").filter((line) => !line.trim().startsWith("SUCCESS:") && !line.trim().startsWith("ERROR:")).join("\n").replace(/\[\s*(turn\s*:)?\s*(continue|finish)\s*\]/gi, "").replace(/\[\s*(turn\s*:)?\s*(continue|finish)?\s*$/gi, "").replace(/\n\s*turn\s*:\s*(continue|finish)\s*$/gi, "").replace(/\n\nResponded on .*/g, "").replace(/\n\n\[Prompted on: .*\]/g, "").replace(/(\$?\\?\/?\\rightarrow\$?|\$\\rightarrow\$)/gi, "\u2192").replace(/(\$?\\?\/?\\leftarrow\$?|\$\\leftarrow\$)/gi, "\u2190").replace(/(\$?\\?\/?\\uparrow\$?|\$\\uparrow\$)/gi, "\u2191").replace(/(\$?\\?\/?\\downarrow\$?|\$\\downarrow\$)/gi, "\u2193").replace(/(\$?\\?\/?\\leftrightarrow\$?|\$\\leftrightarrow\$)/gi, "\u2194").replace(/\[\/n\]?/g, "\\\\n").trim();
     };
     formatThinkText = (cleaned, columns = 80) => {
       if (!cleaned) return null;
@@ -1805,7 +1805,7 @@ ${lines.map((l, i) => `${i + 1} | ${l}`).join("\n")}
           fs10.mkdirSync(parentDir, { recursive: true });
         }
         const strip = (t) => t.replace(/^```[\w]*\n?/, "").replace(/```\s*$/, "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-        const processedContent = strip(content).replace(/\\n/g, "\n").replace(/\[\/n\]/g, "\\n");
+        const processedContent = strip(content).replace(/\\n/g, "\n").replace(/\[\/n\]?/g, "\\n");
         const lineCount = processedContent.split(/\r?\n/).length;
         const originalSize = Buffer.byteLength(processedContent, "utf8");
         fs10.writeFileSync(absolutePath, processedContent, "utf8");
@@ -1858,7 +1858,7 @@ var init_update_file = __esm({
       if (content_to_add === void 0) return 'ERROR: Missing "content_to_add" argument.';
       const strip = (t) => t.replace(/^```[\w]*\n?/, "").replace(/```\s*$/, "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
       const unescapeContent = (content) => {
-        return content.replace(/\\n/g, "\n").replace(/\[\/n\]/g, "\\n");
+        return content.replace(/\\n/g, "\n").replace(/\[\/n\]?/g, "\\n");
       };
       content_to_replace = unescapeContent(strip(content_to_replace));
       content_to_add = unescapeContent(strip(content_to_add));
@@ -2529,7 +2529,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, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, getAIStream;
+var client, TERMINATION_SIGNAL, signalTermination, TOOL_LABELS, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, getAIStream;
 var init_ai = __esm({
   "src/utils/ai.js"() {
     init_prompts();
@@ -2545,6 +2545,27 @@ var init_ai = __esm({
     signalTermination = () => {
       TERMINATION_SIGNAL = true;
     };
+    TOOL_LABELS = {
+      "write_file": "Writing File",
+      "update_file": "Updating File",
+      "read_folder": "Listing Directory",
+      "view_file": "Reading File",
+      "exec_command": "Running Command",
+      "web_search": "Searching Web",
+      "web_scrape": "Reading Site",
+      "memory": "Updating Memory",
+      "search_keyword": "Finding Files",
+      "ask": "Asking User"
+    };
+    getToolDetail = (toolName, argsStr) => {
+      try {
+        const pArgs = parseArgs(argsStr);
+        const filePath = pArgs.path || pArgs.targetFile || pArgs.TargetFile || pArgs.directory;
+        return filePath ? path16.basename(filePath.replace(/[\\"]/g, "")) : null;
+      } catch (e) {
+        return null;
+      }
+    };
     runJanitorTask = async (settings, agentText, fullAgentTextRaw, history, callbacks = {}) => {
       const { onStatus, onMemoryUpdated, onBackgroundIncrement } = callbacks;
       const { profile, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats } = settings;
@@ -2706,7 +2727,7 @@ DEBUG [${date}]: ${finalSynthesis}
           else isEscaped = false;
         }
         if (!closed) {
-          return { inside: true, toolName: match[1], startIndex: match.index };
+          return { inside: true, toolName: match[1], startIndex: match.index, args: text.substring(match.index + match[0].length) };
         }
       }
       return { inside: false };
@@ -2884,14 +2905,14 @@ DEBUG [${date}]: ${finalSynthesis}
       const agentText = originalText.replace(/\[TITLE-UPDATE\]/g, "").trim();
       let modifiedHistory = [...history.slice(0, -1)];
       if (systemSettings?.compression === 0 && (sessionStats?.tokens || 0) > 254e3) {
-        modifiedHistory = getTruncatedHistory(modifiedHistory, 4);
+        modifiedHistory = getTruncatedHistory(modifiedHistory, 6);
       }
       const tempStorage = readEncryptedJson(TEMP_MEM_FILE, {});
       const otherMemories = Object.entries(tempStorage).filter(([id]) => id !== chatId).flatMap(([_, mems]) => mems).map((mem) => `- ${mem}`).join("\n");
       const persistentStorage = readEncryptedJson(MEMORIES_FILE, []);
       const mainUserMemories = persistentStorage.map((m) => `- ${m.memory}`).join("\n");
       const janitorUserMemories = persistentStorage.map((m) => `- [${m.id}]: ${m.memory}`).join("\n");
-      const firstUserMsg = `[SYSTEM] MUST FOLLOW THINKING${mode === "Flux" ? ", NEWLINE, QUOTE ESCAPE" : ""} POLICY AS HIGH PRIORITY FOR THIS PROMPT. DO NOT FORGET.
+      const firstUserMsg = `[SYSTEM] **MUST FOLLOW THINKING${mode === "Flux" ? ", NEWLINE, QUOTE ESCAPE" : ""} POLICY AS HIGHEST PRIORITY**.
 
 USER_PROMPT: "${agentText}"`.trim();
       modifiedHistory.push({ role: "user", text: firstUserMsg });
@@ -2934,6 +2955,7 @@ USER_PROMPT: "${agentText}"`.trim();
         let inStreamRetryCount = 1;
         let turnText = "";
         let lastToolSniffed = null;
+        let lastToolDetail = null;
         let lastToolEventTime = null;
         let toolResults = [];
         let toolCallPointer = 0;
@@ -2974,12 +2996,21 @@ USER_PROMPT: "${agentText}"`.trim();
             }
             const isContext32k = (sessionStats.tokens || 0) >= 32e3;
             const currentSystemInstruction = getSystemInstruction(profile, thinkingLevel, mode, systemSettings, otherMemories, mainUserMemories, isMemoryEnabled, isContext32k, MAX_LOOPS, loop + 1);
+            const jitInstruction = `
+
+[SYSTEM] **MUST FOLLOW THINKING${mode === "Flux" ? ", NEWLINE, QUOTE ESCAPE" : ""} POLICY AS HIGHEST PRIORITY**.`;
+            const lastUserMsg = contents[contents.length - 1];
+            let addedMarker = false;
+            if (lastUserMsg && lastUserMsg.role === "user" && lastUserMsg.parts?.[0]?.text?.startsWith("[TOOL_RESULT]")) {
+              lastUserMsg.parts[0].text += jitInstruction;
+              addedMarker = true;
+            }
             stream = await client.models.generateContentStream({
               model: targetModel || "gemma-4-31b-it",
               contents,
               config: {
                 systemInstruction: currentSystemInstruction,
-                temperature: mode === "Flux" ? 1.05 : 1.4,
+                temperature: mode === "Flux" ? 0.98 : 1.4,
                 maxOutputTokens: 32768,
                 mediaResolution: "MEDIA_RESOLUTION_MEDIUM",
                 safetySettings: [
@@ -2991,6 +3022,9 @@ USER_PROMPT: "${agentText}"`.trim();
                 thinkingConfig: { includeThoughts: false, thinkingLevel: targetModel.includes("pro") ? ThinkingLevel.HIGH : ThinkingLevel.MINIMAL }
               }
             });
+            if (addedMarker && contents[contents.length - 1]?.parts?.[0]) {
+              contents[contents.length - 1].parts[0].text = contents[contents.length - 1].parts[0].text.replace(jitInstruction, "").trim();
+            }
             turnText = "";
             lastToolSniffed = null;
             lastToolEventTime = null;
@@ -3036,9 +3070,23 @@ USER_PROMPT: "${agentText}"`.trim();
                 if (toolContext.inside) {
                   if (!lastToolEventTime) lastToolEventTime = Date.now();
                   const potentialTool = toolContext.toolName;
-                  if (potentialTool && /^[a-z_]+$/.test(potentialTool) && potentialTool !== lastToolSniffed) {
+                  const partialArgs = toolContext.args || "";
+                  let detail = null;
+                  if (["write_file", "update_file", "view_file", "read_folder"].includes(potentialTool)) {
+                    const pArgs = parseArgs(partialArgs);
+                    const filePath = pArgs.path || pArgs.targetFile || pArgs.TargetFile || pArgs.directory;
+                    if (filePath) {
+                      detail = path16.basename(filePath.replace(/[\\"]/g, ""));
+                    } else {
+                      const m = partialArgs.match(/(?:path|targetFile|TargetFile|directory)\s*=\s*\\?["']?([^\\"' \),]+)/);
+                      if (m) detail = path16.basename(m[1].replace(/[\\"]/g, ""));
+                    }
+                  }
+                  const currentLabel = `${TOOL_LABELS[potentialTool] || potentialTool}${detail ? ` (${detail})` : ""}`;
+                  if (potentialTool !== lastToolSniffed || detail !== lastToolDetail) {
                     lastToolSniffed = potentialTool;
-                    yield { type: "status", content: `Working (${potentialTool})...` };
+                    lastToolDetail = detail;
+                    yield { type: "status", content: `${currentLabel}...` };
                   }
                 }
                 const contextSafeText = getContextSafeText(turnText, false);
@@ -3098,7 +3146,9 @@ USER_PROMPT: "${agentText}"`.trim();
                 const allToolsFound = detectToolCalls(toolActionableText);
                 while (allToolsFound.length > toolCallPointer) {
                   const toolCall = allToolsFound[toolCallPointer];
-                  yield { type: "status", content: `Working (${toolCall.toolName})...` };
+                  const displayLabel = TOOL_LABELS[toolCall.toolName] || toolCall.toolName;
+                  const detail = getToolDetail(toolCall.toolName, toolCall.args);
+                  yield { type: "status", content: `${displayLabel}${detail ? ` (${detail})` : ""}...` };
                   let label = "";
                   if (toolCall.toolName === "web_search") {
                     const { query, limit = 10 } = parseArgs(toolCall.args);
@@ -3197,7 +3247,9 @@ ${boxBottom}
                     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}` });
+                      toolResults.push({ role: "user", text: `[TOOL_RESULT]: ERROR: ${denyMsg}
+
+[SYSTEM] **MUST FOLLOW THINKING${mode === "Flux" ? ", NEWLINE, QUOTE ESCAPE" : ""} POLICY AS HIGHEST PRIORITY**.` });
                       yield { type: "tool_result", content: `[TOOL_RESULT]: ERROR: ${denyMsg}` };
                       toolCallPointer++;
                       continue;
@@ -3210,7 +3262,9 @@ ${boxBottom}
                       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]: DENIED: ${denyMsg}` });
+                        toolResults.push({ role: "user", text: `[TOOL_RESULT]: DENIED: ${denyMsg}
+
+[SYSTEM] **MUST FOLLOW THINKING${mode === "Flux" ? ", NEWLINE, QUOTE ESCAPE" : ""} POLICY AS HIGHEST PRIORITY**.` });
                         yield { type: "tool_result", content: `[TOOL_RESULT]: DENIED: ${denyMsg}` };
                         await incrementUsage("toolDenied");
                         if (settings.onToolResult) settings.onToolResult("denied");
@@ -3305,7 +3359,7 @@ ${boxBottom}
                 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 from the EXACT word it left off and DON'T repeat what you already said! IF you were in a thinking block, complete the thinking and close the thinking with proper </think> then respond. PICK UP FROM TE WORD IN A WAY THAT USER SHOULD NOT NOTICE ANY CUTOFF." });
+                modifiedHistory.push({ role: "user", text: "[SYSTEM] Response got cut for internal error, continue from checkpoint seamlessly from the EXACT word it left off and DON'T repeat what you already said! IF you were in a thinking block, complete the thinking and close the thinking with proper </think> then respond. PICK UP FROM TE WORD IN A WAY THAT USER SHOULD NOT NOTICE ANY CUTOFF. Rules:\n- Do not reuse <think> if the thinking already started just continue and end it properly.\n- If the cutoff was in middle of a tool call, start the tool call from start as the system won't pick half tool formats.\n- Visually the new pickup and continuation should look natual sentence flow." });
                 accumulatedContext += turnText;
                 for (let i = waitTime / 1e3; i > 0; i--) {
                   yield { type: "status", content: `Error Occured. Recovering Stream (${inStreamRetryCount}/${MAX_RETRIES}) [${i}s]...` };
@@ -3378,7 +3432,7 @@ ${timestamp}`;
         if (toolResults.length > 0) {
           toolResults.forEach((tr) => modifiedHistory.push(tr));
         } else {
-          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."}`}` });
+          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;
         }
@@ -5109,9 +5163,9 @@ Selection: ${val}`,
           const oldVal = args.TargetContent || args.content_to_replace || null;
           const newVal = args.content || args.ReplacementContent || args.content_to_add || args.replacementContent || null;
           if (oldVal && newVal) {
-            return /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React10.createElement(Box10, null, /* @__PURE__ */ React10.createElement(Text10, { color: "red", wrap: "anywhere", bold: true }, "- ", oldVal)), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, { color: "green", wrap: "anywhere", bold: true }, "+ ", newVal.replace(/\[\/n\]/g, "\\n"))));
+            return /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React10.createElement(Box10, null, /* @__PURE__ */ React10.createElement(Text10, { color: "red", wrap: "anywhere", bold: true }, "- ", oldVal)), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, { color: "green", wrap: "anywhere", bold: true }, "+ ", newVal.replace(/\[\/n\]?/g, "\\n"))));
           }
-          return /* @__PURE__ */ React10.createElement(Text10, { color: "white", wrap: "anywhere" }, newVal.replace(/\[\/n\]/g, "\\n") || "Updating file content...");
+          return /* @__PURE__ */ React10.createElement(Text10, { color: "white", wrap: "anywhere" }, newVal.replace(/\[\/n\]?/g, "\\n") || "Updating file content...");
         })()), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(
           CommandMenu,
           {
@@ -5341,7 +5395,7 @@ var init_app = __esm({
     init_text();
     SESSION_START_TIME = Date.now();
     CHANGELOG_URL = "https://fluxflow-cli.onrender.com/changelog.html";
-    versionFluxflow = "1.8.32";
+    versionFluxflow = "1.8.33";
     updatedOn = "2026-05-12";
     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.32",
+	"version": "1.8.33",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",