fluxflow-cli 3.2.6 → 3.3.0

package/dist/fluxflow.js

@@ -2111,10 +2111,14 @@ 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_CLEAN_SIGNALS, REGEX_ARROWS_ALL, REGEX_TOOLS, cleanSignals, clearBlocksCache;
+var flattenString, 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();
+    flattenString = (str) => {
+      if (typeof str !== "string") return str;
+      return str.length > 12 ? (str + "").replace("", "") : str;
+    };
     wrapText = (text, width) => {
       if (!text) return "";
       const ansiRegex = /\x1B\[[0-?]*[ -/]*[@-~]/g;
@@ -2166,7 +2170,7 @@ var init_text = __esm({
           finalLines.push(currentLine.trimEnd());
         }
       });
-      return finalLines.join("\n");
+      return flattenString(finalLines.join("\n"));
     };
     formatTokens = (tokens) => {
       if (!tokens && tokens !== 0) return "0.0k";
@@ -2181,9 +2185,9 @@ var init_text = __esm({
     truncatePath = (p, maxLength = 40) => {
       let data_dir = DATA_DIR.replaceAll("\\\\", "\\");
       p = p.replace(os2.homedir(), "~").replace(data_dir, "FluxFlow").replaceAll("\\", "/");
-      if (!p || p.length <= maxLength) return p;
+      if (!p || p.length <= maxLength) return flattenString(p);
       const half = Math.floor((maxLength - 3) / 2);
-      return p.substring(0, half) + "..." + p.substring(p.length - half).replaceAll("\\", "/");
+      return flattenString(p.substring(0, half) + "..." + p.substring(p.length - half).replaceAll("\\", "/"));
     };
     parsePatchPairs = (args) => {
       const patchPairs = [];
@@ -2438,7 +2442,7 @@ var init_text = __esm({
         }
       }
       diffText += `[DIFF_END]`;
-      return diffText;
+      return flattenString(diffText);
     };
     parseLineInfo = (l) => {
       if (!l) return null;
@@ -2448,8 +2452,8 @@ var init_text = __esm({
       let rest = isR || isA ? clean.substring(1) : clean;
       rest = rest.trim();
       const splitIdx = rest.indexOf("|");
-      const num = splitIdx !== -1 ? rest.substring(0, splitIdx).trim() : "";
-      const content = splitIdx !== -1 ? rest.substring(splitIdx + 1) : rest;
+      const num = splitIdx !== -1 ? flattenString(rest.substring(0, splitIdx).trim()) : "";
+      const content = splitIdx !== -1 ? flattenString(rest.substring(splitIdx + 1)) : flattenString(rest);
       return { isR, isA, num, content };
     };
     getSimilarity = (s1, s2) => {
@@ -2457,21 +2461,35 @@ var init_text = __esm({
       if (!s1 || !s2) return 0;
       const l1 = s1.length;
       const l2 = s2.length;
-      const dp = Array.from({ length: l1 + 1 }, () => Array(l2 + 1).fill(0));
-      for (let i = 0; i <= l1; i++) dp[i][0] = i;
-      for (let j = 0; j <= l2; j++) dp[0][j] = j;
-      for (let i = 1; i <= l1; i++) {
-        for (let j = 1; j <= l2; j++) {
-          if (s1[i - 1] === s2[j - 1]) {
-            dp[i][j] = dp[i - 1][j - 1];
+      let str1 = s1;
+      let str2 = s2;
+      if (l1 < l2) {
+        str1 = s2;
+        str2 = s1;
+      }
+      const n = str1.length;
+      const m = str2.length;
+      const prevRow = new Int32Array(m + 1);
+      const currRow = new Int32Array(m + 1);
+      for (let j = 0; j <= m; j++) {
+        prevRow[j] = j;
+      }
+      for (let i = 1; i <= n; i++) {
+        currRow[0] = i;
+        const char1 = str1[i - 1];
+        for (let j = 1; j <= m; j++) {
+          if (char1 === str2[j - 1]) {
+            currRow[j] = prevRow[j - 1];
           } else {
-            dp[i][j] = Math.min(dp[i - 1][j], dp[i][j - 1], dp[i - 1][j - 1]) + 1;
+            currRow[j] = Math.min(prevRow[j], currRow[j - 1], prevRow[j - 1]) + 1;
           }
         }
+        prevRow.set(currRow);
       }
+      const dist = prevRow[m];
       const maxLen = Math.max(l1, l2);
       if (maxLen === 0) return 1;
-      return 1 - dp[l1][l2] / maxLen;
+      return 1 - dist / maxLen;
     };
     alignChangeGroup = (group) => {
       const removals = [];
@@ -2545,11 +2563,11 @@ var init_text = __esm({
     };
     parseMessageToBlocks = (msg, columns) => {
       if (!msg) return { completed: [], active: [] };
-      const cacheKey = `${msg.id}-${msg.text?.length || 0}-${columns}-${msg.isStreaming}-${msg.workedDuration || 0}-${msg.memoryUpdated ? 1 : 0}-${msg.color || ""}`;
+      const cacheKey = `${msg.id}-${msg.text?.length || 0}-${columns}-${msg.isStreaming}-${msg.workedDuration || 0}`;
       if (!msg.isStreaming && blocksCache.has(cacheKey)) {
         return blocksCache.get(cacheKey);
       }
-      const text = cleanSignals(msg.text || "");
+      const text = flattenString(cleanSignals(msg.text || ""));
       const streamCacheKey = `${msg.id}-${columns}`;
       let cachedBlocks = /* @__PURE__ */ new Map();
       if (msg.isStreaming) {
@@ -2563,13 +2581,13 @@ 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 flatText = flattenString(textContent);
         const flatExtra = { ...extra };
         if (typeof flatExtra.pairContent === "string") {
-          flatExtra.pairContent = (" " + flatExtra.pairContent).slice(1);
+          flatExtra.pairContent = flattenString(flatExtra.pairContent);
         }
         if (Array.isArray(flatExtra.wrappedLines)) {
-          flatExtra.wrappedLines = flatExtra.wrappedLines.map((l) => typeof l === "string" ? (" " + l).slice(1) : l);
+          flatExtra.wrappedLines = flatExtra.wrappedLines.map(flattenString);
         }
         return {
           key,
@@ -4003,7 +4021,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, SYNTAX_KEYWORDS, SYNTAX_RULES, tokenCache, MAX_TOKEN_CACHE_SIZE, tokenizeLine, renderHighlightedLine, 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();
@@ -4059,6 +4077,7 @@ var init_ChatLayout = __esm({
       /\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) => {
@@ -4070,12 +4089,12 @@ var init_ChatLayout = __esm({
       let lastIndex = 0;
       const tokens = [];
       let match;
-      const localRegex = new RegExp(SYNTAX_RULES.join("|"), "g");
-      while ((match = localRegex.exec(line)) !== null) {
+      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) });
+          tokens.push({ text: flattenString(line.substring(lastIndex, matchIndex)) });
         }
         let color = void 0;
         let bold = false;
@@ -4093,11 +4112,11 @@ var init_ChatLayout = __esm({
         } else if (match[7] || match[8]) {
           color = "#ff9e64";
         }
-        tokens.push({ text: matchText, color, bold });
-        lastIndex = localRegex.lastIndex;
+        tokens.push({ text: flattenString(matchText), color, bold });
+        lastIndex = REGEX_SYNTAX.lastIndex;
       }
       if (lastIndex < line.length) {
-        tokens.push({ text: line.substring(lastIndex) });
+        tokens.push({ text: flattenString(line.substring(lastIndex)) });
       }
       if (tokenCache.size >= MAX_TOKEN_CACHE_SIZE) {
         const firstKey = tokenCache.keys().next().value;
@@ -4106,10 +4125,10 @@ var init_ChatLayout = __esm({
       tokenCache.set(cacheKey, tokens);
       return tokens;
     };
-    renderHighlightedLine = (line, lang, defaultColor = void 0) => {
-      if (!line) return /* @__PURE__ */ React4.createElement(Text4, null, " ");
+    renderHighlightedLine = (line, lang, defaultColor = void 0, defaultBgColor = void 0) => {
+      if (!line) return /* @__PURE__ */ React4.createElement(Text4, { backgroundColor: defaultBgColor }, " ");
       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)));
+      return /* @__PURE__ */ React4.createElement(Text4, { color: defaultColor, backgroundColor: defaultBgColor }, tokens.map((token, idx) => /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: token.color || defaultColor, backgroundColor: defaultBgColor, bold: token.bold }, token.text)));
     };
     renderLatexText = (content, key) => {
       if (!content) return null;
@@ -4239,7 +4258,7 @@ var init_ChatLayout = __esm({
             const level = headingMatch[1].length;
             const hText = headingMatch[2];
             result.push(
-              /* @__PURE__ */ React4.createElement(Box3, { key: i, marginTop: 1, marginBottom: 0, width: "100%" }, /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: level === 1 ? "cyan" : level === 2 ? "purple" : level === 3 ? "yellow" : level === 4 ? "green" : level === 5 ? "blue" : "white", underline: true }, hText.toUpperCase()))
+              /* @__PURE__ */ React4.createElement(Box3, { key: i, marginTop: 1, marginBottom: 0, width: "100%" }, /* @__PURE__ */ React4.createElement(Text4, { bold: true, color: level === 1 ? "cyan" : level === 2 ? "purple" : level === 3 ? "yellow" : level === 4 ? "green" : level === 5 ? "blue" : "white", underline: true }, hText))
             );
             return;
           }
@@ -4295,14 +4314,16 @@ var init_ChatLayout = __esm({
       const displayPrefix = isRemoval ? "-" : isAddition ? "+" : " ";
       const renderInlineDiff = () => {
         if (isPureUnpairedBlock) {
-          const blockColor = isRemoval ? "#ffdddd" : "#ddffdd";
+          const blockColor = isRemoval ? "#ff3333" : "#33ff66";
+          const textBgColor = isRemoval ? "#5a1818" : "#185a25";
           const wrappedLines = wrapText(content, columns - 15).split("\n");
-          return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column" }, wrappedLines.map((wl, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx }, renderHighlightedLine(wl, extension, blockColor))));
+          return /* @__PURE__ */ React4.createElement(Box3, { flexDirection: "column" }, wrappedLines.map((wl, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx }, renderHighlightedLine(wl, extension, blockColor, textBgColor))));
         }
         if (!(isRemoval || isAddition) || words.length === 0 || !hasInlineChange) {
           const textColor = isRemoval ? "#885555" : isAddition ? "#558866" : "gray";
+          const textBgColor = void 0;
           const wrappedLines = wrapText(content, columns - 15).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(Box3, { flexDirection: "column" }, wrappedLines.map((wl, idx) => /* @__PURE__ */ React4.createElement(Box3, { key: idx }, renderHighlightedLine(wl, extension, textColor, textBgColor))));
         }
         return /* @__PURE__ */ React4.createElement(Text4, { wrap: "anywhere" }, words.map((part, idx) => {
           const isWhitespace = /^\s+$/.test(part.value);
@@ -4951,7 +4972,11 @@ var init_StatusBar = __esm({
         },
         /* @__PURE__ */ React5.createElement(Box4, null, /* @__PURE__ */ React5.createElement(Box4, { marginRight: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "white", bold: true }, mode.toUpperCase())), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, "\u2503"), /* @__PURE__ */ React5.createElement(Box4, { marginX: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "white", bold: true }, thinkingLevel.toUpperCase())), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, "\u2503"), /* @__PURE__ */ React5.createElement(Box4, { marginX: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "gray", bold: true }, "MEM: "), /* @__PURE__ */ React5.createElement(Text5, { color: "white", bold: true }, isMemoryEnabled ? "ON" : "OFF"))),
         /* @__PURE__ */ React5.createElement(Box4, { flexGrow: 1, justifyContent: "center", paddingX: 2 }, /* @__PURE__ */ React5.createElement(Text5, { color: "white", italic: true }, truncatePath(process.cwd(), 35))),
-        /* @__PURE__ */ React5.createElement(Box4, null, isProcessing ? /* @__PURE__ */ React5.createElement(Box4, { marginRight: 0 }, /* @__PURE__ */ React5.createElement(Text5, { color: dotColor }, "\u25CF")) : /* @__PURE__ */ React5.createElement(Text5, null, " "), /* @__PURE__ */ React5.createElement(Box4, { marginX: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "white" }, formatTokens(tokensTotal), " ", /* @__PURE__ */ React5.createElement(Text5, { dimColor: true }, (tokens / maxLimit * 100).toFixed(0), "%"))), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, "\u2503"), /* @__PURE__ */ React5.createElement(Box4, { marginX: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "grey", bold: true }, memoryUsage, "/", memoryLimit, " ", memoryUnit)), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, "\u2503"), /* @__PURE__ */ React5.createElement(Box4, { marginLeft: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "gray", bold: true }, chatId), (apiTier === "Custom" || apiTier === "Paid") && /* @__PURE__ */ React5.createElement(Box4, null, /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, " \u2503 "), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", bold: true }, "PAID"))))
+        /* @__PURE__ */ React5.createElement(Box4, null, isProcessing ? /* @__PURE__ */ React5.createElement(Box4, { marginRight: 0 }, /* @__PURE__ */ React5.createElement(Text5, { color: dotColor }, "\u25CF")) : /* @__PURE__ */ React5.createElement(Text5, null, " "), /* @__PURE__ */ React5.createElement(Box4, { marginX: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "white" }, formatTokens(tokensTotal), " ", (() => {
+          const pct = tokens / maxLimit * 100;
+          const color = pct < 60 ? "white" : pct < 80 ? "yellow" : "red";
+          return /* @__PURE__ */ React5.createElement(Text5, { color, dimColor: true }, pct.toFixed(0), "%");
+        })())), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, "\u2503"), /* @__PURE__ */ React5.createElement(Box4, { marginX: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "grey", bold: true }, memoryUsage, "/", memoryLimit, " ", memoryUnit)), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, "\u2503"), /* @__PURE__ */ React5.createElement(Box4, { marginLeft: 1 }, /* @__PURE__ */ React5.createElement(Text5, { color: "gray", bold: true }, chatId), (apiTier === "Custom" || apiTier === "Paid") && /* @__PURE__ */ React5.createElement(Box4, null, /* @__PURE__ */ React5.createElement(Text5, { color: "gray", dimColor: true }, " \u2503 "), /* @__PURE__ */ React5.createElement(Text5, { color: "gray", bold: true }, "PAID"))))
       );
     });
     StatusBar_default = StatusBar;
@@ -5187,7 +5212,7 @@ ${mode === "Flux" ? `- WORKSPACE TOOLS (path = relative to CWD & WILL BE FIRST A
 3. [tool:functions.FileMap(path="path/file")]. Shows file structure, functions, class, import/export, variable
 4. [tool:functions.PatchFile(path="...", replaceContent1="full line/block", newContent1="...", ...MAX 6)]. Surgical Patch. **Multiple patch on same file/path? Use replaceContent2, newContent2 etc >>> multiple spams**. Unsure? ReadFile >> guessing. **MUST VERIFY DIFF**
 5. [tool:functions.WriteFile(path="...", content="...")]. Creates/Overwrites. File Exist? PatchFile > WriteFile. Verify Imports
-6. [tool:functions.SearchKeyword(keyword="...", file="optional", subString="true/false optional", regex="true/false optional")]. Global project search. If 'file' is provided, searches only that file. Finds definitions/logic without reading every file. Usage: Can search for relevent lines/logic area to read specifically for edit. Optional parameters default to false
+6. [tool:functions.SearchKeyword(keyword="...", file="optional", subString="true/false optional", regex="optional, false for keyword")]. Global project search. If 'file' is provided, searches only that file. Finds definitions/logic without reading every file. Usage: Can search for relevent lines/logic area to read specifically for edit. defaults subString: false, regex: auto-detect
 7. [tool:functions.Run(command="...")]. Runs ${osDetected === "Windows" ? isPsAvailable() ? `WINDOWS POWERSHELL ONLY` : `WINDOWS CMD ONLY` : `BASH`} command. Destructive/Irreversible ops \u2192 Ask user
 8. [tool:functions.Todo(method="create/append/get", tasks=[ARRAY OF STRINGS], markDone=[ARRAY OF TASK STRINGS])]. Task List, NO Markdown IN ARRAY. USAGE: ANALYZE USER REQUEST **IF** MULTIPLE TASK \u2192 BREAK DOWN TASK \u2192 CREATE TODO **BEFORE** DIVING IN. 'tasks' & 'markDone' OPTIONAL PARAMETERS WITH method 'get'. USE 'get' method WITH 'markDone' to mark task completed. **EVERY TURN UPDATE POLICY**
 9. [tool:functions.Await(time="seconds")]. For waiting without exiting agent loop, 15s - 180s
@@ -8912,8 +8937,15 @@ var init_search_keyword = __esm({
       const { keyword, file, subString, regex } = parseArgs(args);
       if (!keyword) return 'ERROR: Missing "keyword" argument.';
       const toBool = (v) => v === true || v === "true" || v === 1 || v === "1" || v === "yes";
-      const matchRegex = toBool(regex);
-      const matchSubstring = !matchRegex && toBool(subString);
+      const regexExplicitlyFalse = regex === false || regex === "false" || regex === 0 || regex === "0" || regex === "no";
+      let matchRegex = toBool(regex);
+      let matchSubstring = !matchRegex && toBool(subString);
+      const hasRegexIndicators = /[|]/.test(keyword) || /\\([*+?{}()|[\]\^$])/.test(keyword);
+      let isAutoRegex = false;
+      if (!matchRegex && !regexExplicitlyFalse && hasRegexIndicators) {
+        matchRegex = true;
+        isAutoRegex = true;
+      }
       let regexPattern;
       let wordRegex;
       if (matchRegex) {
@@ -8990,7 +9022,7 @@ var init_search_keyword = __esm({
         if (typeof global.gc === "function") {
           global.gc();
         }
-        const modeLabel = matchRegex ? "(regex mode)" : matchSubstring ? "(subString mode)" : "";
+        const modeLabel = matchRegex ? isAutoRegex ? "(regex mode)" : "(keyword mode)" : matchSubstring ? "(subString mode)" : "";
         if (fileGroups.length === 0) {
           return `Found 0 matches for keyword: "${keyword}"${file ? ` in file: ${file}` : ". Try to specify files"} ${modeLabel}`;
         }
@@ -10809,10 +10841,18 @@ var init_ai = __esm({
           throw new DOMException("The user aborted a request.", "AbortError");
         }
         try {
-          const response = await fetch(url, options);
-          if (response.ok) return response;
-          if (response.status !== 429 && response.status < 500) return response;
+          const response2 = await fetch(url, options);
+          if (typeof performance !== "undefined" && performance.clearMeasures) {
+            performance.clearMeasures();
+            performance.clearMarks();
+          }
+          if (response2.ok) return response2;
+          if (response2.status !== 429 && response2.status < 500) return response2;
         } catch (e) {
+          if (typeof performance !== "undefined" && performance.clearMeasures) {
+            performance.clearMeasures();
+            performance.clearMarks();
+          }
           if (e.name === "AbortError" || signal?.aborted) throw e;
           if (i === retries - 1) throw e;
         }
@@ -10835,7 +10875,12 @@ var init_ai = __esm({
       if (signal?.aborted) {
         throw new DOMException("The user aborted a request.", "AbortError");
       }
-      return fetch(url, options);
+      const response = await fetch(url, options);
+      if (typeof performance !== "undefined" && performance.clearMeasures) {
+        performance.clearMeasures();
+        performance.clearMarks();
+      }
+      return response;
     };
     getDeepSeekStream = async function* (apiKey, model, contents, systemInstruction, thinkingLevel, mode, isMultiModal, signal, temperature = 0.99) {
       const messages = [];
@@ -11546,7 +11591,7 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
               } else if (aiProvider === "NVIDIA") {
                 const stream = getNVIDIAStream(
                   apiKey,
-                  "moonshotai/kimi-k2.6",
+                  "deepseek-ai/deepseek-v4-flash",
                   janitorContents,
                   janitorPrompt,
                   "Fast",
@@ -11984,6 +12029,32 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
       if (!apiKey) return null;
       globalSettings = settings;
       client = new GoogleGenAI({ apiKey });
+      if (!globalThis.__perfCleanupInstalled) {
+        globalThis.__perfCleanupInstalled = true;
+        setInterval(() => {
+          if (typeof performance !== "undefined" && performance.clearMeasures) {
+            performance.clearMeasures();
+            performance.clearMarks();
+          }
+        }, 6e4);
+        const originalFetch = globalThis.fetch;
+        globalThis.fetch = async (...args) => {
+          try {
+            const response = await originalFetch(...args);
+            if (typeof performance !== "undefined" && performance.clearMeasures) {
+              performance.clearMeasures();
+              performance.clearMarks();
+            }
+            return response;
+          } catch (e) {
+            if (typeof performance !== "undefined" && performance.clearMeasures) {
+              performance.clearMeasures();
+              performance.clearMarks();
+            }
+            throw e;
+          }
+        };
+      }
       return client;
     };
     generateSimpleContent = async (settings, model, contents, systemInstruction, thinkingLevel = "Fast", temperature = 0.75, usageKey = "agent") => {
@@ -12141,7 +12212,7 @@ ${newMemoryListStr}
         let targetModel = "gemma-4-26b-a4b-it";
         if (aiProvider === "OpenRouter") targetModel = "google/gemma-4-26b-a4b-it:free";
         if (aiProvider === "DeepSeek") targetModel = "deepseek-v4-flash";
-        if (aiProvider === "NVIDIA") targetModel = "moonshotai/kimi-k2.6";
+        if (aiProvider === "NVIDIA") targetModel = "deepseek-ai/deepseek-v4-flash";
         while (attempts <= maxAttempts && !success) {
           attempts++;
           try {
@@ -12208,7 +12279,7 @@ Provide a consolidated summary of the entire session.`;
         let targetModel = "gemma-4-26b-a4b-it";
         if (aiProvider === "OpenRouter") targetModel = "google/gemma-4-26b-a4b-it:free";
         if (aiProvider === "DeepSeek") targetModel = "deepseek-v4-flash";
-        if (aiProvider === "NVIDIA") targetModel = "moonshotai/kimi-k2.6";
+        if (aiProvider === "NVIDIA") targetModel = "deepseek-ai/deepseek-v4-flash";
         let attempts = 0;
         let success = false;
         let response = null;
@@ -12900,7 +12971,7 @@ ${boxMid}
         }
         let taggedContextStr = "";
         if (taggedContextBlocks.length > 0) {
-          taggedContextStr = "[TAGGED CONTEXT]\n" + taggedContextBlocks.join("\n\n") + "\n[/TAGGED CONTEXT]\n";
+          taggedContextStr = "[TAGGED FILE CONTENTS] Auto Read, System Provided Context\n" + taggedContextBlocks.join("\n\n") + "\n[/TAGGED FILE CONTENTS]\n";
         }
         const osDetected = process.platform === "win32" ? "Windows" : process.platform === "darwin" ? "macOS" : "Linux";
         const firstUserMsg = `[SYSTEM METADATA (PRIORITY: DYNAMIC), Chat Context >> Metadata] Time: ${dateTimeStr}
@@ -12908,7 +12979,7 @@ OS: ${osDetected}
 CWD: ${process.cwd()}${isPlayground ? " [PLAYGROUND MODE]" : ""}${cwdMismatch ? ` (WARNING: CWD Mismatch! Previous Path: ${lastCwd})` : ""}
 **DIRECTORY STRUCTURE**
 ${dirStructure}${memoryPrompt}${ideBlock}
-${activeSummaryBlock}${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : ""}${taggedContextStr}[USER] ${cleanAgentText.trim()} [/USER]`.trim();
+${activeSummaryBlock}${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS HIGH PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : "\n"}${taggedContextStr}[USER PROMPT] ${cleanAgentText.trim()} [/USER PROMPT]`.trim();
         const userMsgObj = { role: "user", text: firstUserMsg };
         if (attachedBinaryPart) {
           userMsgObj.binaryPart = attachedBinaryPart;
@@ -12954,7 +13025,7 @@ ${activeSummaryBlock}${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" &&
 [SYSTEM] USER QUESTION. RESOLVE THIS SPECIFIC QUERY WITHIN '[ANSWER] ... [/ANSWER]' CONCISELY, NATURALLY [/SYSTEM]
 [QUESTION] ${hint.replace("/btw", "").trim()} [/QUESTION]`;
                 } else {
-                  modifiedHistory.push({ role: "user", text: `${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] USER QUESTION. RESOLVE THIS SPECIFIC QUERY WITHIN '[ANSWER] ... [/ANSWER]' CONCISELY, NATURALLY\n**STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : ""}[QUESTION] ${hint.replace("/btw", "").trim()} [/QUESTION]` });
+                  modifiedHistory.push({ role: "user", text: `${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] USER QUESTION. RESOLVE THIS SPECIFIC QUERY WITHIN '[ANSWER] ... [/ANSWER]' CONCISELY, NATURALLY\n**STRICTLY FOLLOW THINKING POLICY AS HIGH PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : ""}[QUESTION] ${hint.replace("/btw", "").trim()} [/QUESTION]` });
                 }
               } else {
                 if (modifiedHistory.length > 0 && modifiedHistory[modifiedHistory.length - 1].role === "user") {
@@ -12962,7 +13033,7 @@ ${activeSummaryBlock}${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" &&
 
 [STEERING HINT] ${hint.trim()} [/STEERING HINT]`;
                 } else {
-                  modifiedHistory.push({ role: "user", text: `${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : ""}[STEERING HINT] ${hint.trim()} [/STEERING HINT]` });
+                  modifiedHistory.push({ role: "user", text: `${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS HIGH PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]\n" : ""}` : ""}[STEERING HINT] ${hint.trim()} [/STEERING HINT]` });
                 }
               }
               yield { type: "status", content: `${hint.startsWith("/btw") ? "Question Forwarded..." : "Steering Hint Injected..."}` };
@@ -14904,8 +14975,8 @@ Error Log can be found in ${path21.join(LOGS_DIR, "agent", "error.log")}`);
 
 [SYSTEM] USER QUESTION. RESOLVE THIS SPECIFIC QUERY WITHIN '[ANSWER] ... [/ANSWER]' CONCISELY, NATURALLY [/SYSTEM]
 `, "").replace(`[SYSTEM] USER QUESTION. RESOLVE THIS SPECIFIC QUERY WITHIN '[ANSWER] ... [/ANSWER]' CONCISELY, NATURALLY
-**STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]
-`, "").replace(`[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]
+**STRICTLY FOLLOW THINKING POLICY AS HIGH PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]
+`, "").replace(`[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS HIGH PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>** [/SYSTEM]
 `, "");
             if (modelName && modelName.toLowerCase().startsWith("gemma") && aiProvider === "Google" && msg.text.startsWith("[TOOL RESULT]")) {
               const jitInstructionFast = `
@@ -14942,6 +15013,10 @@ Error Log can be found in ${path21.join(LOGS_DIR, "agent", "error.log")}`);
           clearInterval(connectionPollInterval);
           connectionPollInterval = null;
         }
+        if (typeof performance !== "undefined" && performance.clearMeasures) {
+          performance.clearMeasures();
+          performance.clearMarks();
+        }
         await RevertManager.commitTransaction();
         if (systemSettings?.advanceRollback) {
           await AdvanceRevertManager.cleanup(chatId);
@@ -14959,7 +15034,7 @@ Error Log can be found in ${path21.join(LOGS_DIR, "agent", "error.log")}`);
         "filemap": '- [tool:functions.FileMap(path="path/file")]. Shows file structure, functions, classes, imports/exports',
         "patchfile": '- [tool:functions.PatchFile(path="...", replaceContent1="...", newContent1="...")]. Surgical block replacement for editing files',
         "writefile": '- [tool:functions.WriteFile(path="...", content="...")]. Creates or overwrites a file',
-        "searchkeyword": `- [tool:functions.SearchKeyword(keyword="...", file="optional", subString="true/false optional", regex="true/false optional")]. Global project search. If 'file' is provided, searches only that file. Finds definitions/logic without reading every file. Usage: Can search for relevent lines/logic area to read specifically for edit. Optional parameters default to false`,
+        "searchkeyword": `- [tool:functions.SearchKeyword(keyword="...", file="optional", subString="true/false optional", regex="optional, false for keyword")]. Global project search. If 'file' is provided, searches only that file. Finds definitions/logic without reading every file. Usage: Can search for relevent lines/logic area to read specifically for edit. defaults subString: false, regex: auto-detect`,
         "websearch": '- [tool:functions.WebSearch(query="...", limit=number)]. Web Search',
         "webscrape": '- [tool:functions.WebScrape(url="...")]. Web Scrape',
         "ask": `- [tool:functions.Ask(question="...", optionA="option::description", ...MAX 4)]. Ambiguity Resolution. Mandatory Triggers: Path Divergence, Security, Risk Mitigation. ask >> finish/guess. Suggest best options; don't ask for preferences. 'option' SHOULD be short`
@@ -15051,17 +15126,20 @@ ${cleanResponse}
           } else if (normalizedToolName === "web_scrape" || normalizedToolName === "webscrape") {
             label = `\u2714 \x1B[95mScraped\x1B[0m`;
           } else if (normalizedToolName === "view_file" || normalizedToolName === "viewfile" || normalizedToolName === "readfile") {
-            label = `\u2714 \x1B[95mRead File\x1B[0m`;
+            const path23 = parseArgs(toolCall.args).path || "";
+            label = `\u2714 \x1B[95mRead File\x1B[0m: ${path23}`;
           } else if (normalizedToolName === "list_files" || normalizedToolName === "read_folder" || normalizedToolName === "readfolder") {
-            label = `\u2714 \x1B[95mBrowsed Folder\x1B[0m`;
+            const path23 = parseArgs(toolCall.args).path || "";
+            label = `\u2714 \x1B[95mBrowsed Folder\x1B[0m: ${path23}`;
           } else if (normalizedToolName === "write_file" || normalizedToolName === "writefile") {
-            const path23 = parseArgs(toolCall.args).path || "...";
+            const path23 = parseArgs(toolCall.args).path || "";
             label = `\u2714 \x1B[95mFile Created\x1B[0m: ${path23}`;
           } else if (normalizedToolName === "update_file" || normalizedToolName === "updatefile" || normalizedToolName === "patchfile" || normalizedToolName === "patch_file" || normalizedToolName === "patchfile" || normalizedToolName === "updatefile") {
-            const path23 = parseArgs(toolCall.args).path || "...";
+            const path23 = parseArgs(toolCall.args).path || "";
             label = `\u2714 \x1B[95mFile Edited\x1B[0m: ${path23}`;
           } else if (normalizedToolName === "file_map" || normalizedToolName === "filemap") {
-            label = `\u2714 \x1B[95mIndexed\x1B[0m`;
+            const path23 = parseArgs(toolCall.args).path || "";
+            label = `\u2714 \x1B[95mIndexed\x1B[0m: ${path23}`;
           } else if (normalizedToolName === "await") {
             const { time } = parseArgs(toolCall.args);
             let sec = parseFloat(time) || 0;
@@ -16084,7 +16162,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 lastGCTimeRef = useRef4(1);
   const [confirmExit, setConfirmExit] = useState15(false);
   const [exitCountdown, setExitCountdown] = useState15(10);
   const { stdout } = useStdout2();
@@ -16102,6 +16180,78 @@ function App({ args = [] }) {
   const [promoSelectedIndex, setPromoSelectedIndex] = useState15(0);
   const suggestionOffsetRef = useRef4(0);
   const persistedModelRef = useRef4(null);
+  const activeStreamingMsgRef = useRef4(null);
+  const [renderTick, setRenderTick] = useState15(0);
+  const forceRender = () => setRenderTick((t) => t + 1);
+  const typewriterQueueRef = useRef4([]);
+  const typewriterTickRef = useRef4(null);
+  const commitActiveStreamingMessage = () => {
+    if (activeStreamingMsgRef.current) {
+      const msg = {
+        ...activeStreamingMsgRef.current,
+        text: flattenString(activeStreamingMsgRef.current.text),
+        isStreaming: false
+      };
+      setMessages((prev) => {
+        const next = [...prev, msg];
+        setCompletedIndex(next.length);
+        return next;
+      });
+      activeStreamingMsgRef.current = null;
+    }
+  };
+  const startTypewriter = () => {
+    if (typewriterTickRef.current) {
+      clearInterval(typewriterTickRef.current);
+    }
+    typewriterQueueRef.current = [];
+    typewriterTickRef.current = setInterval(() => {
+      const queue = typewriterQueueRef.current;
+      if (queue.length > 0 && activeStreamingMsgRef.current) {
+        let batchSize = 2;
+        if (queue.length > 65) batchSize = 16;
+        else if (queue.length > 50) batchSize = 12;
+        else if (queue.length > 35) batchSize = 8;
+        else if (queue.length > 15) batchSize = 6;
+        else if (queue.length > 5) batchSize = 4;
+        let batchedText = "";
+        for (let i = 0; i < batchSize && queue.length > 0; i++) {
+          batchedText += queue.shift();
+        }
+        activeStreamingMsgRef.current.text = flattenString(activeStreamingMsgRef.current.text + batchedText);
+        forceRender();
+      }
+    }, 100);
+  };
+  const awaitTypewriter = async () => {
+    while (systemSettings.progressiveRendering && typewriterQueueRef.current.length > 0) {
+      await new Promise((resolve) => setTimeout(resolve, 10));
+    }
+  };
+  const flushTypewriterNow = () => {
+    const queue = typewriterQueueRef.current;
+    if (queue.length > 0 && activeStreamingMsgRef.current) {
+      const remaining = queue.join("");
+      queue.length = 0;
+      activeStreamingMsgRef.current.text = flattenString(activeStreamingMsgRef.current.text + remaining);
+      forceRender();
+    }
+  };
+  const appendStreamText = (chunkText) => {
+    if (systemSettings.progressiveRendering && typewriterTickRef.current) {
+      const tokens = chunkText.split(/(\s+)/).filter(Boolean);
+      for (const tok of tokens) {
+        typewriterQueueRef.current.push(tok);
+      }
+    } else {
+      if (!activeStreamingMsgRef.current) {
+        activeStreamingMsgRef.current = { id: "agent-" + Date.now(), role: "agent", text: flattenString(chunkText), isStreaming: true };
+      } else {
+        activeStreamingMsgRef.current.text = flattenString(activeStreamingMsgRef.current.text + chunkText);
+      }
+      forceRender();
+    }
+  };
   useEffect12(() => {
     const ideName = getIDEName();
     const isIDE = !["Terminal", "Windows Terminal"].includes(ideName) || !!process.env.VSC_TERMINAL_URL;
@@ -16115,10 +16265,10 @@ function App({ args = [] }) {
         setShowBridgePromo(false);
       }
     }, 1e3);
-    lastGCTime = Date.now();
+    lastGCTimeRef.current = Date.now();
     const memInterval = setInterval(() => {
-      if (lastGCTime) {
-        const diff = Date.now() - lastGCTime || 0;
+      if (lastGCTimeRef.current) {
+        const diff = Date.now() - lastGCTimeRef.current || 0;
         if (diff > 3e4) {
           if (global.gc) {
             const gCAsync = async () => {
@@ -16126,7 +16276,7 @@ function App({ args = [] }) {
                 global.gc();
                 await new Promise((resolve) => setImmediate(resolve));
               }
-              lastGCTime = Date.now();
+              lastGCTimeRef.current = Date.now();
             };
             gCAsync();
           }
@@ -16480,8 +16630,8 @@ function App({ args = [] }) {
         defaultModel = "deepseek-v4-flash";
         modelDisplayName = "DeepSeek Flash (Free default)";
       } else if (aiProvider === "NVIDIA") {
-        defaultModel = "stepfun-ai/step-3.7-flash";
-        modelDisplayName = "Step 3.7 Flash (NVIDIA)";
+        defaultModel = "deepseek-ai/deepseek-v4-flash";
+        modelDisplayName = "DeepSeek V4 Flash (NVIDIA)";
       } else {
         defaultModel = "google/gemma-4-31b-it:free";
         modelDisplayName = "Gemma 4 (Free default)";
@@ -16494,8 +16644,8 @@ function App({ args = [] }) {
         defaultModel = "deepseek-v4-flash";
         modelDisplayName = "DeepSeek Flash";
       } else if (aiProvider === "NVIDIA") {
-        defaultModel = "stepfun-ai/step-3.7-flash";
-        modelDisplayName = "Step 3.7 Flash (NVIDIA)";
+        defaultModel = "deepseek-ai/deepseek-v4-flash";
+        modelDisplayName = "DeepSeek V4 Flash (NVIDIA)";
       } else {
         defaultModel = "deepseek/deepseek-v4-flash";
         modelDisplayName = "DeepSeek Flash";
@@ -16556,7 +16706,7 @@ function App({ args = [] }) {
   const [wittyPhrase, setWittyPhrase] = useState15("");
   const [hasPasteBlock, setHasPasteBlock] = useState15(false);
   const [activeTime, setActiveTime] = useState15(0);
-  const activeTimeIntervalRef = useRef4(null);
+  let interval_for_timer;
   useEffect12(() => {
     let interval;
     if (statusText && systemSettings.loadingPhrases !== false) {
@@ -16667,11 +16817,6 @@ function App({ args = [] }) {
   }, [messages]);
   const [completedIndex, setCompletedIndex] = useState15(messages.length);
   const [clearKey, setClearKey] = useState15(0);
-  const [activeStreamMessages, setActiveStreamMessages] = useState15([]);
-  const activeStreamMessagesRef = useRef4([]);
-  const typewriterQueueRef = useRef4([]);
-  const typewriterIntervalRef = useRef4(null);
-  const streamFinishedRef = useRef4(false);
   const lastCompletedBlocksRef = useRef4([]);
   const cachedHistoryRef = useRef4({
     completedIndex: 0,
@@ -16745,7 +16890,7 @@ function App({ args = [] }) {
         };
       }
     }
-    const activeMsgs = activeStreamMessages;
+    const activeMsgs = messages.slice(completedIndex);
     const streamingCompletedBlocks = [];
     const activeBlocks = [];
     for (let i = 0; i < activeMsgs.length; i++) {
@@ -16761,19 +16906,14 @@ 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.map((block) => {
-      if (block.type === "full-message" && block.msg) {
-        const latestMsg = messages.find((m) => m.id === block.msg.id);
-        if (latestMsg && latestMsg !== block.msg) {
-          return { ...block, msg: latestMsg };
-        }
-      }
-      return block;
-    });
-    for (let j = 0; j < streamingCompletedBlocks.length; j++) {
-      finalCompleted.push(streamingCompletedBlocks[j]);
+    if (activeStreamingMsgRef.current) {
+      const parsed = parseMessageToBlocks(activeStreamingMsgRef.current, columns);
+      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]);
     }
+    let finalCompleted = streamingCompletedBlocks.length === 0 ? historicalBlocks : historicalBlocks.concat(streamingCompletedBlocks);
     if (finalCompleted.length >= 75e3) {
+      finalCompleted = [...finalCompleted];
       finalCompleted.push({
         key: `memory-warning-block-${finalCompleted.length}`,
         msg: {
@@ -16789,7 +16929,7 @@ function App({ args = [] }) {
       completed: finalCompleted,
       active: activeBlocks
     };
-  }, [messages, activeStreamMessages, completedIndex, terminalSize.columns, clearKey, chatId]);
+  }, [messages, completedIndex, terminalSize.columns, clearKey, chatId, renderTick]);
   const isTerminalWaitingForInput = useMemo2(() => {
     if (!activeCommand || !execOutput) return false;
     const lastChunk = execOutput.trim();
@@ -17087,7 +17227,7 @@ function App({ args = [] }) {
           } else if (startupProvider === "OpenRouter") {
             defaultModel = "google/gemma-4-31b-it:free";
           } else if (startupProvider === "NVIDIA") {
-            defaultModel = "stepfun-ai/step-3.7-flash";
+            defaultModel = "deepseek-ai/deepseek-v4-flash";
           }
         } else {
           if (startupProvider === "Google") {
@@ -17097,7 +17237,7 @@ function App({ args = [] }) {
           } else if (startupProvider === "OpenRouter") {
             defaultModel = "deepseek/deepseek-v4-flash";
           } else if (startupProvider === "NVIDIA") {
-            defaultModel = "stepfun-ai/step-3.7-flash";
+            defaultModel = "deepseek-ai/deepseek-v4-flash";
           }
         }
         setActiveModel(defaultModel);
@@ -17314,7 +17454,7 @@ function App({ args = [] }) {
       } else if (aiProvider === "DeepSeek") {
         defaultModel = "deepseek-v4-flash";
       } else if (aiProvider === "NVIDIA") {
-        defaultModel = "stepfun-ai/step-3.7-flash";
+        defaultModel = "deepseek-ai/deepseek-v4-flash";
       }
       setActiveModel(defaultModel);
       setMessages((prev) => [...prev, { role: "system", text: `${aiProvider} API Key saved successfully! Model set to ${defaultModel}. Initialization complete.`, isMeta: true }]);
@@ -17491,10 +17631,6 @@ function App({ args = [] }) {
           cmd: "moonshotai/kimi-k2.7",
           desc: "Multimodal"
         },
-        {
-          cmd: "moonshotai/kimi-k2.6",
-          desc: "[DEPRICATED]"
-        },
         // --- DeepSeek Family ---
         {
           cmd: "deepseek-ai/deepseek-v4-flash",
@@ -17877,7 +18013,7 @@ ${cleanText}`, color: "magenta" }];
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
-                lastGCTime = Date.now();
+                lastGCTimeRef.current = Date.now();
               };
               gCAsync();
             }
@@ -17904,7 +18040,7 @@ ${cleanText}`, color: "magenta" }];
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
-                lastGCTime = Date.now();
+                lastGCTimeRef.current = Date.now();
               };
               gCAsync();
             }
@@ -18523,27 +18659,15 @@ ${timestamp}` };
         const appendCancelMessage = () => {
           if (didAppendCancel) return;
           didAppendCancel = true;
-          const dangling = activeStreamMessagesRef.current;
-          activeStreamMessagesRef.current = [];
-          setActiveStreamMessages([]);
-          if (typewriterIntervalRef.current) {
-            clearInterval(typewriterIntervalRef.current);
-            typewriterIntervalRef.current = null;
-          }
-          typewriterQueueRef.current = [];
           setMessages((prev) => {
             const lastMsg = prev[prev.length - 1];
             if (lastMsg && lastMsg.text && lastMsg.text.includes("Request Cancelled")) {
               return prev;
             }
-            const flushed = dangling.map((m) => {
-              const flatText = m.text ? (" " + m.text).slice(1) : m.text;
-              return { ...m, isStreaming: false, text: flatText };
-            });
-            const updatedPrev = [...prev, ...flushed].map((m) => m.isStreaming ? { ...m, isStreaming: false } : m);
+            const updatedPrev = prev.map((m) => m.isStreaming ? { ...m, isStreaming: false } : m);
             const newMsgs = [...updatedPrev, {
               id: "cancel-" + Date.now(),
-              role: "system",
+              role: "agent",
               text: "\n\n\x1B[33m\u24D8 Request Cancelled\x1B[0m",
               isMeta: false
             }];
@@ -18551,161 +18675,6 @@ ${timestamp}` };
             return newMsgs;
           });
         };
-        const finalizeTurn = async (apiStartVal) => {
-          const dangling = activeStreamMessagesRef.current;
-          if (dangling.length > 0) {
-            activeStreamMessagesRef.current = [];
-            setActiveStreamMessages([]);
-            setMessages((prev) => {
-              const totalDuration = Date.now() - apiStartVal;
-              const flushed = dangling.map((m) => {
-                const flatText = m.text ? (" " + m.text).slice(1) : m.text;
-                return {
-                  ...m,
-                  isStreaming: false,
-                  text: flatText,
-                  workedDuration: m.role === "agent" ? totalDuration : m.workedDuration
-                };
-              });
-              const newMsgs = [...prev, ...flushed];
-              setCompletedIndex(newMsgs.length);
-              return newMsgs;
-            });
-          }
-          setIsProcessing(false);
-          setStatusText(null);
-          setActiveTime(0);
-          clearInterval(activeTimeIntervalRef.current);
-          if (didSignalTerminationRef.current) {
-            appendCancelMessage();
-          }
-          clearBlocksCache();
-          if (global.gc) {
-            try {
-              for (let i = 0; i < 3; i++) {
-                global.gc();
-                await new Promise((resolve) => setImmediate(resolve));
-              }
-              lastGCTime = Date.now();
-            } catch (e) {
-            }
-          }
-          if (!hasFiredJanitor) {
-            if (process.stdout.isTTY) {
-              process.stdout.write("\x1B]0;FluxFlow | Idle\x07");
-              process.stdout.write("\x1B]633;P;TerminalTitle=FluxFlow | Idle\x07");
-            }
-          }
-          if (queuedPromptRef.current) {
-            setResolutionData(queuedPromptRef.current);
-            setQueuedPrompt(null);
-            const hintToResolve = queuedPromptRef.current;
-            queuedPromptRef.current = null;
-            setMessages((prev) => {
-              const newMsgs = [...prev];
-              const hintMsg = newMsgs.reverse().find((m) => m.text?.includes("[STEERING HINT: QUEUED]") || m.text?.includes("[QUESTION: QUEUED]"));
-              if (hintMsg) {
-                if (hintMsg.text.includes("[STEERING HINT: QUEUED]")) {
-                  hintMsg.text = hintMsg.text.replace("[STEERING HINT: QUEUED]", "[STEERING HINT: FINISHED_TURN]");
-                } else if (hintMsg.text.includes("[QUESTION: QUEUED]")) {
-                  hintMsg.text = hintMsg.text.replace("[QUESTION: QUEUED]", "[QUESTION: FINISHED_TURN]");
-                }
-              }
-              return newMsgs.reverse();
-            });
-            setActiveView("resolution");
-          }
-          setMessages((prev) => {
-            const totalDuration = Date.now() - apiStartVal;
-            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 };
-              }
-              return updated;
-            }).reverse();
-            const historyToSave = newMsgs.filter((m) => !String(m.id).startsWith("welcome") && (!m.isMeta || m.text && m.text.includes("Request Cancelled")));
-            saveChat(chatId, null, historyToSave);
-            setCompletedIndex(newMsgs.length);
-            return newMsgs;
-          });
-        };
-        const pushTokenText = (id, text) => {
-          if (systemSettings.progressiveRendering) {
-            const tokens = text.split(/(\s+)/).filter(Boolean);
-            for (const tok of tokens) {
-              typewriterQueueRef.current.push({ type: "text", id, text: tok });
-            }
-          }
-        };
-        const startTypewriter = (apiStartVal) => {
-          if (typewriterIntervalRef.current) {
-            clearInterval(typewriterIntervalRef.current);
-          }
-          streamFinishedRef.current = false;
-          typewriterQueueRef.current = [];
-          typewriterIntervalRef.current = setInterval(() => {
-            const queue = typewriterQueueRef.current;
-            if (queue.length > 0) {
-              let batchSize = 2;
-              if (queue.length > 65) batchSize = 16;
-              else if (queue.length > 50) batchSize = 12;
-              else if (queue.length > 35) batchSize = 8;
-              else if (queue.length > 15) batchSize = 6;
-              else if (queue.length > 5) batchSize = 4;
-              let changed = false;
-              const nextMsgs = [...activeStreamMessagesRef.current];
-              const clonedIndices = /* @__PURE__ */ new Set();
-              for (let i = 0; i < batchSize; i++) {
-                if (queue.length === 0) break;
-                const task = queue.shift();
-                if (task.type === "create") {
-                  nextMsgs.push(task.msg);
-                  changed = true;
-                } else if (task.type === "text") {
-                  const idx = nextMsgs.findIndex((m) => m.id === task.id);
-                  if (idx !== -1) {
-                    if (!clonedIndices.has(idx)) {
-                      nextMsgs[idx] = { ...nextMsgs[idx] };
-                      clonedIndices.add(idx);
-                    }
-                    nextMsgs[idx].text += task.text;
-                    changed = true;
-                  }
-                } else if (task.type === "finalize-think") {
-                  const idx = nextMsgs.findIndex((m) => m.id === task.id);
-                  if (idx !== -1) {
-                    if (!clonedIndices.has(idx)) {
-                      nextMsgs[idx] = { ...nextMsgs[idx] };
-                      clonedIndices.add(idx);
-                    }
-                    nextMsgs[idx].isStreaming = false;
-                    nextMsgs[idx].duration = task.duration;
-                    changed = true;
-                  }
-                }
-              }
-              if (changed) {
-                activeStreamMessagesRef.current = nextMsgs;
-                setActiveStreamMessages(nextMsgs);
-              }
-            } else if (streamFinishedRef.current) {
-              clearInterval(typewriterIntervalRef.current);
-              typewriterIntervalRef.current = null;
-              finalizeTurn(apiStartVal);
-            }
-          }, 100);
-        };
-        const awaitTypewriter = async () => {
-          while (systemSettings.progressiveRendering && typewriterQueueRef.current.length > 0) {
-            await new Promise((resolve) => setTimeout(resolve, 10));
-          }
-        };
         let hasFiredJanitor = false;
         setIsProcessing(true);
         setLastChunkTime(Date.now());
@@ -18797,6 +18766,8 @@ ${timestamp}` };
                 setActiveCommand(null);
                 setIsTerminalFocused(false);
                 setExecOutput("");
+                activeCommandRef.current = null;
+                execOutputRef.current = "";
               },
               onToolResult: (status, toolName) => {
                 if (status === "success") {
@@ -18927,6 +18898,7 @@ Selection: ${val}`,
           let inToolCallString = null;
           const signalRegex = /\[?\s*turn\s*:\s*.*?\s*\]?/gi;
           for await (const packet of stream) {
+            await new Promise((resolve) => setTimeout(resolve, 3));
             if (packet.type === "text") {
               setLastChunkTime(Date.now());
             }
@@ -18934,7 +18906,7 @@ Selection: ${val}`,
               apiStart = Date.now();
               isFirstPacket = false;
               if (systemSettings.progressiveRendering) {
-                startTypewriter(apiStart);
+                startTypewriter();
               }
             }
             if (packet.type === "status") {
@@ -18942,19 +18914,21 @@ Selection: ${val}`,
                 setStatusText(packet.content);
               }
               if (packet.content?.includes("[start]")) {
-                clearInterval(activeTimeIntervalRef.current);
+                clearInterval(interval_for_timer);
                 setActiveTime(0);
-                activeTimeIntervalRef.current = setInterval(() => {
+                interval_for_timer = setInterval(() => {
                   setActiveTime((prev) => prev + 1);
                 }, 1e3);
               } else if (packet.content?.includes("[end]")) {
                 setActiveTime(0);
-                clearInterval(activeTimeIntervalRef.current);
+                clearInterval(interval_for_timer);
               }
               if (isBridgeConnected()) {
                 sendStatus(packet.content);
               }
               if (packet.content === "Request Cancelled") {
+                flushTypewriterNow();
+                commitActiveStreamingMessage();
                 appendCancelMessage();
               }
               continue;
@@ -18982,9 +18956,7 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "turn_reset") {
-              if (systemSettings.progressiveRendering) {
-                await awaitTypewriter();
-              }
+              flushTypewriterNow();
               currentThinkId = null;
               currentAgentId = null;
               inThinkMode = false;
@@ -18992,40 +18964,32 @@ Selection: ${val}`,
               inToolCall = false;
               toolCallEncounteredInTurn = false;
               thinkConsumedInTurn = false;
-              const streamingMsgs = activeStreamMessagesRef.current;
-              activeStreamMessagesRef.current = [];
-              setActiveStreamMessages([]);
               setMessages((prev) => {
-                const totalDuration = Date.now() - apiStart;
-                const flushed = streamingMsgs.map((m) => {
-                  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,
-                    workedDuration: m.role === "agent" ? totalDuration : m.workedDuration
-                  };
+                const newMsgs = prev.map((m) => {
+                  if (m.isStreaming) {
+                    const flatText = m.text ? flattenString(m.text) : m.text;
+                    const flatFullText = m.fullText ? flattenString(m.fullText) : m.fullText;
+                    return { ...m, isStreaming: false, text: flatText, fullText: flatFullText };
+                  }
+                  return m;
                 });
-                const newMsgs = [...prev, ...flushed];
                 setCompletedIndex(newMsgs.length);
                 return newMsgs;
               });
               clearBlocksCache();
               if (global.gc) {
-                for (let i = 0; i < 1; i++) {
+                for (let i = 0; i < 2; i++) {
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
-                lastGCTime = Date.now();
+                lastGCTimeRef.current = Date.now();
               }
               continue;
             }
             if (packet.type === "interactive_turn_finished") {
               setIsProcessing(false);
               setActiveTime(0);
-              clearInterval(activeTimeIntervalRef.current);
+              clearInterval(interval_for_timer);
               if (isBridgeConnected()) {
                 sendStatus(null);
               }
@@ -19048,18 +19012,13 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "visual_feedback") {
-              if (systemSettings.progressiveRendering) {
-                await awaitTypewriter();
-              }
-              const streamingMsgs = activeStreamMessagesRef.current;
-              activeStreamMessagesRef.current = [];
-              setActiveStreamMessages([]);
+              flushTypewriterNow();
+              commitActiveStreamingMessage();
               setMessages((prev) => {
-                const flushed = streamingMsgs.map((m) => ({ ...m, isStreaming: false }));
-                const newMsgs = [...prev, ...flushed, {
+                const newMsgs = [...prev, {
                   id: "feedback-" + Date.now() + "-" + Math.random().toString(36).substring(2, 9),
                   role: "system",
-                  text: packet.content,
+                  text: flattenString(packet.content),
                   isVisualFeedback: true
                 }];
                 setCompletedIndex(newMsgs.length);
@@ -19094,19 +19053,13 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "tool_result") {
-              if (systemSettings.progressiveRendering) {
-                await awaitTypewriter();
-              }
-              const streamingMsgs = activeStreamMessagesRef.current;
-              activeStreamMessagesRef.current = [];
-              setActiveStreamMessages([]);
+              commitActiveStreamingMessage();
               setMessages((prev) => {
-                const flushed = streamingMsgs.map((m) => ({ ...m, isStreaming: false }));
-                const newMsgs = [...prev, ...flushed, {
+                const newMsgs = [...prev, {
                   id: "tool-" + Date.now(),
                   role: "system",
-                  text: packet.content,
-                  fullText: packet.aiContent,
+                  text: flattenString(packet.content),
+                  fullText: flattenString(packet.aiContent),
                   // Preserve raw data for next turn
                   binaryPart: packet.binaryPart,
                   // v1.5.0 Multimodal Support
@@ -19172,7 +19125,7 @@ Selection: ${val}`,
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
-                lastGCTime = Date.now();
+                lastGCTimeRef.current = Date.now();
               }
               continue;
             }
@@ -19209,191 +19162,149 @@ Selection: ${val}`,
               const beforeText = chunkText.substring(0, tagIndex);
               const afterText = chunkText.substring(tagIndex);
               if (beforeText) {
-                if (!currentAgentId) {
-                  currentAgentId = "agent-" + Date.now();
-                  const newMsg = { id: currentAgentId, role: "agent", text: beforeText, isStreaming: true };
-                  if (systemSettings.progressiveRendering) {
-                    typewriterQueueRef.current.push({ type: "create", msg: { ...newMsg, text: "" } });
-                    pushTokenText(currentAgentId, beforeText);
-                  } else {
-                    activeStreamMessagesRef.current = [...activeStreamMessagesRef.current, newMsg];
-                  }
+                if (!activeStreamingMsgRef.current || activeStreamingMsgRef.current.role !== "agent") {
+                  activeStreamingMsgRef.current = { id: "agent-" + Date.now(), role: "agent", text: flattenString(beforeText), isStreaming: true };
                 } else {
-                  if (systemSettings.progressiveRendering) {
-                    pushTokenText(currentAgentId, beforeText);
-                  } else {
-                    activeStreamMessagesRef.current = activeStreamMessagesRef.current.map(
-                      (m) => m.id === currentAgentId ? { ...m, text: m.text + beforeText, isStreaming: true } : m
-                    );
-                  }
-                }
-                if (!systemSettings.progressiveRendering) {
-                  setActiveStreamMessages([...activeStreamMessagesRef.current]);
+                  activeStreamingMsgRef.current.text = flattenString(activeStreamingMsgRef.current.text + beforeText);
                 }
               }
+              flushTypewriterNow();
+              commitActiveStreamingMessage();
               inThinkMode = true;
               thinkConsumedInTurn = true;
               let thinkStartText = afterText.replace(/<(think|thought)>/gi, "");
               currentThinkId = "think-" + Date.now();
-              const thinkMsg = { id: currentThinkId, role: "think", text: thinkStartText, isStreaming: true, startTime: Date.now() };
-              if (systemSettings.progressiveRendering) {
-                typewriterQueueRef.current.push({ type: "create", msg: { ...thinkMsg, text: "", startTime: Date.now() } });
-                if (thinkStartText) {
-                  pushTokenText(currentThinkId, thinkStartText);
-                }
-              } else {
-                activeStreamMessagesRef.current = [...activeStreamMessagesRef.current, thinkMsg];
-                setActiveStreamMessages([...activeStreamMessagesRef.current]);
-              }
+              activeStreamingMsgRef.current = { id: currentThinkId, role: "think", text: "", isStreaming: true, startTime: Date.now() };
+              appendStreamText(thinkStartText);
               continue;
             }
-            if ((chunkLower.includes("</think>") || chunkLower.includes("</thought>")) && currentThinkId) {
+            if ((chunkLower.includes("</think>") || chunkLower.includes("</thought>")) && activeStreamingMsgRef.current?.role === "think") {
               const parts = chunkText.split(/<\/(think|thought)>/gi);
               const thinkPart = parts[0] || "";
               const agentPart = parts.slice(2).join("").replace(/<\/?(think|thought)>/gi, "");
+              activeStreamingMsgRef.current.text = flattenString(activeStreamingMsgRef.current.text + thinkPart);
+              const startTime = activeStreamingMsgRef.current.startTime || Date.now();
+              activeStreamingMsgRef.current.duration = Date.now() - startTime;
+              flushTypewriterNow();
+              commitActiveStreamingMessage();
               inThinkMode = false;
               currentAgentId = "agent-" + Date.now();
-              if (systemSettings.progressiveRendering) {
-                if (thinkPart) {
-                  pushTokenText(currentThinkId, thinkPart);
-                }
-                const startTime = parseInt(currentThinkId.split("-")[1]) || Date.now();
-                const duration = Date.now() - startTime;
-                typewriterQueueRef.current.push({ type: "finalize-think", id: currentThinkId, duration });
-                const newAgentMsg = { id: currentAgentId, role: "agent", text: "", isStreaming: true };
-                typewriterQueueRef.current.push({ type: "create", msg: newAgentMsg });
-                if (agentPart) {
-                  pushTokenText(currentAgentId, agentPart);
-                }
-              } else {
-                activeStreamMessagesRef.current = activeStreamMessagesRef.current.map((m) => {
-                  if (m.id === currentThinkId && typeof m.id === "string") {
-                    const startTime = m.startTime || parseInt(m.id.split("-")[1]) || Date.now();
-                    const duration = Date.now() - startTime;
-                    return { ...m, text: m.text + thinkPart, isStreaming: false, duration };
-                  }
-                  return m;
-                });
-                activeStreamMessagesRef.current = [...activeStreamMessagesRef.current, { id: currentAgentId, role: "agent", text: agentPart, isStreaming: true }];
-                setActiveStreamMessages([...activeStreamMessagesRef.current]);
-              }
+              activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: "", isStreaming: true };
+              appendStreamText(agentPart);
               continue;
             }
-            if (inThinkMode && currentThinkId) {
-              let transitioning = false;
-              let transitionContent = "";
-              if (systemSettings.progressiveRendering) {
-                if (chunkText.toLowerCase().includes("</think>")) {
-                  transitioning = true;
-                  const parts = chunkText.split(/<\/think>/gi);
-                  const thinkPart = parts[0] || "";
-                  transitionContent = parts.slice(1).join("</think>") || "";
-                  if (thinkPart) pushTokenText(currentThinkId, thinkPart);
-                  const startTime = parseInt(currentThinkId.split("-")[1]) || Date.now();
-                  const duration = Date.now() - startTime;
-                  typewriterQueueRef.current.push({ type: "finalize-think", id: currentThinkId, duration });
-                  inThinkMode = false;
-                  currentAgentId = "agent-" + Date.now();
-                  typewriterQueueRef.current.push({ type: "create", msg: { id: currentAgentId, role: "agent", text: "", isStreaming: true } });
-                  if (transitionContent) {
-                    pushTokenText(currentAgentId, transitionContent.replace(/<\/?(think|thought)>/gi, ""));
-                  }
-                } else {
-                  pushTokenText(currentThinkId, chunkText);
-                }
+            if (inThinkMode && activeStreamingMsgRef.current?.role === "think") {
+              const newText = activeStreamingMsgRef.current.text + chunkText;
+              if (newText.toLowerCase().includes("</think>")) {
+                const parts = newText.split(/<\/think>/gi);
+                const thinkPart = parts[0] || "";
+                const agentPart = parts.slice(1).join("</think>") || "";
+                activeStreamingMsgRef.current.text = flattenString(thinkPart);
+                const startTime = activeStreamingMsgRef.current.startTime || Date.now();
+                activeStreamingMsgRef.current.duration = Date.now() - startTime;
+                flushTypewriterNow();
+                commitActiveStreamingMessage();
+                inThinkMode = false;
+                currentAgentId = "agent-" + Date.now();
+                activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: "", isStreaming: true };
+                appendStreamText(agentPart.replace(/<\/?(think|thought)>/gi, ""));
               } else {
-                activeStreamMessagesRef.current = activeStreamMessagesRef.current.map((m) => {
-                  if (m.id === currentThinkId) {
-                    const newText = m.text + chunkText;
-                    if (newText.toLowerCase().includes("</think>")) {
-                      transitioning = true;
-                      const parts = newText.split(/<\/think>/gi);
-                      transitionContent = parts.slice(1).join("</think>") || "";
-                      const startTime = m.startTime || parseInt(String(m.id).split("-")[1]) || Date.now();
-                      const duration = Date.now() - startTime;
-                      return { ...m, text: parts[0], isStreaming: false, duration };
-                    }
-                    return { ...m, text: newText, isStreaming: true };
-                  }
-                  return m;
-                });
-                if (transitioning) {
-                  inThinkMode = false;
-                  currentAgentId = "agent-" + Date.now();
-                  activeStreamMessagesRef.current = [...activeStreamMessagesRef.current, { id: currentAgentId, role: "agent", text: transitionContent.replace(/<\/?(think|thought)>/gi, ""), isStreaming: true }];
-                }
-                setActiveStreamMessages([...activeStreamMessagesRef.current]);
+                appendStreamText(chunkText);
               }
             } else if (!inThinkMode) {
               const chunkLower2 = chunkText.toLowerCase();
               if (!toolCallEncounteredInTurn && (chunkLower2.includes("tool:functions.") || chunkLower2.includes("agent:generalist."))) {
                 toolCallEncounteredInTurn = true;
               }
-              if (!currentAgentId) {
+              if (!activeStreamingMsgRef.current || activeStreamingMsgRef.current.role !== "agent") {
                 currentAgentId = "agent-" + Date.now();
-                const newMsg = { id: currentAgentId, role: "agent", text: chunkText, isStreaming: true };
-                if (systemSettings.progressiveRendering) {
-                  typewriterQueueRef.current.push({ type: "create", msg: { ...newMsg, text: "" } });
-                  pushTokenText(currentAgentId, chunkText);
-                } else {
-                  activeStreamMessagesRef.current = [...activeStreamMessagesRef.current, newMsg];
-                  setActiveStreamMessages([...activeStreamMessagesRef.current]);
-                }
+                activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: flattenString(chunkText), isStreaming: true };
+                forceRender();
               } else {
-                if (systemSettings.progressiveRendering) {
-                  pushTokenText(currentAgentId, chunkText);
-                } else {
-                  const next = [...activeStreamMessagesRef.current];
-                  for (let i = next.length - 1; i >= 0; i--) {
-                    if (next[i].id === currentAgentId) {
-                      next[i] = { ...next[i], text: next[i].text + chunkText, isStreaming: true };
-                      break;
-                    }
-                  }
-                  activeStreamMessagesRef.current = next;
-                  setActiveStreamMessages([...activeStreamMessagesRef.current]);
-                }
+                appendStreamText(chunkText);
               }
             }
           }
-          if (systemSettings.progressiveRendering) {
-            streamFinishedRef.current = true;
-          } else {
-            await finalizeTurn(apiStart);
-          }
           const apiEnd = Date.now();
           setSessionApiTime((prev) => prev + (apiEnd - apiStart));
         } catch (err) {
-          if (typewriterIntervalRef.current) {
-            clearInterval(typewriterIntervalRef.current);
-            typewriterIntervalRef.current = null;
-          }
-          typewriterQueueRef.current = [];
           setMessages((prev) => {
             setCompletedIndex(prev.length + 1);
             return [...prev, { id: "error-" + Date.now(), role: "system", text: `\u274C ERROR: ${err.message}` }];
           });
         } finally {
-          if (!systemSettings.progressiveRendering) {
-            setIsProcessing(false);
-            setStatusText(null);
-            setActiveTime(0);
-            clearInterval(activeTimeIntervalRef.current);
-            if (didSignalTerminationRef.current) {
-              appendCancelMessage();
+          const totalDuration = Date.now() - apiStart;
+          if (activeStreamingMsgRef.current) {
+            activeStreamingMsgRef.current.workedDuration = totalDuration;
+          }
+          if (typewriterTickRef.current) {
+            await awaitTypewriter();
+            clearInterval(typewriterTickRef.current);
+            typewriterTickRef.current = null;
+          }
+          setIsProcessing(false);
+          setStatusText(null);
+          setActiveTime(0);
+          clearInterval(interval_for_timer);
+          commitActiveStreamingMessage();
+          if (didSignalTerminationRef.current) {
+            appendCancelMessage();
+          }
+          clearBlocksCache();
+          if (global.gc) {
+            try {
+              for (let i = 0; i < 3; i++) {
+                global.gc();
+                await new Promise((resolve) => setImmediate(resolve));
+              }
+              lastGCTimeRef.current = Date.now();
+            } catch (e) {
             }
-            clearBlocksCache();
-            if (global.gc) {
-              try {
-                for (let i = 0; i < 3; i++) {
-                  global.gc();
-                  await new Promise((resolve) => setImmediate(resolve));
+          }
+          if (!hasFiredJanitor) {
+            if (process.stdout.isTTY) {
+              process.stdout.write("\x1B]0;FluxFlow | Idle\x07");
+              process.stdout.write("\x1B]633;P;TerminalTitle=FluxFlow | Idle\x07");
+            }
+          }
+          if (queuedPromptRef.current) {
+            setResolutionData(queuedPromptRef.current);
+            setQueuedPrompt(null);
+            const hintToResolve = queuedPromptRef.current;
+            queuedPromptRef.current = null;
+            setMessages((prev) => {
+              const newMsgs = [...prev];
+              const hintMsg = newMsgs.reverse().find((m) => m.text?.includes("[STEERING HINT: QUEUED]") || m.text?.includes("[QUESTION: QUEUED]"));
+              if (hintMsg) {
+                if (hintMsg.text.includes("[STEERING HINT: QUEUED]")) {
+                  hintMsg.text = hintMsg.text.replace("[STEERING HINT: QUEUED]", "[STEERING HINT: FINISHED_TURN]");
+                } else if (hintMsg.text.includes("[QUESTION: QUEUED]")) {
+                  hintMsg.text = hintMsg.text.replace("[QUESTION: QUEUED]", "[QUESTION: FINISHED_TURN]");
                 }
-                lastGCTime = Date.now();
-              } catch (e) {
               }
-            }
+              return newMsgs.reverse();
+            });
+            setActiveView("resolution");
           }
+          setMessages((prev) => {
+            const totalDuration2 = Date.now() - apiStart;
+            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: totalDuration2 };
+              }
+              return updated;
+            }).reverse();
+            const historyToSave = newMsgs.filter((m) => !String(m.id).startsWith("welcome") && (!m.isMeta || m.text && m.text.includes("Request Cancelled")));
+            saveChat(chatId, null, historyToSave);
+            setCompletedIndex(newMsgs.length);
+            return newMsgs;
+          });
         }
       };
       streamChat();
@@ -19627,7 +19538,7 @@ Selection: ${val}`,
                 } else if (selectedProvider === "DeepSeek") {
                   defaultModel = "deepseek-v4-flash";
                 } else if (selectedProvider === "NVIDIA") {
-                  defaultModel = "stepfun-ai/step-3.7-flash";
+                  defaultModel = "deepseek-ai/deepseek-v4-flash";
                 }
                 setActiveModel(defaultModel);
                 const targetTier = (quotas.providerTiers || {})[selectedProvider] || "Free";
@@ -19955,7 +19866,7 @@ Selection: ${val}`,
                 } else if (prov === "DeepSeek") {
                   defaultModel = "deepseek-v4-flash";
                 } else if (prov === "NVIDIA") {
-                  defaultModel = "stepfun-ai/step-3.7-flash";
+                  defaultModel = "moonshotai/kimi-k2.6";
                 }
                 setActiveModel(defaultModel);
                 const targetTier = (quotas.providerTiers || {})[prov] || "Free";
@@ -20800,15 +20711,15 @@ var init_app = __esm({
           }
         }
         if (endIdx !== -1) {
-          const beforeText = text.substring(lastIdx, match.index);
+          const beforeText = flattenString(text.substring(lastIdx, match.index));
           if (beforeText.trim()) {
             blocks.push({ type: "output", content: beforeText });
           }
-          const finalArgsText = text.substring(startIdx + 1, closingParenIdx);
+          const finalArgsText = flattenString(text.substring(startIdx + 1, closingParenIdx));
           blocks.push({
             type: "tool",
-            toolName: toolName.trim(),
-            args: finalArgsText.trim()
+            toolName: flattenString(toolName.trim()),
+            args: flattenString(finalArgsText.trim())
           });
           lastIdx = endIdx + 1;
           toolRegex.lastIndex = lastIdx;
@@ -20817,7 +20728,7 @@ var init_app = __esm({
         }
       }
       if (lastIdx < text.length) {
-        const remainingText = text.substring(lastIdx);
+        const remainingText = flattenString(text.substring(lastIdx));
         if (remainingText.trim()) {
           blocks.push({ type: "output", content: remainingText });
         }
@@ -20829,14 +20740,16 @@ var init_app = __esm({
       let lastScanTime = 0;
       return (dir) => {
         const now = Date.now();
-        if (cachedFiles && now - lastScanTime < 5e3) {
+        if (cachedFiles && now - lastScanTime < 1e4) {
           return cachedFiles;
         }
         const fileList = [];
         const scan = (currentDir) => {
+          if (fileList.length >= 2e3) return;
           try {
             const files = fs24.readdirSync(currentDir);
             for (const file of files) {
+              if (fileList.length >= 2e3) return;
               if (["node_modules", ".git", ".gemini", "dist", "build", ".next", ".cache", "out"].includes(file)) {
                 continue;
               }
@@ -20846,8 +20759,8 @@ var init_app = __esm({
                 scan(filePath);
               } else {
                 fileList.push({
-                  name: file,
-                  relativePath: path22.relative(process.cwd(), filePath)
+                  name: flattenString(file),
+                  relativePath: flattenString(path22.relative(process.cwd(), filePath))
                 });
               }
             }