fluxflow-cli 1.19.3 → 1.19.4

package/dist/fluxflow.js

@@ -1204,7 +1204,7 @@ ${mode === "Flux" ? `- PROJECT TOOLS (path = relative to CWD) -
 - File structure: Real newlines for code formatting`.trim() : `
 - FILE TOOLS ARE NOT AVAILABLE IN FLOW (Tell user,\` /mode flux\` if needed)`.trim()}
 
-- Results: Passed as [TOOL RESULT] (system priority)
+- Results: Passed as [TOOL RESULT]
 - MAX Tool call stack: STRICTLY 3 per turn`.trim();
   }
 });
@@ -2396,12 +2396,13 @@ var init_thinking_prompts = __esm({
 
 // src/utils/prompts.js
 import fs4 from "fs";
-var getMemoryPrompt, getSystemInstruction, getJanitorInstruction;
+var cachedProjectContextBlock, getMemoryPrompt, getSystemInstruction, getJanitorInstruction;
 var init_prompts = __esm({
   async "src/utils/prompts.js"() {
     await init_main_tools();
     init_janitor_tools();
     init_thinking_prompts();
+    cachedProjectContextBlock = null;
     getMemoryPrompt = (tempMemories = "", userMemories = "", isMemoryEnabled = true, isContext32k = false) => {
       if (!isMemoryEnabled) return "";
       const tempMemoriesStr = tempMemories?.length > 0 && !isContext32k ? `-- RECENT CONTEXT FROM OTHER CHATS (PRIORITY: DYNAMIC-LOW, FOCUS: Chat Context > Recent) --
@@ -2413,7 +2414,7 @@ ${userMemories}` : "";
 ${parts.join("\n\n")}
 ` : "";
     };
-    getSystemInstruction = (profile, thinkingLevel, mode, systemSettings, isMemoryEnabled = true) => {
+    getSystemInstruction = (profile, thinkingLevel, mode, systemSettings, isMemoryEnabled = true, isFirstPrompt = false) => {
       let thinkingConfig = "";
       if (thinkingLevel !== "GEM") {
         let levelKey = thinkingLevel;
@@ -2451,12 +2452,15 @@ ${nicknameStr.length || userInstrStr.length ? "" : "\n"}` : "";
         { name: "design.md", desc: "UI/UX" },
         { name: "architecture.md", desc: "System Structure" }
       ];
-      const foundFiles = projectContextFiles.filter((f) => fs4.existsSync(f.name));
-      const projectContextBlock = mode === "Flux" && foundFiles.length > 0 ? `
+      if (isFirstPrompt || cachedProjectContextBlock === null) {
+        const foundFiles = projectContextFiles.filter((f) => fs4.existsSync(f.name));
+        cachedProjectContextBlock = mode === "Flux" && foundFiles.length > 0 ? `
 -- PROJECT CONTEXT (Source of Truth) --
 ${foundFiles.map((f) => `- ${f.name}: ${f.desc}`).join("\n")}
 Check these first; These Files > Training Data. Safety rules apply
 ` : "";
+      }
+      const projectContextBlock = cachedProjectContextBlock;
       return `${nameStr}${nicknameStr}${userInstrStr}[SYSTEM]
 Identity: Flux Flow (by Kushal Roy Chowdhury). Conversational, Sassy${mode === "Flux" ? ", Respectful" : ", Friendly, Humorous, Sarcastic"}, CLI Agent
 Mode: ${mode}${thinkingLevel !== "Fast" ? " (Thinking Mode)" : ""}. ${mode === "Flux" ? "Logical, Highly Detailed, Task-Driven. Prioritizes scalable file/folder structures, modular architecture, clean code abstractions, step-by-step execution. Industry standard latest coding practices/libraries, clean code, Double Check Imports, Client-Server Sync" : "Concise"}
@@ -2465,6 +2469,10 @@ Mode: ${mode}${thinkingLevel !== "Fast" ? " (Thinking Mode)" : ""}. ${mode === "
 - **MANDATORY: MUST END WITH [turn: continue] to CONTINUE loop OR [turn: finish] to END loop**
 - Tool Called? No post tool chat until [turn: continue]
 - NEVER USE [turn: continue] [turn:finish] together
+
+-- MARKERS --
+- TOOL SYSTEM: [TOOL RESULT] (system priority)
+- SYSTEM NOTIFICATION: [SYSTEM], [METADATA] in user turn
 ${thinkingLevel !== "GEM" ? `
 -- THINKING RULES --
 ${thinkingConfig}
@@ -2484,7 +2492,6 @@ ${projectContextBlock}
 
 -- FORMATTING --
 - GFM Supported
-- Tables: Max 4 cols
 - NO LaTeX${mode === "Flux" ? "" : ". Kaomojis"}
 [/SYSTEM]`.trim();
     };
@@ -5473,7 +5480,116 @@ ${newMemoryListStr}
       await RevertManager.startTransaction(chatId, agentText);
       try {
         let modifiedHistory = [...history.slice(0, -1)];
+        const summariesFile = path16.join(SECRET_DIR, "chat-summaries.json");
+        let summaries = readEncryptedJson(summariesFile, {});
+        let chatDataObj = summaries[chatId] || { summary: "", historyLength: 0 };
+        if (typeof chatDataObj === "string") {
+          chatDataObj = { summary: chatDataObj, historyLength: 0 };
+        }
+        const incomingCleanLength = history.filter((m) => (m.role === "user" || m.role === "agent" || m.role === "system") && !String(m.id).startsWith("welcome") && !m.isMeta).length;
+        if (incomingCleanLength < chatDataObj.historyLength) {
+          delete summaries[chatId];
+          writeEncryptedJson(summariesFile, summaries);
+          chatDataObj = { summary: "", historyLength: 0 };
+        }
         if (systemSettings?.compression === 0 && (sessionStats?.tokens || 0) > 254e3) {
+          yield { type: "status", content: "Condensing session context..." };
+          const flattenContext = (hist) => {
+            return hist.filter((m) => (m.role === "user" || m.role === "agent" || m.role === "system") && !String(m.id).startsWith("welcome") && !m.isMeta).map((m) => {
+              const role = m.text?.startsWith("[TOOL RESULT]") ? "TOOL" : m.role === "agent" ? "AGENT" : "USER";
+              return `[${role}]: ${m.text}`;
+            }).join("\n\n");
+          };
+          const runCondenser = async (flattenedText2, oldSummary2) => {
+            const systemInstruction = `You are an expert context condenser. Summarize the provided chat history (which may include previous summaries, user instructions, agent outputs, and tool results) into a detailed, coherent, and highly technical summary of 1000 to 1500 words. Focus on preserving the architectural decisions made, current system state, task progress, and critical code details. Under no circumstances exceed MAX 2000 words.`;
+            const prompt = oldSummary2 ? `Here is the previous summary:
+${oldSummary2}
+
+Here is the new conversation history:
+${flattenedText2}
+
+Provide a new consolidated summary of the entire session.` : `Here is the conversation history:
+${flattenedText2}
+
+Provide a consolidated summary of the entire session.`;
+            try {
+              const response = await client.models.generateContent({
+                model: "gemini-3.1-flash-lite",
+                contents: prompt,
+                config: {
+                  systemInstruction,
+                  maxOutputTokens: 2048,
+                  temperature: 0.3,
+                  safetySettings: [
+                    { category: HarmCategory.HARM_CATEGORY_HARASSMENT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                    { category: HarmCategory.HARM_CATEGORY_HATE_SPEECH, threshold: HarmBlockThreshold.BLOCK_NONE },
+                    { category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                    { category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, threshold: HarmBlockThreshold.BLOCK_NONE }
+                  ],
+                  thinkingConfig: { includeThoughts: false, thinkingLevel: ThinkingLevel.MEDIUM }
+                }
+              });
+              return response.text || "";
+            } catch (err) {
+              try {
+                const response = await client.models.generateContent({
+                  model: "gemini-2.5-flash",
+                  contents: prompt,
+                  config: {
+                    systemInstruction,
+                    maxOutputTokens: 2048,
+                    temperature: 0.3,
+                    safetySettings: [
+                      { category: HarmCategory.HARM_CATEGORY_HARASSMENT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                      { category: HarmCategory.HARM_CATEGORY_HATE_SPEECH, threshold: HarmBlockThreshold.BLOCK_NONE },
+                      { category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                      { category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, threshold: HarmBlockThreshold.BLOCK_NONE }
+                    ],
+                    thinkingConfig: { includeThoughts: false, thinkingBudget: 8192 }
+                  }
+                });
+                return response.text || "";
+              } catch (e) {
+                try {
+                  const response = await client.models.generateContent({
+                    model: "gemini-2.5-flash-lite",
+                    contents: prompt,
+                    config: {
+                      systemInstruction,
+                      maxOutputTokens: 2048,
+                      temperature: 0.3,
+                      safetySettings: [
+                        { category: HarmCategory.HARM_CATEGORY_HARASSMENT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                        { category: HarmCategory.HARM_CATEGORY_HATE_SPEECH, threshold: HarmBlockThreshold.BLOCK_NONE },
+                        { category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                        { category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, threshold: HarmBlockThreshold.BLOCK_NONE }
+                      ],
+                      thinkingConfig: { includeThoughts: false, thinkingBudget: 8192 }
+                    }
+                  });
+                  return response.text || "";
+                } catch (e2) {
+                  return "";
+                }
+              }
+            }
+          };
+          const flattenedText = flattenContext(modifiedHistory);
+          summaries = readEncryptedJson(summariesFile, {});
+          let chatData = summaries[chatId] || { summary: "", historyLength: 0 };
+          if (typeof chatData === "string") {
+            chatData = { summary: chatData, historyLength: 0 };
+          }
+          const oldSummary = chatData.summary || "";
+          const newSummary = await runCondenser(flattenedText, oldSummary);
+          if (newSummary) {
+            chatData.summary = newSummary;
+            summaries[chatId] = chatData;
+            writeEncryptedJson(summariesFile, summaries);
+            modifiedHistory = [];
+          }
+        }
+        if (systemSettings?.compression === 0 && (sessionStats?.tokens || 0) > 255e3) {
           modifiedHistory = getTruncatedHistory(modifiedHistory, 6);
         }
         if (isFirstPrompt && isMemoryEnabled) {
@@ -5733,13 +5849,26 @@ ${newMemoryListStr}
         const cwdMismatch = lastCwd ? lastCwd !== process.cwd() : false;
         chatPaths[chatId] = process.cwd();
         writeEncryptedJson(PATHS_FILE, chatPaths);
+        summaries = readEncryptedJson(summariesFile, {});
+        chatDataObj = summaries[chatId] || { summary: "", historyLength: 0 };
+        if (typeof chatDataObj === "string") {
+          chatDataObj = { summary: chatDataObj, historyLength: 0 };
+        }
+        const currentSummary = typeof chatDataObj === "object" ? chatDataObj.summary || "" : chatDataObj || "";
+        const summaryBlock = currentSummary ? `
+
+--- CONTEXT SUMMARY OF PREVIOUS TURNS (PRIORITY: HIGH) ---
+${currentSummary}
+
+` : "";
         let dirStructure = process.cwd() + "\n" + getDirTree(process.cwd(), dynamicMaxDepth);
         const firstUserMsg = `[SYSTEM METADATA (PRIORITY: DYNAMIC), Chat Context >> Metadata] Time: ${dateTimeStr} | v${versionFluxflow2}
 CWD: ${process.cwd()}${cwdMismatch ? ` (CWD Mismatch! Previous Path: ${lastCwd})` : ""}
 **DIRECTORY STRUCTURE**
 ${dirStructure}
+${summaryBlock}
 ${memoryPrompt}
-${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think**\n" : ""}` : ""}[USER] ${agentText.replace(/\s*\[Prompted on:.*?\]/g, "").trim()}`.trim();
+${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**\n" : ""}` : ""}[USER] ${agentText.replace(/\s*\[Prompted on:.*?\]/g, "").trim()}`.trim();
         modifiedHistory.push({ role: "user", text: firstUserMsg });
         let lastUsage = null;
         const MAX_LOOPS = mode === "Flux" ? 70 : 7;
@@ -5770,7 +5899,7 @@ ${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[S
 
 [STEERING HINT]: ${hint}`;
               } else {
-                modifiedHistory.push({ role: "user", text: `${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think**\n" : ""}` : ""}[STEERING HINT]: ${hint}` });
+                modifiedHistory.push({ role: "user", text: `${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**\n" : ""}` : ""}[STEERING HINT]: ${hint}` });
               }
               yield { type: "status", content: "Steering Hint Injected." };
             }
@@ -5840,7 +5969,7 @@ ${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[S
               } else if (retryCount > 0) {
                 yield { type: "model_update", content: null };
               }
-              currentSystemInstruction = getSystemInstruction(profile, !(targetModel || "gemma").toLowerCase().startsWith("gemma") ? "GEM" : thinkingLevel, mode, systemSettings, isMemoryEnabled, MAX_LOOPS, loop + 1);
+              currentSystemInstruction = getSystemInstruction(profile, !(targetModel || "gemma").toLowerCase().startsWith("gemma") ? "GEM" : thinkingLevel, mode, systemSettings, isMemoryEnabled, isFirstPrompt);
               const isGemma = modelName && modelName.toLowerCase().startsWith("gemma");
               const lastUserMsg = contents[contents.length - 1];
               if (isGemma) {
@@ -6500,11 +6629,11 @@ ${boxBottom}` };
               if (TERMINATION_SIGNAL) break;
               const signalSafeText2 = (turnText || "").trim();
               const hasFinish2 = /\[\s*(turn\s*:)?\s*finish\s*\]/i.test(signalSafeText2.toLowerCase());
-              const hasContinue = /\[\s*(turn\s*:)?\s*continue\s*\]/i.test(signalSafeText2.toLowerCase());
+              const hasContinue2 = /\[\s*(turn\s*:)?\s*continue\s*\]/i.test(signalSafeText2.toLowerCase());
               const didCallTool = toolResults.length > 0 || lastToolSniffed !== null;
               const pureOutputText = signalSafeText2.replace(/(?:<think>|\[think\])[\s\S]*?(?:<\/think>|\[\/think\])/gi, "").trim();
               const endsNormally = /[.!?}"'`’“”]$|```$/s.test(pureOutputText);
-              if (!hasFinish2 && !hasContinue && !didCallTool && signalSafeText2.length > 0 && !endsNormally && !isThinkingLoop && !isStutteringLoop && !isGeneralLoop) {
+              if (!hasFinish2 && !hasContinue2 && !didCallTool && signalSafeText2.length > 0 && !endsNormally && !isThinkingLoop && !isStutteringLoop && !isGeneralLoop) {
                 throw new Error("Silent stream cutoff (500): Model stream closed cleanly but cut off mid-sentence without signals.");
               }
               success = true;
@@ -6626,7 +6755,7 @@ Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
           if (lastUsage) {
             const total = lastUsage.totalTokenCount || 0;
             const cached = lastUsage.cachedContentTokenCount || 0;
-            const candidates = lastUsage.candidatesTokenCount || 0;
+            const candidates = (lastUsage.candidatesTokenCount || 0) + (lastUsage.thoughtsTokenCount || 0);
             await addToUsage("tokens", total);
             if (cached > 0) {
               await addToUsage("cachedTokens", cached);
@@ -6644,10 +6773,11 @@ Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
           }
           const signalSafeText = getSanitizedText(turnText);
           const hasFinish = /\[\s*(turn\s*:)?\s*finish\s*\]/i.test(signalSafeText.toLowerCase());
+          const hasContinue = /\[\s*(turn\s*:)?\s*continue\s*\]/i.test(signalSafeText.toLowerCase());
           const shouldContinue = toolCallPointer > 0;
           yield { type: "status", content: "Working..." };
           const cleanedTurnText = contextSafeReplace(turnText, /\[\s*(turn\s*:)?\s*(continue|finish)\s*\]/gi, "").trim();
-          let isActuallyFinished = hasFinish && !shouldContinue;
+          let isActuallyFinished = hasFinish && !shouldContinue || !shouldContinue && !hasContinue;
           if (isActuallyFinished) {
             const fullAgentTextRaw = fullAgentResponseChunks.join("\n");
             const cleanedFullResponse = fullAgentTextRaw.replace(/(?:<think>|\[think\])[\s\S]*?(?:<\/think>|\[\/think\])/g, "").trim();
@@ -6660,21 +6790,34 @@ Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
                 needTitle
               }
             };
-            const timestamp = `Responded on ${(/* @__PURE__ */ new Date()).toLocaleString()}`;
-            const finalWithTime = `${cleanedFullResponse}
-
-${timestamp}`;
             if (modifiedHistory.length > 0 && modifiedHistory[modifiedHistory.length - 1].role === "agent") {
-              modifiedHistory[modifiedHistory.length - 1].text = finalWithTime;
+              modifiedHistory[modifiedHistory.length - 1].text = cleanedFullResponse;
             } else {
-              modifiedHistory.push({ role: "agent", text: finalWithTime });
+              modifiedHistory.push({ role: "agent", text: cleanedFullResponse });
+            }
+            try {
+              const summariesFile2 = path16.join(SECRET_DIR, "chat-summaries.json");
+              const summaries2 = readEncryptedJson(summariesFile2, {});
+              let existing = summaries2[chatId] || { summary: "", historyLength: 0 };
+              if (typeof existing === "string") {
+                existing = { summary: existing, historyLength: 0 };
+              }
+              const cleanLen = modifiedHistory.filter((m) => (m.role === "user" || m.role === "agent" || m.role === "system") && !String(m.id).startsWith("welcome") && !m.isMeta).length;
+              existing.historyLength = cleanLen;
+              summaries2[chatId] = existing;
+              writeEncryptedJson(summariesFile2, summaries2);
+            } catch (e) {
             }
           }
           if (isActuallyFinished) break;
           const nextAgentMsg = cleanedTurnText.trim() || "*Working...*";
           modifiedHistory.push({ role: "agent", text: nextAgentMsg });
           if (toolResults.length > 0 || anyToolExecutedInThisTurn) {
-            toolResults.forEach((tr) => modifiedHistory.push(tr));
+            if (toolResults.length > 0) {
+              const combinedText = toolResults.map((tr) => tr.text).join("\n\n");
+              const binaryPart = toolResults.find((tr) => tr.binaryPart)?.binaryPart || null;
+              modifiedHistory.push({ role: "user", text: combinedText, binaryPart });
+            }
           } else {
             if (wasToolCalledInLastLoop) {
               modifiedHistory.push({ role: "user", text: `[SYSTEM] System failed to verify tool execution, Verify tool syntax, proper escaping and try again if failed` });
@@ -8523,12 +8666,30 @@ ${timestamp}` };
         let apiStart = Date.now();
         let isFirstPacket = true;
         try {
-          const cleanHistoryForAI = [...messages, userMessage].filter(
+          const rawHistory = [...messages, userMessage].filter(
             (m) => m.role !== "think" && !m.isVisualFeedback && !String(m.id).startsWith("welcome")
-          ).map((m) => ({
-            ...m,
-            text: m.fullText || m.text
-          }));
+          );
+          const cleanHistoryForAI = [];
+          rawHistory.forEach((m, idx) => {
+            let text = m.fullText || m.text;
+            if (m.role === "user" && idx < rawHistory.length - 1) {
+              const userIndex = text.lastIndexOf("[USER]");
+              if (userIndex !== -1) {
+                text = text.substring(userIndex + 6).trim();
+              }
+            }
+            if (m.role === "system" && text?.startsWith("[TOOL RESULT]")) {
+              const prev = cleanHistoryForAI[cleanHistoryForAI.length - 1];
+              if (prev && prev.role === "system" && prev.text?.startsWith("[TOOL RESULT]")) {
+                prev.text += "\n\n" + text;
+                return;
+              }
+            }
+            cleanHistoryForAI.push({
+              ...m,
+              text
+            });
+          });
           const stream = getAIStream(
             activeModel,
             cleanHistoryForAI,
@@ -8708,15 +8869,6 @@ Selection: ${val}`,
             if (packet.type === "interactive_turn_finished") {
               setIsProcessing(false);
               hasFiredJanitor = true;
-              setMessages((prev) => {
-                const aiHistory = packet.data.history;
-                return prev.map((msg, idx) => {
-                  if (aiHistory[idx]) {
-                    return { ...msg, fullText: aiHistory[idx].text };
-                  }
-                  return msg;
-                });
-              });
               runJanitorTask(
                 { profile: profileData, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats },
                 packet.data.agentText,

package/package.json

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