fluxflow-cli 1.8.21 → 1.8.24

package/dist/fluxflow.js

@@ -737,10 +737,10 @@ Use tools contextually when needed, don't flood with unnecessary tool calls.
 var JANITOR_TOOLS_PROTOCOL;
 var init_janitor_tools = __esm({
   "src/data/janitor_tools.js"() {
-    JANITOR_TOOLS_PROTOCOL = (isMemoryEnabled = true, needTitle = false) => `
+    JANITOR_TOOLS_PROTOCOL = (isMemoryEnabled = true, needTitle = true) => `
 ${needTitle ? `-- START CHAT MANAGEMENT TOOLS --
 1. YOU MUST UPDATE CHAT TITLE (URGENT PRIORITY):
-   tool:functions.chat(title='<short summary of conversation context in 3-5 words>')
+   tool:functions.chat(title='<short creative title of FULL conversation in 3-5 words>')
 -- END CHAT MANAGEMENT TOOLS --
 
 ` : ""}
@@ -748,7 +748,7 @@ ${needTitle ? `-- START CHAT MANAGEMENT TOOLS --
 Your tool syntax is: 'tool:functions.function_name(args...)'
 You have access to the following memory functions to persist important information:
 
-1. Temporary context (MUST OUTPUT THIS TOOL CALL EVERY TIME):
+1. Temporary context (URGENT PRIORITY):
    tool:functions.memory(action='temp', content='<summary of the user prompt & model responses ONLY FROM LATEST PROMPT UNDER 40 WORDS>. [Talked on: <date> <hour>]')
 
 ${isMemoryEnabled ? `2. User-specific long-term memory (USE BASED ON CONVERSATION CONTEXT):
@@ -833,7 +833,7 @@ If you see a [STEERING HINT] from user, give that prompt priority for the task a
 -- START THINKING INSTRUCTIONS --
 ${thinkingConfig}
 
-BEFORE USING ANY TOOL THINKING IS **MANDATORY** WITH TOOL RULES. ALWAYS PRIORITIZE THINKING FIRST BEFORE RESPONDING. YOU ARE **FORBIDDEN** TO JUMP TO RESPONSES FIRST. THINKING IS REQUIRED EVEN WITH CONVERSATIONAL RESPONSES.
+BEFORE USING ANY TOOL THINKING IS **MANDATORY** WITH TOOL RULES. ALWAYS PRIORITIZE THINKING FIRST BEFORE RESPONDING. YOU ARE **FORBIDDEN** TO JUMP TO RESPONSES FIRST. THINKING IS REQUIRED EVEN WITH SIMPLEST CONVERSATIONAL RESPONSES.
 -- END THINKING INSTRUCTIONS --
 
 ${TOOL_PROTOCOL(mode)}
@@ -891,7 +891,7 @@ When you 'finish' an agentic loop, you will lose your previous turn 'thinking' d
 Current date and Time is: ${dateTimeStr}
 --- END SYSTEM INSTRUCTION ---`.trim();
     };
-    getJanitorInstruction = (originalText, agentRaws, userMemories = "", isMemoryEnabled = true, needTitle = false) => {
+    getJanitorInstruction = (originalText, agentRaws, userMemories = "", isMemoryEnabled = true, needTitle = true) => {
       let agentRes = `${agentRaws.replace(/tool:functions\..*\n/g, "").replace(/<think>.*<\/think>/g, "").replace(/\[Prompted on:.*?\]/g, "").replace(/\[turn: continue\]/g, "").replace(/\[turn: finish\]/g, "").replace(/\[TOOL_RESULTS\]/g, "").replace(/\[tool_results\]/g, "").substring(0, 3500)}`;
       if (agentRes.length > 3500) {
         agentRes += "\n... (truncated) ...";
@@ -2449,7 +2449,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, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, getAIStream;
+var client, TERMINATION_SIGNAL, signalTermination, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, getAIStream;
 var init_ai = __esm({
   "src/utils/ai.js"() {
     init_prompts();
@@ -2465,6 +2465,135 @@ var init_ai = __esm({
     signalTermination = () => {
       TERMINATION_SIGNAL = true;
     };
+    runJanitorTask = async (settings, agentText, fullAgentTextRaw, history, callbacks = {}) => {
+      const { onStatus, onMemoryUpdated, onBackgroundIncrement } = callbacks;
+      const { profile, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats } = settings;
+      const isMemoryEnabled = systemSettings?.memory !== false;
+      const persistentStorage = readEncryptedJson(MEMORIES_FILE, []);
+      const janitorUserMemories = persistentStorage.map((m) => `- [${m.id}]: ${m.memory}`).join("\n");
+      const janitorContents = history.slice(-6).filter((msg) => msg.text && !msg.text.includes("[TOOL_RESULT]") && !msg.text.includes("OBSERVATION:")).map((msg) => ({
+        role: msg.role === "user" ? "user" : "model",
+        parts: [{ text: msg.text.replace(/<think>[\s\S]*?<\/think>/g, "").trim() }]
+      }));
+      const cleanedFullResponse = fullAgentTextRaw.replace(/<think>[\s\S]*?<\/think>/g, "").trim();
+      const janitorPrompt = getJanitorInstruction(
+        agentText,
+        cleanedFullResponse,
+        janitorUserMemories,
+        isMemoryEnabled,
+        true
+      );
+      janitorContents.push({ role: "user", parts: [{ text: janitorPrompt }] });
+      let finalSynthesis = "";
+      let attempts = 0;
+      const MAX_JANITOR_RETRIES = 2;
+      while (attempts <= MAX_JANITOR_RETRIES) {
+        try {
+          if (!await checkQuota("background", settings)) {
+            console.warn("Quota Exhausted for Background Model. Skipping refinement.");
+            return;
+          }
+          let fullContent = "";
+          let lastUsage = null;
+          try {
+            const timeoutPromise = new Promise(
+              (_, reject) => setTimeout(() => reject(new Error("JANITOR_TIMEOUT")), attempts === 1 ? 25e3 : attempts === 2 ? 2e4 : 3e4)
+            );
+            const streamPromise = (async () => {
+              const stream = await client.models.generateContentStream({
+                model: janitorModel || "gemma-4-26b-a4b-it",
+                contents: janitorContents,
+                config: {
+                  maxOutputTokens: 384,
+                  temperature: 0.69,
+                  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.MINIMAL }
+                }
+              });
+              await incrementUsage("background");
+              const iterator2 = stream[Symbol.asyncIterator]();
+              const firstResult2 = await iterator2.next();
+              return { iterator: iterator2, firstResult: firstResult2 };
+            })();
+            const { iterator, firstResult } = await Promise.race([streamPromise, timeoutPromise]);
+            let { value: firstChunk, done: firstDone } = firstResult;
+            if (!firstDone && firstChunk) {
+              const parts = firstChunk.candidates?.[0]?.content?.parts;
+              const chunkText = parts?.[1]?.text || parts?.[0]?.text || (typeof firstChunk.text === "function" ? firstChunk.text() : "");
+              if (chunkText) {
+                fullContent += chunkText;
+              }
+              lastUsage = firstChunk.usageMetadata;
+              for await (const chunk of { [Symbol.asyncIterator]: () => iterator }) {
+                const p = chunk.candidates?.[0]?.content?.parts;
+                const t = p?.[1]?.text || p?.[0]?.text || (typeof chunk.text === "function" ? chunk.text() : "");
+                if (t) fullContent += t;
+                lastUsage = chunk.usageMetadata;
+              }
+            }
+          } catch (e) {
+            if (e.message === "JANITOR_TIMEOUT") {
+              console.error("Janitor API Timeout: No tokens received within 30s.");
+            }
+            throw e;
+          }
+          if (fullContent) {
+            finalSynthesis = fullContent;
+            if (lastUsage) await addToUsage("tokens", lastUsage.totalTokenCount || 0);
+            const date = (/* @__PURE__ */ new Date()).toLocaleString();
+            const janitorLogDir = path16.join(LOGS_DIR, "janitor");
+            if (!fs16.existsSync(janitorLogDir)) fs16.mkdirSync(janitorLogDir, { recursive: true });
+            fs16.appendFileSync(path16.join(janitorLogDir, "debug.log"), `
+
+---------------------------------------------------
+
+
+DEBUG [${date}]: ${finalSynthesis}
+
+`);
+          } else {
+            throw new Error("No synthesis generated by Janitor.");
+          }
+          if (onBackgroundIncrement) onBackgroundIncrement();
+          const janitorToolCalls = detectToolCalls(finalSynthesis);
+          for (const janitorToolCall of janitorToolCalls) {
+            const toolContext = { chatId, sessionId: chatId, history };
+            const result = await dispatchTool(janitorToolCall.toolName, janitorToolCall.args, toolContext);
+            const date = (/* @__PURE__ */ new Date()).toLocaleString();
+            const janitorLogDir = path16.join(LOGS_DIR, "janitor");
+            fs16.appendFileSync(path16.join(janitorLogDir, "debug.log"), `DEBUG [${date}]: RESULT [${janitorToolCall.toolName}]: ${result}
+`);
+            if (janitorToolCall.toolName === "memory" && !janitorToolCall.args.includes("action='temp'")) {
+              if (onMemoryUpdated) onMemoryUpdated();
+            }
+          }
+          break;
+        } catch (janitorErr) {
+          attempts++;
+          const date = (/* @__PURE__ */ new Date()).toLocaleString();
+          const janitorErrDir = path16.join(LOGS_DIR, "janitor");
+          if (!fs16.existsSync(janitorErrDir)) fs16.mkdirSync(janitorErrDir, { recursive: true });
+          fs16.appendFileSync(path16.join(janitorErrDir, "error.log"), `ERROR [Attempt ${attempts}/${MAX_JANITOR_RETRIES + 1}] [${date}]: ${String(janitorErr)}
+
+`);
+          if (attempts > MAX_JANITOR_RETRIES) break;
+          const backoff = Math.min(1e3 * Math.pow(2, attempts - 1), 5e3);
+          await new Promise((resolve) => setTimeout(resolve, backoff));
+        }
+      }
+      if (attempts) {
+        const janitorErrDir = path16.join(LOGS_DIR, "janitor");
+        fs16.appendFileSync(path16.join(janitorErrDir, "error.log"), `-----------------------------------------------------------------------------
+
+
+`);
+      }
+    };
     getActiveToolContext = (text) => {
       const toolRegex = /(?:\[?\s*tool:functions\.)([a-z0-9_]+)\s*\(/gi;
       let match;
@@ -2736,10 +2865,10 @@ var init_ai = __esm({
               throw new Error("Error: Daily Quota Exausted for Agent");
             }
             let targetModel = modelName;
-            if (retryCount === 6) {
+            if (retryCount === 7) {
               targetModel = "gemini-3-flash-preview";
               yield { type: "model_update", content: "Trying with fallback model" };
-            } else if (retryCount >= 7) {
+            } else if (retryCount >= 8) {
               targetModel = "gemini-3.1-flash-lite-preview";
               yield { type: "model_update", content: "Trying with fallback model lite" };
             } else if (retryCount > 0) {
@@ -3069,7 +3198,7 @@ ${boxBottom}
             if (turnText.trim().length > 0) {
               if (inStreamRetryCount <= MAX_RETRIES) {
                 inStreamRetryCount++;
-                const waitTime = Math.min(1e3 * Math.pow(2, inStreamRetryCount - 1), 12e3);
+                const waitTime = Math.min(1e3 * Math.pow(2, inStreamRetryCount - 1), 16e3);
                 modifiedHistory.push({ role: "agent", text: turnText });
                 if (toolResults.length > 0) {
                   toolResults.forEach((tr) => modifiedHistory.push(tr));
@@ -3078,20 +3207,20 @@ ${boxBottom}
                 accumulatedContext += turnText;
                 yield { type: "status", content: `Error Occured. Recovering Stream (${inStreamRetryCount}/${MAX_RETRIES}) [${(waitTime / 1e3).toFixed(0)}s]...` };
                 await new Promise((resolve) => setTimeout(resolve, waitTime));
-              } else {
                 yield { type: "status", content: `Error Occured. Recovering Stream...` };
+              } else {
                 throw new Error(`Stream collapsed too many times. (Failed to resolve ${MAX_RETRIES} times)
 Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
               }
             } else {
               if (retryCount <= MAX_RETRIES) {
                 retryCount++;
-                const waitTime = Math.min(1e3 * Math.pow(2, retryCount - 1), 12e3);
+                const waitTime = Math.min(1e3 * Math.pow(2, retryCount - 1), 16e3);
                 isInitialAttempt = true;
                 yield { type: "status", content: `Retrying Connection (${retryCount}/${MAX_RETRIES}) [${(waitTime / 1e3).toFixed(0)}s]...` };
                 await new Promise((resolve) => setTimeout(resolve, waitTime));
-              } else {
                 yield { type: "status", content: `Retrying Connection...` };
+              } else {
                 throw new Error(`Model cannot be reached. (Failed ${MAX_RETRIES} times)
 Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
               }
@@ -3115,128 +3244,17 @@ Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
         const cleanedTurnText = contextSafeReplace(turnText, /\[\s*(turn\s*:)?\s*(continue|finish)\s*\]/gi, "").trim();
         let isActuallyFinished = hasFinish && !shouldContinue;
         if (isActuallyFinished) {
-          yield { type: "status", content: "Finalizing..." };
-          const janitorContents = history.slice(-3).filter((msg) => msg.text && !msg.text.includes("[TOOL_RESULT]") && !msg.text.includes("OBSERVATION:")).map((msg) => ({
-            role: msg.role === "user" ? "user" : "model",
-            parts: [{ text: msg.text.replace(/<think>[\s\S]*?<\/think>/g, "").trim() }]
-          }));
           const fullAgentTextRaw = fullAgentResponseChunks.join("\n");
           const cleanedFullResponse = fullAgentTextRaw.replace(/<think>[\s\S]*?<\/think>/g, "").trim();
-          const janitorPrompt = getJanitorInstruction(
-            agentText,
-            cleanedFullResponse,
-            janitorUserMemories,
-            isMemoryEnabled,
-            true
-          );
-          janitorContents.push({ role: "user", parts: [{ text: janitorPrompt }] });
-          let finalSynthesis = "";
-          try {
-            if (!await checkQuota("background", settings)) {
-              console.warn("Quota Exhausted for Background Model. Skipping refinement.");
-              throw new Error("QUOTA_BLOCKED");
-            }
-            yield { type: "spinner", content: false };
-            let fullContent = "";
-            let lastUsage2 = null;
-            try {
-              const timeoutPromise = new Promise(
-                (_, reject) => setTimeout(() => reject(new Error("JANITOR_TIMEOUT")), 2e4)
-              );
-              const streamPromise = (async () => {
-                const stream2 = await client.models.generateContentStream({
-                  model: janitorModel || "gemma-4-26b-a4b-it",
-                  contents: janitorContents,
-                  config: {
-                    maxOutputTokens: 384,
-                    temperature: 0.69,
-                    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.MINIMAL }
-                  }
-                });
-                await incrementUsage("background");
-                const iterator2 = stream2[Symbol.asyncIterator]();
-                const firstResult2 = await iterator2.next();
-                return { iterator: iterator2, firstResult: firstResult2 };
-              })();
-              const { iterator, firstResult } = await Promise.race([streamPromise, timeoutPromise]);
-              let { value: firstChunk, done: firstDone } = firstResult;
-              if (!firstDone && firstChunk) {
-                const parts = firstChunk.candidates?.[0]?.content?.parts;
-                const chunkText = parts?.[1]?.text || parts?.[0]?.text || (typeof firstChunk.text === "function" ? firstChunk.text() : "");
-                if (chunkText) {
-                  fullContent += chunkText;
-                  yield { type: "status", content: "Finishing..." };
-                }
-                lastUsage2 = firstChunk.usageMetadata;
-                for await (const chunk of { [Symbol.asyncIterator]: () => iterator }) {
-                  const p = chunk.candidates?.[0]?.content?.parts;
-                  const t = p?.[1]?.text || p?.[0]?.text || (typeof chunk.text === "function" ? chunk.text() : "");
-                  if (t) {
-                    fullContent += t;
-                  }
-                  lastUsage2 = chunk.usageMetadata;
-                }
-              }
-            } catch (e) {
-              if (e.message === "JANITOR_TIMEOUT") {
-                throw new Error("Janitor API Timeout: No tokens received within 20s.");
-              }
-              throw e;
-            }
-            yield { type: "spinner", content: true };
-            if (fullContent) {
-              finalSynthesis = fullContent;
-              if (lastUsage2) {
-                await addToUsage("tokens", lastUsage2.totalTokenCount || 0);
-              }
-              const date = (/* @__PURE__ */ new Date()).toLocaleString();
-              const janitorLogDir = path16.join(LOGS_DIR, "janitor");
-              if (!fs16.existsSync(janitorLogDir)) {
-                fs16.mkdirSync(janitorLogDir, { recursive: true });
-              }
-              fs16.appendFileSync(path16.join(janitorLogDir, "debug.log"), `
-
----------------------------------------------------
-
-
-DEBUG [${date}]: ${finalSynthesis}
-
-`);
-            } else {
-              throw new Error("No synthesis generated by Janitor.");
-            }
-            yield { type: "background_increment" };
-            const janitorToolCalls = detectToolCalls(finalSynthesis);
-            for (const janitorToolCall of janitorToolCalls) {
-              const toolContext = { chatId, sessionId: chatId, history };
-              const result = await dispatchTool(janitorToolCall.toolName, janitorToolCall.args, toolContext);
-              const date = (/* @__PURE__ */ new Date()).toLocaleString();
-              const janitorLogDir = path16.join(LOGS_DIR, "janitor");
-              fs16.appendFileSync(path16.join(janitorLogDir, "debug.log"), `DEBUG [${date}]: RESULT [${janitorToolCall.toolName}]: ${result}
-`);
-              if (janitorToolCall.toolName === "memory" && !janitorToolCall.args.includes("action='temp'")) {
-                yield { type: "memory_updated" };
-              }
+          yield {
+            type: "interactive_turn_finished",
+            data: {
+              agentText,
+              fullAgentTextRaw,
+              history: [...modifiedHistory],
+              needTitle
             }
-          } catch (janitorErr) {
-            const date = (/* @__PURE__ */ new Date()).toLocaleString();
-            const janitorErrDir = path16.join(LOGS_DIR, "janitor");
-            if (!fs16.existsSync(janitorErrDir)) {
-              fs16.mkdirSync(janitorErrDir, { recursive: true });
-            }
-            fs16.appendFileSync(path16.join(janitorErrDir, "error.log"), `ERROR [${date}]: ${String(janitorErr)}
-
-----------------------------------------------------------------------
-
-
-`);
-          }
+          };
           const timestamp = `Responded on ${(/* @__PURE__ */ new Date()).toLocaleString()}`;
           const finalWithTime = `${cleanedFullResponse}
 
@@ -4377,7 +4395,7 @@ Selection: ${val}`,
           let toolCallEncounteredInTurn = false;
           let toolCallBalance = 0;
           let inToolCallString = null;
-          const signalRegex = /\[?_DISABLED_SIGNAL_REGEX_\]?/gi;
+          const signalRegex = /\[?\s*turn\s*:\s*.*?\s*\]?/gi;
           for await (const packet of stream) {
             if (packet.type === "status") {
               setStatusText(packet.content);
@@ -4401,14 +4419,23 @@ Selection: ${val}`,
               thinkConsumedInTurn = false;
               continue;
             }
-            if (packet.type === "memory_updated") {
-              setMessages((prev) => {
-                const newMsgs = [...prev];
-                if (newMsgs.length > 0) {
-                  newMsgs[newMsgs.length - 1].memoryUpdated = true;
+            if (packet.type === "interactive_turn_finished") {
+              setIsProcessing(false);
+              runJanitorTask(
+                { profile: profileData, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats },
+                packet.data.agentText,
+                packet.data.fullAgentTextRaw,
+                packet.data.history,
+                packet.data.needTitle,
+                {
+                  onMemoryUpdated: () => setMessages((prev) => {
+                    const newMsgs = [...prev];
+                    if (newMsgs.length > 0) newMsgs[newMsgs.length - 1].memoryUpdated = true;
+                    return newMsgs;
+                  }),
+                  onBackgroundIncrement: () => setSessionBackgroundCalls((prev) => prev + 1)
                 }
-                return newMsgs;
-              });
+              );
               continue;
             }
             if (packet.type === "visual_feedback") {
@@ -4434,10 +4461,6 @@ Selection: ${val}`,
               setSessionAgentCalls((prev) => prev + 1);
               continue;
             }
-            if (packet.type === "background_increment") {
-              setSessionBackgroundCalls((prev) => prev + 1);
-              continue;
-            }
             if (packet.type === "tool_time") {
               setSessionToolTime((prev) => prev + packet.content);
               continue;
@@ -5209,8 +5232,8 @@ var init_app = __esm({
     init_text();
     SESSION_START_TIME = Date.now();
     CHANGELOG_URL = "https://fluxflow-cli.onrender.com/changelog.html";
-    versionFluxflow = "1.8.21";
-    updatedOn = "2026-05-10";
+    versionFluxflow = "1.8.24";
+    updatedOn = "2026-05-11";
     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.21",
+	"version": "1.8.24",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",