fluxflow-cli 2.15.3 → 2.16.0

package/dist/fluxflow.js

@@ -2104,7 +2104,7 @@ var init_build = __esm({
 
 // src/utils/text.js
 import os2 from "os";
-var wrapText, formatTokens, truncatePath, parsePatchPairs, applyPatches, generateHighFidelityDiff, parseLineInfo, getSimilarity, alignChangeGroup, blocksCache, streamingBlocksCache, MAX_CACHE_SIZE, CHUNK_SIZE, indexBlockIntoMap, parseMessageToBlocks, TOOL_LABELS, REGEX_INITIAL_THINK, REGEX_INITIAL_TOOL, REGEX_SYSTEM, REGEX_THINK, REGEX_ANSWER, REGEX_TOOL_RES, REGEX_SUCCESS_ERROR, REGEX_TURN_1, REGEX_END, REGEX_TURN_2, REGEX_TURN_3, REGEX_OPEN_BRACKET, REGEX_RESPONDED, REGEX_PROMPTED, REGEX_ARROWS, REGEX_ARROWS_L, REGEX_ARROWS_U, REGEX_ARROWS_D, REGEX_ARROWS_LR, REGEX_TERMINAL, REGEX_TOOLS, cleanSignals, clearBlocksCache;
+var wrapText, formatTokens, truncatePath, parsePatchPairs, applyPatches, generateHighFidelityDiff, parseLineInfo, getSimilarity, alignChangeGroup, blocksCache, streamingBlocksCache, MAX_CACHE_SIZE, CHUNK_SIZE, indexBlockIntoMap, parseMessageToBlocks, TOOL_LABELS, REGEX_INITIAL_THINK, REGEX_INITIAL_TOOL, REGEX_CLEAN_SIGNALS, REGEX_ARROWS_ALL, REGEX_TOOLS, cleanSignals, clearBlocksCache;
 var init_text = __esm({
   "src/utils/text.js"() {
     init_paths();
@@ -2571,15 +2571,31 @@ var init_text = __esm({
         if (existing && existing.text === textContent && existing.type === type && !!existing.isActiveBlock === !!extra.isActiveBlock && !!existing.isStreaming === !!extra.isStreaming && existing.pairContent === extra.pairContent) {
           return existing;
         }
+        const flatText = typeof textContent === "string" ? (" " + textContent).slice(1) : textContent;
+        const flatExtra = { ...extra };
+        if (typeof flatExtra.pairContent === "string") {
+          flatExtra.pairContent = (" " + flatExtra.pairContent).slice(1);
+        }
+        if (Array.isArray(flatExtra.wrappedLines)) {
+          flatExtra.wrappedLines = flatExtra.wrappedLines.map((l) => typeof l === "string" ? (" " + l).slice(1) : l);
+        }
         return {
           key,
-          msg,
+          isStreamingMsg: !!msg.isStreaming,
+          workedDuration: msg.workedDuration,
           type,
-          text: textContent,
-          ...extra
+          text: flatText,
+          msg: type === "full-message" ? msg : void 0,
+          // Only full-message requires role/meta checks
+          ...flatExtra
         };
       };
       if (text.includes("- Content Preview:")) {
+        let extension = "";
+        const fileMatch = text.match(/File\s+\[(.*?)\]/i);
+        if (fileMatch) {
+          extension = fileMatch[1].split(".").pop().toLowerCase();
+        }
         const mainParts = text.split("- Content Preview:");
         const contentPart = mainParts[1] || "";
         const footerMarker = "[SYSTEM] Check the content preview for verification [/SYSTEM]";
@@ -2595,18 +2611,21 @@ var init_text = __esm({
           writeChunk = [];
           completedBlocks2.push(batch.length === 1 ? batch[0] : {
             key: `${batch[0].key}-chunk`,
-            msg,
             type: "chunk",
             blocks: batch
           });
         };
+        const innerWidth = columns - (gutterWidth + 6);
         codeLines.forEach((line, idx) => {
           const isLast = idx === codeLines.length - 1;
+          const wrappedLines = wrapText(line, innerWidth).split("\n");
           const block = getBlock(`${msg.id || Date.now()}-write-line-${idx}`, "write-line", line, {
             gutterWidth,
             lineNum: idx + 1,
             isFirstLine: idx === 0,
-            isLastLine: isLast
+            isLastLine: isLast,
+            extension,
+            wrappedLines
           });
           if (isLast && msg.isStreaming) {
             flushWrite();
@@ -2646,17 +2665,22 @@ var init_text = __esm({
           diffChunk = [];
           completedBlocks2.push(batch.length === 1 ? batch[0] : {
             key: `${batch[0].key}-chunk`,
-            msg,
             type: "chunk",
             blocks: batch
           });
         };
         diffLines.forEach((line, i) => {
           const isLast = i === diffLines.length - 1;
+          const parsed = parsedLines[i].parsed;
+          let wrappedLines = null;
+          if (parsed) {
+            wrappedLines = wrapText(parsed.content, columns - 17).split("\n");
+          }
           const block = getBlock(`${msg.id || Date.now()}-diff-${i}`, "diff-line", line, {
             isFirstLine: i === 0,
             isLastLine: isLast,
-            pairContent: parsedLines[i].pairContent
+            pairContent: parsedLines[i].pairContent,
+            wrappedLines
           });
           if (isLast && msg.isStreaming) {
             flushDiff();
@@ -2679,42 +2703,43 @@ var init_text = __esm({
       let activeBlock = null;
       let pendingChunk = [];
       let pendingChunkType = null;
-      const flushPending = (force = false) => {
+      const flushPending = () => {
         if (!pendingChunk.length) return;
-        if (msg.isStreaming && !force) {
-          return;
-        }
         const batch = pendingChunk;
         pendingChunk = [];
         pendingChunkType = null;
         completedBlocks.push(batch.length === 1 ? batch[0] : {
           key: `${msg.id || "x"}-chunk-${batch[0].key}`,
-          msg,
           type: "chunk",
           blocks: batch
         });
       };
-      const enqueue = (block) => {
-        if (pendingChunkType !== null && pendingChunkType !== block.type) flushPending(true);
+      const enqueue = (block, isLastOfMessage = false) => {
+        if (pendingChunkType !== null && pendingChunkType !== block.type) flushPending();
         pendingChunk.push(block);
         pendingChunkType = block.type;
-        if (pendingChunk.length >= CHUNK_SIZE) flushPending(false);
+        if (pendingChunk.length >= CHUNK_SIZE) {
+          if (msg.isStreaming && isLastOfMessage) return;
+          flushPending();
+        }
       };
       if (msg.role === "think") {
         completedBlocks.push(getBlock(`${msg.id}-header`, "think-header", ""));
         const lines = text.split("\n");
         lines.forEach((line, idx) => {
-          enqueue(getBlock(`${msg.id}-${idx}`, "think-line", line, {}));
+          const isLast = idx === lines.length - 1;
+          enqueue(getBlock(`${msg.id}-${idx}`, "think-line", line, {}), isLast);
         });
         if (!msg.isStreaming) {
           flushPending();
-          completedBlocks.push({ key: `${msg.id}-footer-padding`, msg, type: "think-footer-padding", text: "" });
+          completedBlocks.push({ key: `${msg.id}-footer-padding`, type: "think-footer-padding", text: "" });
         }
       } else {
         const lines = text.split("\n");
         let inTable = false;
         let tableLines = [];
         let inCodeBlock = false;
+        let currentLang = "";
         let codeLineNum = 0;
         let codeStartIdx = 0;
         lines.forEach((line, idx) => {
@@ -2724,17 +2749,17 @@ var init_text = __esm({
           if (inCodeBlock) {
             if (isCodeBlockMarker) {
               inCodeBlock = false;
-              enqueue(getBlock(`${msg.id}-code-close-${codeStartIdx}`, "code-fence-close", "", {}));
+              enqueue(getBlock(`${msg.id}-code-close-${codeStartIdx}`, "code-fence-close", "", {}), isLast);
             } else {
               codeLineNum++;
-              enqueue(getBlock(`${msg.id}-code-line-${idx}`, "code-line", line, { lineNum: codeLineNum }));
+              enqueue(getBlock(`${msg.id}-code-line-${idx}`, "code-line", line, { lineNum: codeLineNum, lang: currentLang }), isLast);
             }
           } else if (isCodeBlockMarker) {
             inCodeBlock = true;
             codeStartIdx = idx;
             codeLineNum = 0;
-            const lang = line.trim().replace(/^```/, "").trim();
-            enqueue(getBlock(`${msg.id}-code-open-${idx}`, "code-fence-open", lang, {}));
+            currentLang = line.trim().replace(/^```/, "").trim();
+            enqueue(getBlock(`${msg.id}-code-open-${idx}`, "code-fence-open", currentLang, {}), isLast);
           } else if (isTableRow) {
             inTable = true;
             tableLines.push(line);
@@ -2753,7 +2778,7 @@ var init_text = __esm({
               inTable = false;
               tableLines = [];
             }
-            enqueue(getBlock(`${msg.id}-${idx}`, "agent-line", line, {}));
+            enqueue(getBlock(`${msg.id}-${idx}`, "agent-line", line, {}), isLast);
           }
         });
         if (!msg.isStreaming && msg.workedDuration) {
@@ -2764,7 +2789,6 @@ var init_text = __esm({
       if (msg.isStreaming && pendingChunk.length > 0) {
         activeBlock = pendingChunk.length === 1 ? pendingChunk[0] : {
           key: `${msg.id || "x"}-chunk-active-${pendingChunk[0].key}`,
-          msg,
           type: "chunk",
           blocks: pendingChunk
         };
@@ -2823,24 +2847,8 @@ var init_text = __esm({
     };
     REGEX_INITIAL_THINK = /<\/think>(\r?\n){2}/gi;
     REGEX_INITIAL_TOOL = /(\r?\n){2}(?=\[?(?:tool:functions|tool\.functions|\s*turn\s*:))/gi;
-    REGEX_SYSTEM = /\[SYSTEM\][\s\S]*?\[\/SYSTEM\]/gi;
-    REGEX_THINK = /<(think|thought)>[\s\S]*?(?:<\/(think|thought)>|$)/gi;
-    REGEX_ANSWER = /\[ANSWER\][\s\S]*?(?:\[\/ANSWER\]|$)/gi;
-    REGEX_TOOL_RES = /\[TOOL RESULT\]:?\s*/gi;
-    REGEX_SUCCESS_ERROR = /^\s*(SUCCESS|ERROR):.*(\r?\n)?/gm;
-    REGEX_TURN_1 = /\[\s*turn\s*:\s*(continue|finish)\s*\]/gi;
-    REGEX_END = /\[\[END\]\]/gi;
-    REGEX_TURN_2 = /\[\s*turn\s*:?.*?$/gi;
-    REGEX_TURN_3 = /\n\s*turn\s*:?.*?$/gi;
-    REGEX_OPEN_BRACKET = /\[\s*$/gi;
-    REGEX_RESPONDED = /\n\nResponded on .*/g;
-    REGEX_PROMPTED = /\n\n\[Prompted on: .*\]/g;
-    REGEX_ARROWS = /(\$?\\?\/?\\rightarrow\$?|\$\\rightarrow\$)/gi;
-    REGEX_ARROWS_L = /(\$?\\?\/?\\leftarrow\$?|\$\\leftarrow\$)/gi;
-    REGEX_ARROWS_U = /(\$?\\?\/?\\uparrow\$?|\$\\uparrow\$)/gi;
-    REGEX_ARROWS_D = /(\$?\\?\/?\\downarrow\$?|\$\\downarrow\$)/gi;
-    REGEX_ARROWS_LR = /(\$?\\?\/?\\leftrightarrow\$?|\$\\leftrightarrow\$)/gi;
-    REGEX_TERMINAL = /@\[TerminalName:.*?, ProcessId:.*?\]/gi;
+    REGEX_CLEAN_SIGNALS = /\[SYSTEM\][\s\S]*?\[\/SYSTEM\]|<(think|thought)>[\s\S]*?(?:<\/(think|thought)>|$)|\[ANSWER\][\s\S]*?(?:\[\/ANSWER\]|$)|\[TOOL RESULT\]:?\s*|^\s*(SUCCESS|ERROR):.*(\r?\n)?|\[\s*turn\s*:\s*(continue|finish)\s*\]|\[\[END\]\]|\[\s*turn\s*:?.*?$|\n\s*turn\s*:?.*?$|\[\s*$|\n\nResponded on .*|\n\n\[Prompted on: .*\]|@\[TerminalName:.*?, ProcessId:.*?\]/gmi;
+    REGEX_ARROWS_ALL = /(\$?\\?\/?\\rightarrow\$?|\$\\rightarrow\$)|(\$?\\?\/?\\leftarrow\$?|\$\\leftarrow\$)|(\$?\\?\/?\\uparrow\$?|\$\\uparrow\$)|(\$?\\?\/?\\downarrow\$?|\$\\downarrow\$)|(\$?\\?\/?\\leftrightarrow\$?|\$\\leftrightarrow\$)/gi;
     REGEX_TOOLS = /\b(write_file|update_file|read_folder|view_file|exec_command|web_search|web_scrape|search_keyword|write_pdf|write_docx|generate_image)\b/gi;
     cleanSignals = (text) => {
       if (!text) return text;
@@ -2898,7 +2906,18 @@ var init_text = __esm({
           }
         }
       }
-      return result.replaceAll(REGEX_SYSTEM, "").replaceAll(REGEX_THINK, "").replace(REGEX_ANSWER, "").replaceAll(REGEX_TOOL_RES, "").replaceAll(REGEX_SUCCESS_ERROR, "").replaceAll(REGEX_TURN_1, "").replaceAll(REGEX_END, "").replaceAll(REGEX_TURN_2, "").replaceAll(REGEX_TURN_3, "").replaceAll(REGEX_OPEN_BRACKET, "").replaceAll(REGEX_RESPONDED, "").replaceAll(REGEX_PROMPTED, "").replaceAll(REGEX_ARROWS, "\u2192").replaceAll(REGEX_ARROWS_L, "\u2190").replaceAll(REGEX_ARROWS_U, "\u2191").replaceAll(REGEX_ARROWS_D, "\u2193").replaceAll(REGEX_ARROWS_LR, "\u2194").replaceAll(REGEX_TERMINAL, "").replaceAll(REGEX_TOOLS, (match) => TOOL_LABELS[match.toLowerCase()] || match).trim();
+      result = result.replace(REGEX_CLEAN_SIGNALS, "");
+      result = result.replace(REGEX_ARROWS_ALL, (match) => {
+        const lower = match.toLowerCase();
+        if (lower.includes("leftrightarrow")) return "\u2194";
+        if (lower.includes("rightarrow")) return "\u2192";
+        if (lower.includes("leftarrow")) return "\u2190";
+        if (lower.includes("uparrow")) return "\u2191";
+        if (lower.includes("downarrow")) return "\u2193";
+        return match;
+      });
+      result = result.replace(REGEX_TOOLS, (match) => TOOL_LABELS[match.toLowerCase()] || match);
+      return result.trim();
     };
     clearBlocksCache = () => {
       blocksCache.clear();
@@ -3512,7 +3531,7 @@ var init_MultilineInput = __esm({
               } else {
                 pasteTimerRef.current = setTimeout(() => {
                   finalizePasteTransaction();
-                }, 100);
+                }, 80);
               }
             } else {
               adjustPasteBlocksOnEdit(curIdx, cleanInput.length);
@@ -3672,14 +3691,13 @@ var init_TerminalBox = __esm({
         return resultLines.join("\n");
       };
       const cleanOutput = processPTY(output).replace(/\n{3,}/g, "\n\n");
-      const displayOutput = isPty ? cleanOutput : cleanOutput ? wrapText(cleanOutput, columns - 6) : "";
+      const rawLines = isPty ? cleanOutput ? cleanOutput.split("\n") : [] : cleanOutput ? wrapText(cleanOutput, columns - 6) : [];
       const [isExpanded, setIsExpanded] = useState3(false);
       useInput2((input, key) => {
         if (isFocused && key.ctrl && (input === "o" || input === "")) {
           setIsExpanded((prev) => !prev);
         }
       }, { isActive: isFocused });
-      const rawLines = displayOutput ? displayOutput.split("\n") : [];
       const limit = Math.max(5, completed ? terminalHeight - 10 : terminalHeight - 20);
       const hasCollapsibleContent = rawLines.length > limit;
       const collapsedCount = rawLines.length - limit;
@@ -3982,7 +4000,7 @@ ${coloredArt[7]}`;
 import React4, { useState as useState4, useEffect as useEffect3, useRef as useRef2 } from "react";
 import { Box as Box3, Text as Text4 } from "ink";
 import { diffWordsWithSpace } from "diff";
-var useStreamingText, formatThinkText, REGEX_MD_TOKENS, REGEX_LATEX_FRAC, REGEX_LATEX_STYLE, parseMathSymbols, renderLatexText, InlineMarkdown, TableRenderer, MarkdownText, DiffLine, DiffBlock, CodeRenderer, formatThinkingDuration, MessageItem, BlockItem, ChatLayout;
+var useStreamingText, formatThinkText, REGEX_MD_TOKENS, REGEX_LATEX_FRAC, REGEX_LATEX_STYLE, parseMathSymbols, SYNTAX_KEYWORDS, SYNTAX_RULES, REGEX_SYNTAX, tokenCache, MAX_TOKEN_CACHE_SIZE, tokenizeLine, renderHighlightedLine, renderLatexText, InlineMarkdown, TableRenderer, MarkdownText, DiffLine, DiffBlock, CodeRenderer, formatThinkingDuration, MessageItem, BlockItem, ChatLayout;
 var init_ChatLayout = __esm({
   "src/components/ChatLayout.jsx"() {
     init_TerminalBox();
@@ -4023,6 +4041,74 @@ var init_ChatLayout = __esm({
     parseMathSymbols = (content) => {
       return content.replace(/\\multiply|\\mul|\\times/g, "\xD7").replace(/\\div/g, "\xF7").replace(/\\cdot/g, "\u22C5").replace(/\\infty/g, "\u221E").replace(/\\pm/g, "\xB1").replace(/\\leq/g, "\u2264").replace(/\\geq/g, "\u2265").replace(/\\neq/g, "\u2260").replace(/\\sqrt\s*\{([^}]+)\}/g, "\u221A($1)").replace(/\\sqrt\s*(\w+|\d+)/g, "\u221A($1)").replace(/\\alpha/g, "\u03B1").replace(/\\beta/g, "\u03B2").replace(/\\theta/g, "\u03B8").replace(/\\pi/g, "\u03C0").replace(/\\approx/g, "\u2248").replace(/\\Delta/g, "\u0394").replace(/\\sigma/g, "\u03C3").replace(/\\sum/g, "\u03A3").replace(/\\prod/g, "\u03A0").replace(/\\rightarrow|\\to/g, "\u2192").replace(/\\left\b|\\right\b/g, "").replace(/\\left\(|\\right\)/g, (match) => match.includes("left") ? "(" : ")").replace(/\\left\[|\\right\]/g, (match) => match.includes("left") ? "[" : "]").replace(/\\\{|\\\}/g, (match) => match.includes("{") ? "{" : "}").replace(/\\text\s*\{([^}]+)\}/g, "$1").replace(/\\text\s+(\w+)/g, "$1").replace(/\\%/g, "%");
     };
+    SYNTAX_KEYWORDS = /\b(const|let|var|function|return|if|else|for|while|do|switch|case|break|continue|import|export|from|default|class|extends|new|this|typeof|instanceof|try|catch|finally|throw|async|await|yield|public|private|protected|static|void|int|float|double|char|bool|boolean|def|elif|fn|pub|mut|struct|impl|enum|type|interface|package|namespace|using|include|define|nil|None|self|lambda)\b/;
+    SYNTAX_RULES = [
+      // Include paths
+      /((?<=\binclude\s+)(?:<[^>]+>|"[^"]+"))/.source,
+      // Import paths
+      /((?<=\b(?:from|import|require\s*\(\s*)\s*)(?:'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"))/.source,
+      // Comments
+      /(\/\/.*|#.*)/.source,
+      // Strings
+      /("(?:\\.|[^"\\])*"|'(?:\\.|[^'\\])*'|`(?:\\.|[^\`\\])*`)/.source,
+      SYNTAX_KEYWORDS.source,
+      /\b([a-zA-Z_][a-zA-Z0-9_]*)(?=\s*\()/.source,
+      /\b(true|false|null|undefined|nil|None)\b/.source,
+      /\b(\d+(?:\.\d+)?|0x[0-9a-fA-F]+)\b/.source
+    ];
+    REGEX_SYNTAX = new RegExp(SYNTAX_RULES.join("|"), "g");
+    tokenCache = /* @__PURE__ */ new Map();
+    MAX_TOKEN_CACHE_SIZE = 1e3;
+    tokenizeLine = (line, lang) => {
+      if (!line) return [];
+      const cacheKey = `${lang}:${line}`;
+      if (tokenCache.has(cacheKey)) {
+        return tokenCache.get(cacheKey);
+      }
+      let lastIndex = 0;
+      const tokens = [];
+      let match;
+      REGEX_SYNTAX.lastIndex = 0;
+      while ((match = REGEX_SYNTAX.exec(line)) !== null) {
+        const matchText = match[0];
+        const matchIndex = match.index;
+        if (matchIndex > lastIndex) {
+          tokens.push({ text: line.substring(lastIndex, matchIndex) });
+        }
+        let color = void 0;
+        let bold = false;
+        if (match[1] || match[2]) {
+          color = "#ce9178";
+        } else if (match[3]) {
+          color = "#9ece6a";
+        } else if (match[4]) {
+          color = "#fcfca4";
+        } else if (match[5]) {
+          color = "#ff7b72";
+          bold = true;
+        } else if (match[6]) {
+          color = "#b392f0";
+        } else if (match[7] || match[8]) {
+          color = "#ff9e64";
+        }
+        tokens.push({ text: matchText, color, bold });
+        lastIndex = REGEX_SYNTAX.lastIndex;
+      }
+      if (lastIndex < line.length) {
+        tokens.push({ text: line.substring(lastIndex) });
+      }
+      if (tokenCache.size >= MAX_TOKEN_CACHE_SIZE) {
+        const firstKey = tokenCache.keys().next().value;
+        tokenCache.delete(firstKey);
+      }
+      tokenCache.set(cacheKey, tokens);
+      return tokens;
+    };
+    renderHighlightedLine = (line, lang, defaultColor = void 0) => {
+      if (!line) return /* @__PURE__ */ React4.createElement(Text4, null, " ");
+      const tokens = tokenizeLine(line, lang);
+      return /* @__PURE__ */ React4.createElement(Text4, { color: defaultColor }, tokens.map((token, idx) => /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: token.color || defaultColor, bold: token.bold }, token.text)));
+    };
     renderLatexText = (content, key) => {
       if (!content) return null;
       let formatted = content.replace(REGEX_LATEX_FRAC, "($1/$2)");
@@ -4169,15 +4255,16 @@ var init_ChatLayout = __esm({
           } else {
             content = wrapText(trimmed, columns - 4);
           }
+          const linesOfContent = content.split("\n");
           result.push(
-            /* @__PURE__ */ React4.createElement(Box3, { key: i, width: "100%" }, /* @__PURE__ */ React4.createElement(InlineMarkdown, { text: content, color, italic }))
+            /* @__PURE__ */ React4.createElement(Box3, { key: i, flexDirection: "column", width: "100%" }, linesOfContent.map((l, lIdx) => /* @__PURE__ */ React4.createElement(InlineMarkdown, { key: lIdx, text: l, color, italic })))
           );
         }
       });
       flushBuffers("final");
       return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", width: columns - 2 }, result);
     });
-    DiffLine = React4.memo(({ line, pairContent, parentText, columns = 80 }) => {
+    DiffLine = React4.memo(({ line, pairContent, parentText, columns = 80, extension }) => {
       const isContext = line.includes("[UI_CONTEXT]");
       const cleanLine = line.replace("[UI_CONTEXT]", "");
       if (isContext && cleanLine.includes("\u2550")) {
@@ -4189,37 +4276,6 @@ var init_ChatLayout = __esm({
       }
       const { isR: isRemoval, isA: isAddition, num: lineNum, content } = parsedCurrent;
       let finalPairContent = pairContent;
-      if (!finalPairContent && parentText && (isRemoval || isAddition)) {
-        const match = parentText.match(/\[DIFF_START\]([\s\S]*?)(?:\[DIFF_END\]|$)/);
-        const diffBody = match ? match[1].trim() : "";
-        const diffLines = diffBody.split("\n").map((l) => l.replace(/\r$/, ""));
-        const parsedLines = diffLines.map((l) => {
-          return {
-            line: l,
-            parsed: parseLineInfo(l),
-            pairContent: null
-          };
-        });
-        let currentGroup = [];
-        for (let idx = 0; idx < parsedLines.length; idx++) {
-          const item = parsedLines[idx];
-          if (item.parsed && (item.parsed.isR || item.parsed.isA)) {
-            currentGroup.push(item);
-          } else {
-            if (currentGroup.length > 0) {
-              alignChangeGroup(currentGroup);
-              currentGroup = [];
-            }
-          }
-        }
-        if (currentGroup.length > 0) {
-          alignChangeGroup(currentGroup);
-        }
-        const matchedItem = parsedLines.find((item) => item.parsed && item.parsed.num === lineNum && item.parsed.isR === isRemoval);
-        if (matchedItem) {
-          finalPairContent = matchedItem.pairContent;
-        }
-      }
       let words = [];
       if (finalPairContent !== void 0 && finalPairContent !== null) {
         const oldStr = isRemoval ? content : finalPairContent;
@@ -4238,19 +4294,21 @@ var init_ChatLayout = __esm({
       const displayPrefix = isRemoval ? "-" : isAddition ? "+" : " ";
       const renderInlineDiff = () => {
         if (isPureUnpairedBlock) {
-          const blockColor = isRemoval ? "#ff3333" : "#33ff66";
-          return /* @__PURE__ */ React4.createElement(Text4, { color: blockColor }, wrapText(content, columns - 14));
+          const blockColor = isRemoval ? "#ffdddd" : "#ddffdd";
+          const wrappedLines = wrapText(content, columns - 14).split("\n");
+          return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column" }, wrappedLines.map((wl, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx }, renderHighlightedLine(wl, extension, blockColor))));
         }
         if (!(isRemoval || isAddition) || words.length === 0 || !hasInlineChange) {
           const textColor = isRemoval ? "#885555" : isAddition ? "#558866" : "gray";
-          return /* @__PURE__ */ React4.createElement(Text4, { color: textColor }, wrapText(content, columns - 14));
+          const wrappedLines = wrapText(content, columns - 14).split("\n");
+          return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column" }, wrappedLines.map((wl, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx }, renderHighlightedLine(wl, extension, textColor))));
         }
         return /* @__PURE__ */ React4.createElement(Text4, { wrap: "anywhere" }, words.map((part, idx) => {
           const isWhitespace = /^\s+$/.test(part.value);
           if (isRemoval) {
             const isSurroundedByRemoval = words[idx - 1]?.removed || words[idx + 1]?.removed;
             if (part.removed || isWhitespace && isSurroundedByRemoval) {
-              return /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: "#ff3333" }, part.value);
+              return /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: "#ff3333", backgroundColor: "#5a1818" }, part.value);
             }
             if (part.added) return null;
             return /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: "#885555" }, part.value);
@@ -4258,7 +4316,7 @@ var init_ChatLayout = __esm({
           if (isAddition) {
             const isSurroundedByAddition = words[idx - 1]?.added || words[idx + 1]?.added;
             if (part.added || isWhitespace && isSurroundedByAddition) {
-              return /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: "#33ff66" }, part.value);
+              return /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: "#33ff66", backgroundColor: "#185a25" }, part.value);
             }
             if (part.removed) return null;
             return /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: "#558866" }, part.value);
@@ -4268,8 +4326,8 @@ var init_ChatLayout = __esm({
       };
       return /* @__PURE__ */ React4.createElement(Box3, { backgroundColor: "#1a1a1a", paddingX: 1, width: columns }, /* @__PURE__ */ React4.createElement(Box3, { width: 3, flexShrink: 0, justifyContent: "flex-end" }, /* @__PURE__ */ React4.createElement(Text4, { color: finalNumColor }, lineNum)), /* @__PURE__ */ React4.createElement(Box3, { width: 1, flexShrink: 0, marginLeft: 1 }, /* @__PURE__ */ React4.createElement(Text4, { color: finalPrefixColor }, displayPrefix)), /* @__PURE__ */ React4.createElement(Box3, { marginLeft: 1, backgroundColor: innerBgColor, flexShrink: 1 }, renderInlineDiff()));
     });
-    DiffBlock = React4.memo(({ text, columns = 80 }) => {
-      const match = text.match(/\[DIFF_START\]([\s\S]*?)\[DIFF_END\]/);
+    DiffBlock = React4.memo(({ text, columns = 80, extension }) => {
+      const match = text.match(/\[DIFF_START\]([\s\S]*?)(?:\[DIFF_END\]|$)/);
       const diffBody = match ? match[1].trim() : "";
       const diffLines = diffBody.split("\n");
       const parsedLines = diffLines.map((line) => {
@@ -4300,14 +4358,20 @@ var init_ChatLayout = __esm({
           key: i,
           line: item.line,
           pairContent: item.pairContent,
-          columns: columns - 3
+          columns: columns - 3,
+          extension
         }
       )), /* @__PURE__ */ React4.createElement(Box3, { backgroundColor: "#1a1a1a", paddingX: 1, width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: 3, flexShrink: 0 }), /* @__PURE__ */ React4.createElement(Box3, { width: 1, flexShrink: 0, marginLeft: 1 }), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1, marginLeft: 1 }, /* @__PURE__ */ React4.createElement(Text4, null, " ")))));
     });
     CodeRenderer = React4.memo(({ text, columns = 80 }) => {
       if (!text) return null;
+      let extension = "";
+      const fileMatch = text.match(/File\s+\[(.*?)\]/i);
+      if (fileMatch) {
+        extension = fileMatch[1].split(".").pop().toLowerCase();
+      }
       if (text.includes("[DIFF_START]")) {
-        return /* @__PURE__ */ React4.createElement(DiffBlock, { text, columns });
+        return /* @__PURE__ */ React4.createElement(DiffBlock, { text, columns, extension });
       }
       if (text.includes("- Content Preview:")) {
         const mainParts = text.split("- Content Preview:");
@@ -4335,7 +4399,7 @@ var init_ChatLayout = __esm({
             marginBottom: 1,
             backgroundColor: "#1a1a1a"
           },
-          /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, null, " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, null, " "))), codeLines.map((line, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx, width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray", dimColor: true }, String(idx + 1).padStart(gutterWidth, " "), " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, { color: "white" }, line)))), /* @__PURE__ */ React4.createElement(Box3, { width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, null, " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, null, " "))))
+          /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, null, " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, null, " "))), codeLines.map((line, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx, width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray", dimColor: true }, String(idx + 1).padStart(gutterWidth, " "), " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, renderHighlightedLine(line, extension, "white")))), /* @__PURE__ */ React4.createElement(Box3, { width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, null, " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, null, " "))))
         ));
       }
       if (text.includes("```")) {
@@ -4364,7 +4428,7 @@ var init_ChatLayout = __esm({
                 width: "100%"
               },
               /* @__PURE__ */ React4.createElement(Box3, { marginBottom: 1 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray", bold: true }, "\u25B6_ ", lang.toUpperCase() || "CODE")),
-              /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", width: "100%" }, codeLines.map((line, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx, width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray" }, String(idx + 1).padStart(gutterWidth, " "), " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, { color: "#fcfca4ff" }, line)))))
+              /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", width: "100%" }, codeLines.map((line, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx, width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray" }, String(idx + 1).padStart(gutterWidth, " "), " ")), /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, renderHighlightedLine(line, lang, "#e1e4e8")))))
             );
           }
           let cleanPart = part;
@@ -4556,7 +4620,7 @@ var init_ChatLayout = __esm({
       );
     });
     BlockItem = React4.memo(({ block, columns = 80, showFullThinking, aiProvider, version }) => {
-      const { msg, type, text, isStreaming } = block;
+      const { msg, type, text, isStreamingMsg, workedDuration } = block;
       if (type === "chunk") {
         return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", width: "100%" }, block.blocks.map((b) => /* @__PURE__ */ React4.createElement(
           BlockItem,
@@ -4583,14 +4647,14 @@ var init_ChatLayout = __esm({
         );
       }
       if (type === "think-header") {
-        return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", paddingX: 1, width: "100%", marginTop: 0, marginBottom: 0 }, msg.isStreaming ? /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: "white" }, "\u2727 Thinking...") : /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: "white" }, "\u2726 Thought..."), showFullThinking && /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "row", width: "100%" }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray" }, "\u2502 ")));
+        return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", paddingX: 1, width: "100%", marginTop: 0, marginBottom: 0 }, isStreamingMsg ? /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: "white" }, "\u2727 Thinking...") : /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: "white" }, "\u2726 Thought..."), showFullThinking && /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "row", width: "100%" }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray" }, "\u2502 ")));
       }
       if (type === "think-line") {
         if (!showFullThinking) return null;
         if (!text || text.trim() === "") {
           return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "row", width: "100%", paddingX: 1 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray" }, "\u2502 "));
         }
-        const animatedText = useStreamingText(text, msg.isStreaming, block.isActiveBlock);
+        const animatedText = useStreamingText(text, isStreamingMsg, block.isActiveBlock);
         const trimmed = animatedText.trim();
         const isUnordered = /^[\*\-\+]\s/.test(trimmed);
         const isOrdered = /^\d+\.\s/.test(trimmed);
@@ -4614,7 +4678,7 @@ var init_ChatLayout = __esm({
         if (!text || text.trim() === "") {
           return /* @__PURE__ */ React4.createElement(Box3, { height: 1 });
         }
-        const animatedText = useStreamingText(text, msg.isStreaming, block.isActiveBlock);
+        const animatedText = useStreamingText(text, isStreamingMsg, block.isActiveBlock);
         return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", paddingX: 1, width: "100%" }, /* @__PURE__ */ React4.createElement(CodeRenderer, { text: animatedText, columns }));
       }
       if (type === "table") {
@@ -4628,7 +4692,7 @@ var init_ChatLayout = __esm({
           {
             line: text,
             pairContent: block.pairContent,
-            parentText: msg?.text,
+            parentText: void 0,
             columns
           }
         ), isLastLine && renderPaddingLine(true));
@@ -4647,7 +4711,7 @@ var init_ChatLayout = __esm({
         return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", marginTop: 1, width: "100%" }, /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "row", ...borderProps }, /* @__PURE__ */ React4.createElement(Text4, null, " ")), /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "row", ...borderProps }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray", bold: true }, "\u25B6_ ", (text || "CODE").toUpperCase())));
       }
       if (type === "code-line") {
-        const { lineNum } = block;
+        const { lineNum, lang } = block;
         return /* @__PURE__ */ React4.createElement(
           Box3,
           {
@@ -4662,7 +4726,7 @@ var init_ChatLayout = __esm({
             width: "100%"
           },
           /* @__PURE__ */ React4.createElement(Box3, { width: 4, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray", dimColor: true }, String(lineNum).padStart(3, " "), " ")),
-          /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, { color: "#fcfca4ff" }, text))
+          /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, renderHighlightedLine(text, lang, "#e1e4e8"))
         );
       }
       if (type === "code-fence-close") {
@@ -4687,7 +4751,7 @@ var init_ChatLayout = __esm({
         return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", paddingX: 1, width: columns }, /* @__PURE__ */ React4.createElement(MarkdownText, { text, columns }));
       }
       if (type === "write-line") {
-        const { gutterWidth, lineNum, isFirstLine, isLastLine } = block;
+        const { gutterWidth, lineNum, isFirstLine, isLastLine, extension, wrappedLines } = block;
         const renderPaddingLine = (isEnd = false) => /* @__PURE__ */ React4.createElement(
           Box3,
           {
@@ -4723,14 +4787,14 @@ var init_ChatLayout = __esm({
             backgroundColor: "#1a1a1a"
           },
           /* @__PURE__ */ React4.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray", dimColor: true }, String(lineNum).padStart(gutterWidth, " "), " ")),
-          /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React4.createElement(Text4, { color: "white" }, text))
+          /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1, flexDirection: "column" }, (wrappedLines || [text]).map((wl, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx }, renderHighlightedLine(wl, extension, "white"))))
         ), isLastLine && renderPaddingLine(true));
       }
       if (type === "write-footer") {
         return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column", paddingX: 1, width: columns, marginTop: 1, marginBottom: 1 }, /* @__PURE__ */ React4.createElement(MarkdownText, { text, columns }));
       }
       if (type === "worked-duration") {
-        return /* @__PURE__ */ React4.createElement(Box3, { marginTop: 1, marginBottom: 2, paddingX: 1, width: "100%" }, /* @__PURE__ */ React4.createElement(Text4, null, "["), /* @__PURE__ */ React4.createElement(Text4, { color: "gray" }, "Worked for ", /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: "white" }, formatThinkingDuration(msg.workedDuration))), /* @__PURE__ */ React4.createElement(Text4, null, "]"));
+        return /* @__PURE__ */ React4.createElement(Box3, { marginTop: 1, marginBottom: 2, paddingX: 1, width: "100%" }, /* @__PURE__ */ React4.createElement(Text4, null, "["), /* @__PURE__ */ React4.createElement(Text4, { color: "gray" }, "Worked for ", /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: "white" }, formatThinkingDuration(workedDuration))), /* @__PURE__ */ React4.createElement(Text4, null, "]"));
       }
       return null;
     });
@@ -4779,7 +4843,7 @@ var init_StatusBar = __esm({
         getMemoryInfo();
         const interval = setInterval(() => {
           getMemoryInfo();
-        }, 3e3);
+        }, 3e4);
         return () => clearInterval(interval);
       }, []);
       let maxLimit = 256e3;
@@ -5731,7 +5795,7 @@ function SettingsMenu({
     getMemoryStats();
     const interval = setInterval(() => {
       getMemoryStats();
-    }, 5e3);
+    }, 3e4);
     return () => clearInterval(interval);
   }, []);
   const getCategoryItems = (catId) => {
@@ -11218,6 +11282,7 @@ Provide a consolidated summary of the entire session.`;
           });
           return result;
         };
+        yield { type: "status", content: "[start]" };
         yield { type: "status", content: "Gathering Context..." };
         await new Promise((resolve) => setTimeout(resolve, 500));
         const totalFolders = countFolders(process.cwd());
@@ -13318,6 +13383,7 @@ Error Log can be found in ${path19.join(LOGS_DIR, "agent", "error.log")}`);
             } else {
               modifiedHistory.push({ role: "agent", text: cleanedFullResponse });
             }
+            yield { type: "status", content: "[end]" };
           }
           if (isActuallyFinished) break;
           const nextAgentMsg = cleanedTurnText.trim() || "*Working...*";
@@ -14406,6 +14472,7 @@ import TextInput4 from "ink-text-input";
 import SelectInput2 from "ink-select-input";
 import gradient2 from "gradient-string";
 function App({ args = [] }) {
+  let lastGCTime = 1;
   const [confirmExit, setConfirmExit] = useState14(false);
   const [exitCountdown, setExitCountdown] = useState14(10);
   const { stdout } = useStdout2();
@@ -14436,9 +14503,25 @@ function App({ args = [] }) {
         setShowBridgePromo(false);
       }
     }, 1e3);
+    lastGCTime = Date.now();
+    const memInterval = setInterval(() => {
+      if (lastGCTime) {
+        const diff = Date.now() - lastGCTime || 0;
+        if (diff > 3e4) {
+          if (global.gc) {
+            try {
+              global.gc();
+              lastGCTime = Date.now();
+            } catch (e) {
+            }
+          }
+        }
+      }
+    }, 3e3);
     return () => {
       clearTimeout(graceTimer);
       clearInterval(interval);
+      clearInterval(memInterval);
     };
   }, []);
   const parsedArgs = useMemo2(() => {
@@ -14707,6 +14790,7 @@ function App({ args = [] }) {
   const PLAYGROUND_CHAT_ID = "flow-playground";
   const [chatId, setChatId] = useState14(args.includes("--playground") ? PLAYGROUND_CHAT_ID : generateChatId());
   useEffect11(() => {
+    if (chatLoadingRef.current) return;
     const nextTokens = sessionTotalTokens - chatTokenStartRef.current;
     setChatTokens(nextTokens);
     if (chatId) {
@@ -14854,6 +14938,8 @@ function App({ args = [] }) {
   const [statusText, setStatusText] = useState14(null);
   const [wittyPhrase, setWittyPhrase] = useState14("");
   const [hasPasteBlock, setHasPasteBlock] = useState14(false);
+  const [activeTime, setActiveTime] = useState14(0);
+  let interval_for_timer;
   useEffect11(() => {
     let interval;
     if (statusText) {
@@ -14866,7 +14952,9 @@ function App({ args = [] }) {
     } else {
       setWittyPhrase("");
     }
-    return () => clearInterval(interval);
+    return () => {
+      clearInterval(interval);
+    };
   }, [statusText]);
   const [isSpinnerActive, setIsSpinnerActive] = useState14(true);
   const [isProcessing, setIsProcessing] = useState14(false);
@@ -14876,6 +14964,14 @@ function App({ args = [] }) {
   const [escPressCount, setEscPressCount] = useState14(0);
   const [recentPrompts, setRecentPrompts] = useState14([]);
   const escDoubleTimerRef = useRef3(null);
+  const chatLoadingRef = useRef3(false);
+  useEffect11(() => {
+    return () => {
+      if (escDoubleTimerRef.current) {
+        clearTimeout(escDoubleTimerRef.current);
+      }
+    };
+  }, []);
   const didSignalTerminationRef = useRef3(false);
   const [queuedPrompt, setQueuedPrompt] = useState14(null);
   const [resolutionData, setResolutionData] = useState14(null);
@@ -14959,7 +15055,9 @@ function App({ args = [] }) {
     completedIndex: 0,
     columns: 0,
     historicalBlocks: [],
-    seenSelections: /* @__PURE__ */ new Set()
+    seenSelections: /* @__PURE__ */ new Set(),
+    chatId: "",
+    clearKey: 0
   });
   const parsedBlocks = useMemo2(() => {
     const columns = terminalSize.columns || 80;
@@ -14968,7 +15066,9 @@ function App({ args = [] }) {
     let seenAskSelections = /* @__PURE__ */ new Set();
     const isResize = cachedHistoryRef.current.columns !== columns;
     const isClear = completedIndex < cachedHistoryRef.current.completedIndex;
-    if (isResize || isClear) {
+    const isChatChanged = cachedHistoryRef.current.chatId !== chatId;
+    const isClearKeyChanged = cachedHistoryRef.current.clearKey !== clearKey;
+    if (isResize || isClear || isChatChanged || isClearKeyChanged) {
       const completedMsgs = messages.slice(0, completedIndex);
       for (let i = 0; i < completedMsgs.length; i++) {
         const msg = completedMsgs[i];
@@ -14988,7 +15088,9 @@ function App({ args = [] }) {
         completedIndex,
         columns,
         historicalBlocks,
-        seenSelections: new Set(seenAskSelections)
+        seenSelections: new Set(seenAskSelections),
+        chatId,
+        clearKey
       };
     } else {
       historicalBlocks = cachedHistoryRef.current.historicalBlocks;
@@ -15015,7 +15117,9 @@ function App({ args = [] }) {
           completedIndex,
           columns,
           historicalBlocks,
-          seenSelections: seenAskSelections
+          seenSelections: seenAskSelections,
+          chatId,
+          clearKey
         };
       }
     }
@@ -15035,7 +15139,10 @@ function App({ args = [] }) {
       for (let j = 0; j < parsed.completed.length; j++) streamingCompletedBlocks.push(parsed.completed[j]);
       for (let j = 0; j < parsed.active.length; j++) activeBlocks.push(parsed.active[j]);
     }
-    const finalCompleted = historicalBlocks.concat(streamingCompletedBlocks);
+    const finalCompleted = [...historicalBlocks];
+    for (let j = 0; j < streamingCompletedBlocks.length; j++) {
+      finalCompleted.push(streamingCompletedBlocks[j]);
+    }
     if (finalCompleted.length >= 75e3) {
       finalCompleted.push({
         key: `memory-warning-block-${finalCompleted.length}`,
@@ -15052,7 +15159,7 @@ function App({ args = [] }) {
       completed: finalCompleted,
       active: activeBlocks
     };
-  }, [messages, completedIndex, terminalSize.columns]);
+  }, [messages, completedIndex, terminalSize.columns, clearKey, chatId]);
   const isTerminalWaitingForInput = useMemo2(() => {
     if (!activeCommand || !execOutput) return false;
     const lastChunk = execOutput.trim();
@@ -15184,10 +15291,18 @@ function App({ args = [] }) {
         setConfirmExit(false);
         return;
       }
-      if (isProcessing || activeCommand) {
+      if (isProcessing || activeCommand || pendingApproval || pendingAsk) {
         didSignalTerminationRef.current = true;
         signalTermination();
         terminateActiveCommand();
+        if (pendingApproval) {
+          pendingApproval.resolve("deny");
+          setPendingApproval(null);
+        }
+        if (pendingAsk) {
+          pendingAsk.resolve(null);
+          setPendingAsk(null);
+        }
         setEscPressed(false);
         if (escTimer) clearTimeout(escTimer);
       } else {
@@ -15421,9 +15536,11 @@ function App({ args = [] }) {
         const h = await loadHistory();
         const id = parsedArgs.resume;
         if (h[id]) {
+          chatLoadingRef.current = true;
           setChatId(id);
           const savedData = await loadChatContext(id);
           chatTokenStartRef.current = sessionTotalTokens - savedData.total;
+          chatLoadingRef.current = false;
           setChatTokens(savedData.total);
           setSessionStats({ tokens: savedData.context });
           const resumedMsgs = [...h[id].messages];
@@ -15601,7 +15718,7 @@ function App({ args = [] }) {
           lastSavedTimeRef.current += deltaSecs * 1e3;
         }
       }
-    }, 2e3);
+    }, 5e3);
     return () => clearInterval(interval);
   }, [isInitializing]);
   const COMMANDS = [
@@ -15966,9 +16083,11 @@ ${cleanText}`, color: "magenta" }];
               if (target) {
                 stdout.write("\x1B[2J\x1B[3J\x1B[H");
                 clearBlocksCache();
+                chatLoadingRef.current = true;
                 setChatId(targetId);
                 const savedData = await loadChatContext(targetId);
                 chatTokenStartRef.current = sessionTotalTokens - savedData.total;
+                chatLoadingRef.current = false;
                 setChatTokens(savedData.total);
                 setSessionStats({ tokens: savedData.context });
                 const resumedMsgs = [...target.messages];
@@ -16050,6 +16169,14 @@ ${cleanText}`, color: "magenta" }];
           setCompletedIndex(1);
           setClearKey((prev) => prev + 1);
           clearBlocksCache();
+          cachedHistoryRef.current = {
+            completedIndex: 0,
+            columns: terminalSize.columns,
+            historicalBlocks: [],
+            seenSelections: /* @__PURE__ */ new Set(),
+            chatId,
+            clearKey: clearKey + 1
+          };
           if (parsedArgs.playground) {
             parsedArgs.playground = false;
             deleteChat(PLAYGROUND_CHAT_ID).catch(() => {
@@ -16099,6 +16226,7 @@ ${cleanText}`, color: "magenta" }];
             if (global.gc) {
               try {
                 global.gc();
+                lastGCTime = Date.now();
               } catch (e) {
               }
             }
@@ -16122,6 +16250,7 @@ ${cleanText}`, color: "magenta" }];
             if (global.gc) {
               try {
                 global.gc();
+                lastGCTime = Date.now();
               } catch (e) {
               }
             }
@@ -16948,20 +17077,23 @@ Selection: ${val}`,
           let toolCallBalance = 0;
           let inToolCallString = null;
           const signalRegex = /\[?\s*turn\s*:\s*.*?\s*\]?/gi;
-          const bullyTheBug = path20.join(DATA_DIR, "padding");
           for await (const packet of stream) {
-            if (packet.type === "interactive_turn_finished") {
-              fs22.writeFileSync(bullyTheBug, "pad_0xa\n");
-            } else {
-              fs22.appendFileSync(bullyTheBug, "\r");
-              parsedBlocks.completed = [];
-            }
             if (isFirstPacket && packet.type === "text") {
               apiStart = Date.now();
               isFirstPacket = false;
             }
             if (packet.type === "status") {
               setStatusText(packet.content);
+              if (packet.content?.includes("[start]")) {
+                clearInterval(interval_for_timer);
+                setActiveTime(0);
+                interval_for_timer = setInterval(() => {
+                  setActiveTime((prev) => prev + 1);
+                }, 1e3);
+              } else if (packet.content?.includes("[end]")) {
+                setActiveTime(0);
+                clearInterval(interval_for_timer);
+              }
               if (isBridgeConnected()) {
                 sendStatus(packet.content);
               }
@@ -17001,26 +17133,39 @@ Selection: ${val}`,
               toolCallEncounteredInTurn = false;
               thinkConsumedInTurn = false;
               setMessages((prev) => {
-                const newMsgs = prev.map((m) => m.isStreaming ? { ...m, isStreaming: false } : m);
+                const newMsgs = prev.map((m) => {
+                  if (m.isStreaming) {
+                    const flatText = m.text ? (" " + m.text).slice(1) : m.text;
+                    const flatFullText = m.fullText ? (" " + m.fullText).slice(1) : m.fullText;
+                    return { ...m, isStreaming: false, text: flatText, fullText: flatFullText };
+                  }
+                  return m;
+                });
                 setCompletedIndex(newMsgs.length);
                 return newMsgs;
               });
-              setTimeout(() => {
-                if (global.gc) {
-                  try {
-                    global.gc();
-                  } catch (e) {
-                  }
+              clearBlocksCache();
+              if (global.gc) {
+                try {
+                  global.gc();
+                  setTimeout(() => {
+                    if (global.gc) global.gc();
+                    lastGCTime = Date.now();
+                  }, 100);
+                } catch (e) {
                 }
-              }, 100);
+              }
               continue;
             }
             if (packet.type === "interactive_turn_finished") {
               setIsProcessing(false);
+              setActiveTime(0);
+              clearInterval(interval_for_timer);
               if (isBridgeConnected()) {
                 sendStatus(null);
               }
               hasFiredJanitor = true;
+              clearBlocksCache();
               runJanitorTask(
                 { profile: profileData, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats, aiProvider, apiKey },
                 packet.data.agentText,
@@ -17035,6 +17180,16 @@ Selection: ${val}`,
                   onBackgroundIncrement: () => setSessionBackgroundCalls((prev) => prev + 1)
                 }
               );
+              if (global.gc) {
+                try {
+                  global.gc();
+                  setTimeout(() => {
+                    if (global.gc) global.gc();
+                    lastGCTime = Date.now();
+                  }, 150);
+                } catch (e) {
+                }
+              }
               continue;
             }
             if (packet.type === "visual_feedback") {
@@ -17149,6 +17304,10 @@ Selection: ${val}`,
             }
             let chunkText = packet.content;
             if (packet.type === "text" && chunkText.includes("Request Cancelled")) {
+              if (global.gc) {
+                global.gc();
+                lastGCTime = Date.now();
+              }
               continue;
             }
             const chunkLower = chunkText.toLowerCase();
@@ -17279,9 +17438,22 @@ Selection: ${val}`,
         } finally {
           setIsProcessing(false);
           setStatusText(null);
+          setActiveTime(0);
+          clearInterval(interval_for_timer);
           if (didSignalTerminationRef.current) {
             appendCancelMessage();
           }
+          clearBlocksCache();
+          if (global.gc) {
+            try {
+              global.gc();
+              setTimeout(() => {
+                if (global.gc) global.gc();
+                lastGCTime = Date.now();
+              }, 500);
+            } catch (e) {
+            }
+          }
           if (!hasFiredJanitor) {
             if (process.stdout.isTTY) {
               process.stdout.write("\x1B]0;FluxFlow | Idle\x07");
@@ -17312,6 +17484,9 @@ Selection: ${val}`,
             let foundLastAgent = false;
             const newMsgs = [...prev].reverse().map((m) => {
               let updated = m.isStreaming ? { ...m, isStreaming: false } : m;
+              if (updated.text) {
+                updated.text = (" " + updated.text).slice(1);
+              }
               if (!foundLastAgent && updated.role === "agent") {
                 foundLastAgent = true;
                 updated = { ...updated, workedDuration: totalDuration };
@@ -18025,24 +18200,26 @@ Selection: ${val}`,
           {
             prompts: recentPrompts,
             onSelect: async (txId) => {
+              if (stdout) {
+                stdout.write("\x1B[2J\x1B[3J\x1B[H");
+                if (stdout.isTTY) {
+                  stdout.write("\x1B[?2004h");
+                }
+              }
               try {
                 const result = await RevertManager.rollbackToBefore(txId);
                 if (result.success) {
                   const { targetPrompt } = result;
                   deleteChatSummary(chatId);
-                  if (stdout) {
-                    stdout.write("\x1B[2J\x1B[3J\x1B[H");
-                    if (stdout.isTTY) {
-                      stdout.write("\x1B[?2004h");
-                    }
-                  }
                   setClearKey((prev) => prev + 1);
                   clearBlocksCache();
                   cachedHistoryRef.current = {
                     completedIndex: 0,
-                    columns: 0,
+                    columns: terminalSize.columns,
                     historicalBlocks: [],
-                    seenSelections: /* @__PURE__ */ new Set()
+                    seenSelections: /* @__PURE__ */ new Set(),
+                    chatId,
+                    clearKey: clearKey + 1
                   };
                   const targetIdx = messages.findLastIndex(
                     (m) => m.role === "user" && m.text && (m.text.startsWith(targetPrompt) || m.text.includes(targetPrompt))
@@ -18097,9 +18274,11 @@ Selection: ${val}`,
               if (h[id]) {
                 stdout.write("\x1B[2J\x1B[3J\x1B[H");
                 clearBlocksCache();
+                chatLoadingRef.current = true;
                 setChatId(id);
                 const savedData = await loadChatContext(id);
                 chatTokenStartRef.current = sessionTotalTokens - savedData.total;
+                chatLoadingRef.current = false;
                 setChatTokens(savedData.total);
                 setSessionStats({ tokens: savedData.context });
                 const resumedMsgs = [...h[id].messages];
@@ -18311,7 +18490,7 @@ Selection: ${val}`,
           }
         )));
       default:
-        return /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", marginTop: 1, flexShrink: 0, width: "100%" }, showBtwBox && btwResponse && /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", borderStyle: "round", borderColor: "grey", paddingX: 2, paddingY: 1, width: "100%", marginBottom: 1 }, /* @__PURE__ */ React15.createElement(Box15, { justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React15.createElement(Text16, { color: "white", bold: true, underline: true }, "INQUIRY RESPONSE"), /* @__PURE__ */ React15.createElement(Text16, { color: "gray" }, "[ ESC to Close ]")), /* @__PURE__ */ React15.createElement(Box15, { marginTop: 1, width: "100%" }, /* @__PURE__ */ React15.createElement(CodeRenderer, { text: btwResponse, columns: terminalSize.columns - 6 }))), /* @__PURE__ */ React15.createElement(Box15, { paddingX: 1, marginBottom: 0, justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React15.createElement(Box15, null, statusText ? /* @__PURE__ */ React15.createElement(Box15, { gap: 1 }, /* @__PURE__ */ React15.createElement(dist_default, { colors: ["#001a1a", "#080510", "#12021c"] }, /* @__PURE__ */ React15.createElement(build_default, null)), /* @__PURE__ */ React15.createElement(Text16, { color: "gray", bold: true, italic: true }, statusText)) : /* @__PURE__ */ React15.createElement(Text16, { color: "gray", italic: true }, input.length > 0 && escPressCount ? "Press ESC again to clear input" : hasPasteBlock ? "Press CTRL + O to expand" : "Waiting for input...")), /* @__PURE__ */ React15.createElement(Box15, null, wittyPhrase && /* @__PURE__ */ React15.createElement(Text16, { color: "gray", italic: true }, wittyPhrase, " "), /* @__PURE__ */ React15.createElement(Text16, { color: "gray", bold: true }, "[ "), /* @__PURE__ */ React15.createElement(Text16, { color: "white" }, tempModelOverride || activeModel), /* @__PURE__ */ React15.createElement(Text16, { color: "gray", bold: true }, " ]"))), /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React15.createElement(Box15, { width: "100%", height: 1, overflow: "hidden" }, /* @__PURE__ */ React15.createElement(Text16, { color: "#555555" }, "\u2584".repeat(Math.max(1, terminalSize.columns)))), /* @__PURE__ */ React15.createElement(
+        return /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", marginTop: 1, flexShrink: 0, width: "100%" }, showBtwBox && btwResponse && /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", borderStyle: "round", borderColor: "grey", paddingX: 2, paddingY: 1, width: "100%", marginBottom: 1 }, /* @__PURE__ */ React15.createElement(Box15, { justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React15.createElement(Text16, { color: "white", bold: true, underline: true }, "INQUIRY RESPONSE"), /* @__PURE__ */ React15.createElement(Text16, { color: "gray" }, "[ ESC to Close ]")), /* @__PURE__ */ React15.createElement(Box15, { marginTop: 1, width: "100%" }, /* @__PURE__ */ React15.createElement(CodeRenderer, { text: btwResponse, columns: terminalSize.columns - 6 }))), /* @__PURE__ */ React15.createElement(Box15, { paddingX: 1, marginBottom: 0, justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React15.createElement(Box15, null, statusText ? /* @__PURE__ */ React15.createElement(Box15, { gap: 1 }, /* @__PURE__ */ React15.createElement(dist_default, { colors: ["#001a1a", "#080510", "#12021c"] }, /* @__PURE__ */ React15.createElement(build_default, null)), /* @__PURE__ */ React15.createElement(Text16, { color: "gray", bold: true, italic: true }, statusText), /* @__PURE__ */ React15.createElement(Text16, { color: "gray", italic: true, dimColor: true }, activeTime > 0 ? ` [${activeTime.toFixed(0)}s]` : "")) : /* @__PURE__ */ React15.createElement(Text16, { color: "gray", italic: true }, input.length > 0 && escPressCount ? "Press ESC again to clear input" : hasPasteBlock ? "Press CTRL + O to expand" : "Waiting for input...")), /* @__PURE__ */ React15.createElement(Box15, null, wittyPhrase && /* @__PURE__ */ React15.createElement(Text16, { color: "gray", italic: true }, wittyPhrase, " "), /* @__PURE__ */ React15.createElement(Text16, { color: "gray", bold: true }, "[ "), /* @__PURE__ */ React15.createElement(Text16, { color: "white" }, tempModelOverride || activeModel), /* @__PURE__ */ React15.createElement(Text16, { color: "gray", bold: true }, " ]"))), /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React15.createElement(Box15, { width: "100%", height: 1, overflow: "hidden" }, /* @__PURE__ */ React15.createElement(Text16, { color: "#555555" }, "\u2584".repeat(Math.max(1, terminalSize.columns)))), /* @__PURE__ */ React15.createElement(
           Box15,
           {
             backgroundColor: "#555555",
@@ -18348,7 +18527,7 @@ Selection: ${val}`,
         ), /* @__PURE__ */ React15.createElement(Box15, { width: "100%", height: 1, overflow: "hidden" }, /* @__PURE__ */ React15.createElement(Text16, { color: "#555555" }, "\u2580".repeat(Math.max(1, terminalSize.columns))))));
     }
   };
-  return /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", width: "100%" }, showBridgePromo ? /* @__PURE__ */ React15.createElement(BridgePromo, { width: stdout?.columns || 80, height: stdout?.rows || 24, selectedIndex: promoSelectedIndex }) : /* @__PURE__ */ React15.createElement(React15.Fragment, null, /* @__PURE__ */ React15.createElement(Box15, { paddingX: 1, flexDirection: "column", width: "100%" }, /* @__PURE__ */ React15.createElement(Static, { key: `static-${clearKey}-${terminalSize.columns}-${terminalSize.rows}`, items: parsedBlocks.completed }, (block) => /* @__PURE__ */ React15.createElement(
+  return /* @__PURE__ */ React15.createElement(Box15, { flexDirection: "column", width: "100%" }, showBridgePromo ? /* @__PURE__ */ React15.createElement(BridgePromo, { width: stdout?.columns || 80, height: stdout?.rows || 24, selectedIndex: promoSelectedIndex }) : /* @__PURE__ */ React15.createElement(React15.Fragment, null, /* @__PURE__ */ React15.createElement(Box15, { paddingX: 1, flexDirection: "column", width: "100%" }, /* @__PURE__ */ React15.createElement(Static, { key: `static-${clearKey}-${chatId}-${terminalSize.columns}-${terminalSize.rows}`, items: parsedBlocks.completed }, (block) => /* @__PURE__ */ React15.createElement(
     BlockItem,
     {
       key: block.key,
@@ -18758,11 +18937,13 @@ var isBundled = fileURLToPath2(import.meta.url).endsWith(".js");
 if (isBundled && !process.execArgv.some((arg) => arg.includes("max-old-space-size"))) {
   if (!Number.isNaN(_allocValue)) {
     console.log(`
-[MEMORY] Starting with: '${_allocValue > _maxAllowed ? _maxAllowed : _allocValue} MB' Allocation ${_allocValue > _maxAllowed ? "(Max allowed: '" + _maxAllowed + " MB')" : ""}. Please Wait...`);
+[MEMORY] Starting with: '${_allocValue > _maxAllowed ? _maxAllowed : _allocValue} MB' Allocation${_allocValue > _maxAllowed ? " (Max allowed: '" + _maxAllowed + " MB')" : ""}. Please Wait...`);
     await new Promise((resolve) => setTimeout(resolve, 5e3));
   }
   const cp = spawn3(process.execPath, [
     `--max-old-space-size=${HEAP_LIMIT}`,
+    `--expose-gc`,
+    `--max-semi-space-size=1`,
     fileURLToPath2(import.meta.url),
     ...process.argv.slice(2)
   ], { stdio: "inherit" });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "fluxflow-cli",
-    "version": "2.15.3",
-    "date": "2026-06-30",
+    "version": "2.16.0",
+    "date": "2026-07-01",
     "description": "A high-fidelity agentic terminal assistant for the Flux Era.",
     "keywords": [
         "ai",