fluxflow-cli 3.2.2 → 3.2.5

package/dist/fluxflow.js

@@ -326,7 +326,8 @@ var init_settings = __esm({
         useExternalData: false,
         externalDataPath: "",
         preserveThinking: true,
-        loadingPhrases: true
+        loadingPhrases: true,
+        progressiveRendering: false
       },
       profileData: {
         name: null,
@@ -2138,7 +2139,8 @@ var init_text = __esm({
           if (currentVisibleLength + tokenVisibleLength > width) {
             if (currentLine.trim().length > 0) {
               finalLines.push(currentLine.trimEnd());
-              currentLine = indent + token;
+              const cappedIndent = indent.substring(0, Math.min(indent.length, 8));
+              currentLine = cappedIndent + token;
               currentVisibleLength = getVisibleLength(currentLine);
             } else {
               if (ansiRegex.test(token)) {
@@ -2227,36 +2229,20 @@ var init_text = __esm({
       };
       const adjustIndentation = (newText, originalMatch, leadingContext = "") => {
         if (!newText || originalMatch === void 0) return newText;
-        const getIndentStyle = (text) => {
-          const lines = text.split("\n").filter((l) => l.trim() !== "");
-          if (lines.length === 0) return { char: " ", size: 4 };
-          const firstIndent = lines[0].match(/^\s*/)[0];
-          if (firstIndent.includes("	")) return { char: "	", size: 1 };
-          const indents = lines.map((l) => l.match(/^\s*/)[0].length).filter((l) => l > 0);
-          if (indents.length === 0) return { char: " ", size: firstIndent.length || 4 };
-          const gcd = (a, b) => b ? gcd(b, a % b) : a;
-          const step = indents.reduce((a, b) => gcd(a, b));
-          return { char: " ", size: step || 4 };
-        };
-        const fileStyle = getIndentStyle(originalMatch);
-        const modelStyle = getIndentStyle(newText);
-        const matchMinIndent = getMinIndent(originalMatch).length;
-        const leadingIndent = (leadingContext.match(/^\s*/) || [""])[0].length;
-        const targetBaseIndentRaw = leadingIndent + matchMinIndent;
-        const targetUnits = targetBaseIndentRaw / fileStyle.size;
-        const modelBaseUnits = getMinIndent(newText).length / modelStyle.size;
-        const deltaUnits = targetUnits - modelBaseUnits;
+        const usesTabs = /^\t/m.test(originalMatch);
+        const indentChar = usesTabs ? "	" : " ";
+        const firstNonEmpty = (text) => text.split("\n").find((l) => l.trim() !== "") ?? "";
+        const origFirstIndent = firstNonEmpty(originalMatch).match(/^\s*/)[0].length;
+        const newFirstIndent = firstNonEmpty(newText).match(/^\s*/)[0].length;
+        const delta = origFirstIndent - newFirstIndent;
+        const leadingLen = (leadingContext.match(/^\s*/) || [""])[0].length;
         const newLines = newText.split("\n");
         return newLines.map((line, i) => {
           if (line.trim() === "" && i !== 0) return "";
-          const currentLineUnits = line.match(/^\s*/)[0].length / modelStyle.size;
-          const finalUnits = Math.max(0, currentLineUnits + deltaUnits);
-          let unitCount = finalUnits;
-          if (i === 0) {
-            const leadingUnits = leadingIndent / fileStyle.size;
-            unitCount = Math.max(0, finalUnits - leadingUnits);
-          }
-          return fileStyle.char.repeat(unitCount * fileStyle.size) + line.trimStart();
+          const currentIndent = line.match(/^\s*/)[0].length;
+          let targetIndent = Math.max(0, currentIndent + delta);
+          if (i === 0) targetIndent = Math.max(0, targetIndent - leadingLen);
+          return indentChar.repeat(targetIndent) + line.trimStart();
         }).join("\n");
       };
       const patchMatches = [];
@@ -2559,7 +2545,7 @@ var init_text = __esm({
     };
     parseMessageToBlocks = (msg, columns) => {
       if (!msg) return { completed: [], active: [] };
-      const cacheKey = `${msg.id}-${msg.text?.length || 0}-${columns}-${msg.isStreaming}`;
+      const cacheKey = `${msg.id}-${msg.text?.length || 0}-${columns}-${msg.isStreaming}-${msg.workedDuration || 0}-${msg.memoryUpdated ? 1 : 0}-${msg.color || ""}`;
       if (!msg.isStreaming && blocksCache.has(cacheKey)) {
         return blocksCache.get(cacheKey);
       }
@@ -4017,7 +4003,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, REGEX_SYNTAX, 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, 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();
@@ -4073,7 +4059,6 @@ 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) => {
@@ -4085,8 +4070,8 @@ var init_ChatLayout = __esm({
       let lastIndex = 0;
       const tokens = [];
       let match;
-      REGEX_SYNTAX.lastIndex = 0;
-      while ((match = REGEX_SYNTAX.exec(line)) !== null) {
+      const localRegex = new RegExp(SYNTAX_RULES.join("|"), "g");
+      while ((match = localRegex.exec(line)) !== null) {
         const matchText = match[0];
         const matchIndex = match.index;
         if (matchIndex > lastIndex) {
@@ -4109,7 +4094,7 @@ var init_ChatLayout = __esm({
           color = "#ff9e64";
         }
         tokens.push({ text: matchText, color, bold });
-        lastIndex = REGEX_SYNTAX.lastIndex;
+        lastIndex = localRegex.lastIndex;
       }
       if (lastIndex < line.length) {
         tokens.push({ text: line.substring(lastIndex) });
@@ -4311,12 +4296,12 @@ var init_ChatLayout = __esm({
       const renderInlineDiff = () => {
         if (isPureUnpairedBlock) {
           const blockColor = isRemoval ? "#ffdddd" : "#ddffdd";
-          const wrappedLines = wrapText(content, columns - 14).split("\n");
+          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))));
         }
         if (!(isRemoval || isAddition) || words.length === 0 || !hasInlineChange) {
           const textColor = isRemoval ? "#885555" : isAddition ? "#558866" : "gray";
-          const wrappedLines = wrapText(content, columns - 14).split("\n");
+          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(Text4, { wrap: "anywhere" }, words.map((part, idx) => {
@@ -4340,7 +4325,7 @@ var init_ChatLayout = __esm({
           return /* @__PURE__ */ React4.createElement(Text4, { key: idx, color: "gray" }, part.value);
         }));
       };
-      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()));
+      return /* @__PURE__ */ React4.createElement(Box3, { backgroundColor: "#1a1a1a", paddingX: 1, width: columns }, /* @__PURE__ */ React4.createElement(Box3, { width: 4, 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, extension }) => {
       const match = text.match(/\[DIFF_START\]([\s\S]*?)(?:\[DIFF_END\]|$)/);
@@ -4530,12 +4515,8 @@ var init_ChatLayout = __esm({
           Box3,
           {
             flexDirection: "column",
-            borderStyle: "single",
-            borderLeft: true,
-            borderRight: false,
-            borderTop: false,
-            borderBottom: false,
-            borderColor: "#444444",
+            borderStyle: "round",
+            border: true,
             paddingLeft: 2,
             paddingRight: 0,
             paddingTop: 1,
@@ -4552,12 +4533,8 @@ var init_ChatLayout = __esm({
           Box3,
           {
             flexDirection: "column",
-            borderStyle: "single",
-            borderLeft: true,
-            borderRight: false,
-            borderTop: false,
-            borderBottom: false,
-            borderColor: "#444444",
+            borderStyle: "round",
+            border: true,
             paddingLeft: 2,
             paddingRight: 0,
             paddingTop: 1,
@@ -4744,7 +4721,7 @@ var init_ChatLayout = __esm({
             paddingLeft: 2,
             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, { width: 5, flexShrink: 0 }, /* @__PURE__ */ React4.createElement(Text4, { color: "gray", dimColor: true }, String(lineNum).padStart(4, " "), " ")),
           /* @__PURE__ */ React4.createElement(Box3, { flexGrow: 1 }, renderHighlightedLine(text, lang, "#e1e4e8"))
         );
       }
@@ -4852,16 +4829,30 @@ var init_StatusBar = __esm({
       if (delay >= 5e3) return "#ff0000";
       const points = [
         { t: 370, r: 0, g: 165, b: 100 },
-        { t: 800, r: 120, g: 220, b: 80 },
-        { t: 1500, r: 250, g: 210, b: 40 },
-        { t: 3e3, r: 255, g: 120, b: 0 },
+        // deep green
+        { t: 550, r: 40, g: 195, b: 80 },
+        // green
+        { t: 800, r: 120, g: 220, b: 50 },
+        // lime-green
+        { t: 1100, r: 190, g: 225, b: 20 },
+        // yellow-green
+        { t: 1500, r: 250, g: 210, b: 15 },
+        // yellow
+        { t: 2e3, r: 255, g: 170, b: 0 },
+        // amber
+        { t: 2800, r: 255, g: 110, b: 0 },
+        // orange
+        { t: 3800, r: 255, g: 50, b: 0 },
+        // deep orange
         { t: 5e3, r: 255, g: 0, b: 0 }
+        // red
       ];
       for (let i = 0; i < points.length - 1; i++) {
         const p1 = points[i];
         const p2 = points[i + 1];
         if (delay >= p1.t && delay <= p2.t) {
-          const ratio = (delay - p1.t) / (p2.t - p1.t);
+          let ratio = (delay - p1.t) / (p2.t - p1.t);
+          ratio = ratio * ratio * (3 - 2 * ratio);
           const r = Math.round(p1.r + (p2.r - p1.r) * ratio);
           const g = Math.round(p1.g + (p2.g - p1.g) * ratio);
           const b = Math.round(p1.b + (p2.b - p1.b) * ratio);
@@ -4877,6 +4868,7 @@ var init_StatusBar = __esm({
       const [memoryUnit, setMemoryUnit] = useState5("MB");
       const [dotColor, setDotColor] = useState5("green");
       const chunkTimesRef = useRef3([]);
+      const smoothedDelayRef = useRef3(370);
       useEffect4(() => {
         if (!isProcessing) {
           chunkTimesRef.current = [];
@@ -4886,7 +4878,7 @@ var init_StatusBar = __esm({
           const times = chunkTimesRef.current;
           if (times.length === 0 || times[times.length - 1] !== lastChunkTime) {
             times.push(lastChunkTime);
-            if (times.length > 5) {
+            if (times.length > 10) {
               times.shift();
             }
           }
@@ -4906,8 +4898,13 @@ var init_StatusBar = __esm({
             averageInterval = sum / (times.length - 1);
           }
           const timeSinceLast = Date.now() - lastChunkTime;
-          const delay = Math.max(averageInterval, timeSinceLast);
-          setDotColor(getLatencyColor(delay));
+          const STALL_THRESHOLD = 2500;
+          const isStalled = timeSinceLast >= STALL_THRESHOLD;
+          const cappedTimeSinceLast = !isStalled && averageInterval > 0 ? Math.min(timeSinceLast, averageInterval * 3) : timeSinceLast;
+          const rawDelay = Math.max(averageInterval, cappedTimeSinceLast);
+          const alpha = isStalled ? 0.4 : 0.2;
+          smoothedDelayRef.current = smoothedDelayRef.current * (1 - alpha) + rawDelay * alpha;
+          setDotColor(getLatencyColor(smoothedDelayRef.current));
         };
         checkLatency();
         const timer = setInterval(checkLatency, 100);
@@ -5200,11 +5197,11 @@ Info: 'initial' = user prompted for THIS active task, revert 'id' should be a tu
 1. [tool:functions.EmergencyRollback(method="getCheckpoint/forceRevert", id="...")]. Rollback workspace to a specific checkpoint in THIS agent loop. Usage: ONLY in catastrophic situations. Verify nothing catastrophic happened in codebase before ending agent loop. 'id' not needed with getCheckPoint
 ` : ""}
 - SUB AGENT TOOLS -
-**PROACTIVE USE OF SUB AGENTS HIGHLY RECOMMENDED, PREFER USING FOR ALL TASK WHERE PLAUSIBLE & BENEFICIAL, EVEN WITHOUT EXPLICIT USER NUDGE**
+**PROACTIVE USE OF SUB AGENTS HIGHLY RECOMMENDED, PREFER USING FOR ALL TASK WHERE EVEN SLIGHTLY BENEFICIAL, EVEN WITHOUT EXPLICIT USER NUDGE**
 Invocation Types:
 - Invoke (async, background worker for parallel tasks, upto 7 parallel agents together). Usage: Benefits parallelism & speed. Can take long time, If invoked DO NOT REPEAT SAME TASK WHILE ACTIVE
-- InvokeSync (sync, blocking main agent loop). Usage: Repeatetive work, Sequential tasks, Task delegation. Huge tokens/costs savings
-1. [agent:generalist.InvokeSync/Invoke(title="...", task="...")]. Task must me detailed, including exact file paths, imports/exports, dependency, folder structure
+- InvokeSync (sync, blocking main agent loop). Usage: Repeatetive work, Sequential tasks, Task delegation. Tokens/Costs savings
+1. [agent:generalist.InvokeSync/Invoke(title="...", task="...")]. Task must me detailed, including exact file paths, imports/exports, dependency, folder structure. No terminal access
 2. [agent:generalist.GetProgress(id="...")]. Usage: Check progress of async subagent task, taking time? continue your task, MUST await (exponentially longer after 1st check) than spamming getProgress. NEVER FINISH WITHOUT 'AWAIT' WHILE SUBAGENT WORKING
 3. [agent:generalist.Cancel(id="...")]. Usage: Cancel async subagent task, LAST RESORT ONLY IF ITS STUCK FOR UNUSUALLY LONG (2m+) WITH NO PROGRESS`.trim() : `- CREATIVE TOOLS (path = relative to CWD & WILL BE FIRST ARGUMENT, path separator: '/') -
 1. [tool:functions.WritePDF(path="...", content="...", orientation="...")]. PROACTIVE A4 PAGE BREAKS MUST IN CSS. HTML/CSS for PREMIUM layout
@@ -5969,6 +5966,7 @@ function SettingsMenu({
           { label: "Key Strategy", value: "apiTier", status: apiTier === "Free" ? "Free" : quotas?.providerBudgets?.__useProvider ? "Paid" : "Paid" },
           { label: "Preserve Thinking", value: "preserveThinking", status: systemSettings.preserveThinking !== false ? "ON" : "OFF" },
           { label: "Loading Phrases", value: "loadingPhrases", status: systemSettings.loadingPhrases !== false ? "ON" : "OFF" },
+          { label: "Progressive Rendering [EXPERIMENTAL]", value: "progressiveRendering", status: systemSettings.progressiveRendering ? "ON" : "OFF" },
           { label: "Download Language Parsers", value: "parserDownload", status: "ACTION" }
         ];
       default:
@@ -6137,6 +6135,12 @@ function SettingsMenu({
         saveSettings2({ systemSettings: newSysSettings, apiTier, quotas });
         return newSysSettings;
       });
+    } else if (item.value === "progressiveRendering") {
+      setSystemSettings((s) => {
+        const newSysSettings = { ...s, progressiveRendering: !s.progressiveRendering };
+        saveSettings2({ systemSettings: newSysSettings, apiTier, quotas });
+        return newSysSettings;
+      });
     }
   };
   return /* @__PURE__ */ React7.createElement(Box6, { flexDirection: "column", borderStyle: "round", borderColor: "white", padding: 0, width: "100%", minHeight: 32 }, /* @__PURE__ */ React7.createElement(Box6, { paddingX: 1, paddingY: 0, marginBottom: 0, borderStyle: "single", borderColor: "gray", width: "100%" }, /* @__PURE__ */ React7.createElement(Text7, { color: "white", bold: true }, "SYSTEM CONFIGURATION")), /* @__PURE__ */ React7.createElement(Box6, { flexDirection: "row", width: "100%", minHeight: 26 }, /* @__PURE__ */ React7.createElement(Box6, { flexDirection: "column", width: "30%", borderStyle: "round", borderColor: activeColumn === "categories" ? "white" : "grey", padding: 1, paddingY: 0 }, /* @__PURE__ */ React7.createElement(Box6, { marginBottom: 1 }, /* @__PURE__ */ React7.createElement(Text7, { color: activeColumn === "categories" ? "white" : "grey", bold: true, underline: true }, "CATEGORIES")), CATEGORIES.map((cat, index) => {
@@ -6173,7 +6177,7 @@ function SettingsMenu({
     currentItems.forEach((item, index) => {
       const isSelected = activeColumn === "items" && selectedItemIndex === index;
       const labelLength = item.label.length;
-      const dotsCount = Math.max(2, 35 - labelLength);
+      const dotsCount = Math.max(2, 38 - labelLength);
       const dots = ".".repeat(dotsCount);
       const getStatusColor = (item2) => {
         if (currentCatId === "security") {
@@ -6221,7 +6225,7 @@ function SettingsMenu({
     });
     if (currentCatId === "other") {
       elements.push(
-        /* @__PURE__ */ React7.createElement(Box6, { key: "pty-notice", marginTop: 15, paddingX: 1 }, /* @__PURE__ */ React7.createElement(Text7, { color: "white" }, isPtyAvailable ? "\u2713 Advance Interactive Terminal Supported" : "\u26A0 Interactive Terminal is Limited"))
+        /* @__PURE__ */ React7.createElement(Box6, { key: "pty-notice", marginTop: 14, paddingX: 1 }, /* @__PURE__ */ React7.createElement(Text7, { color: "white" }, isPtyAvailable ? "\u2713 Advance Interactive Terminal Supported" : "\u26A0 Interactive Terminal is Limited"))
       );
       elements.push(
         /* @__PURE__ */ React7.createElement(Box6, { key: "memory-load-2026", paddingX: 1 }, /* @__PURE__ */ React7.createElement(Text7, { color: "gray" }, "Memory Load: ", currentMemory, "/", maxMemory, " ", memoryUnit))
@@ -10763,7 +10767,7 @@ var init_ai = __esm({
       "openai/gpt-5.5-pro",
       "moonshotai/kimi-k2.6",
       // NVIDIA vision models
-      "moonshotai/kimi-k2.6",
+      "moonshotai/kimi-k2.7",
       "stepfun-ai/step-3.7-flash",
       "google/gemma-4-31b-it",
       "mistralai/mistral-medium-3.5-128b",
@@ -11193,6 +11197,8 @@ var init_ai = __esm({
                 push({ value: { type: "status", content: `Queue ${depth || 1}` }, done: false });
               }
             }
+          } else if (!isStreamingStarted) {
+            push({ value: { type: "status", content: `Queue '${res.status}'` }, done: false });
           }
         } catch (e) {
         }
@@ -14953,7 +14959,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")]. Global project text search',
+        "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`,
         "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`
@@ -16033,7 +16039,7 @@ var init_GlintText = __esm({
         return () => clearInterval(timer);
       }, [displayedText.length, speed, glintWidth]);
       useEffect11(() => {
-        if (text && text.includes("Trying to reach") && displayedText && displayedText.includes("Trying to reach")) {
+        if (text && (text.includes("Trying to reach") && displayedText && displayedText.includes("Trying to reach") || text.includes("Error Occurred") && displayedText && displayedText.includes("Error Occurred"))) {
           setDisplayedText(text);
           return;
         }
@@ -16474,8 +16480,8 @@ function App({ args = [] }) {
         defaultModel = "deepseek-v4-flash";
         modelDisplayName = "DeepSeek Flash (Free default)";
       } else if (aiProvider === "NVIDIA") {
-        defaultModel = "moonshotai/kimi-k2.6";
-        modelDisplayName = "Moonshot Kimi (NVIDIA)";
+        defaultModel = "stepfun-ai/step-3.7-flash";
+        modelDisplayName = "Step 3.7 Flash (NVIDIA)";
       } else {
         defaultModel = "google/gemma-4-31b-it:free";
         modelDisplayName = "Gemma 4 (Free default)";
@@ -16488,8 +16494,8 @@ function App({ args = [] }) {
         defaultModel = "deepseek-v4-flash";
         modelDisplayName = "DeepSeek Flash";
       } else if (aiProvider === "NVIDIA") {
-        defaultModel = "moonshotai/kimi-k2.6";
-        modelDisplayName = "Moonshot Kimi (NVIDIA)";
+        defaultModel = "stepfun-ai/step-3.7-flash";
+        modelDisplayName = "Step 3.7 Flash (NVIDIA)";
       } else {
         defaultModel = "deepseek/deepseek-v4-flash";
         modelDisplayName = "DeepSeek Flash";
@@ -16550,7 +16556,7 @@ function App({ args = [] }) {
   const [wittyPhrase, setWittyPhrase] = useState15("");
   const [hasPasteBlock, setHasPasteBlock] = useState15(false);
   const [activeTime, setActiveTime] = useState15(0);
-  let interval_for_timer;
+  const activeTimeIntervalRef = useRef4(null);
   useEffect12(() => {
     let interval;
     if (statusText && systemSettings.loadingPhrases !== false) {
@@ -16661,6 +16667,11 @@ 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,
@@ -16734,7 +16745,7 @@ function App({ args = [] }) {
         };
       }
     }
-    const activeMsgs = messages.slice(completedIndex);
+    const activeMsgs = activeStreamMessages;
     const streamingCompletedBlocks = [];
     const activeBlocks = [];
     for (let i = 0; i < activeMsgs.length; i++) {
@@ -16750,7 +16761,15 @@ 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];
+    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]);
     }
@@ -16770,7 +16789,7 @@ function App({ args = [] }) {
       completed: finalCompleted,
       active: activeBlocks
     };
-  }, [messages, completedIndex, terminalSize.columns, clearKey, chatId]);
+  }, [messages, activeStreamMessages, completedIndex, terminalSize.columns, clearKey, chatId]);
   const isTerminalWaitingForInput = useMemo2(() => {
     if (!activeCommand || !execOutput) return false;
     const lastChunk = execOutput.trim();
@@ -17068,7 +17087,7 @@ function App({ args = [] }) {
           } else if (startupProvider === "OpenRouter") {
             defaultModel = "google/gemma-4-31b-it:free";
           } else if (startupProvider === "NVIDIA") {
-            defaultModel = "moonshotai/kimi-k2.6";
+            defaultModel = "stepfun-ai/step-3.7-flash";
           }
         } else {
           if (startupProvider === "Google") {
@@ -17078,7 +17097,7 @@ function App({ args = [] }) {
           } else if (startupProvider === "OpenRouter") {
             defaultModel = "deepseek/deepseek-v4-flash";
           } else if (startupProvider === "NVIDIA") {
-            defaultModel = "moonshotai/kimi-k2.6";
+            defaultModel = "stepfun-ai/step-3.7-flash";
           }
         }
         setActiveModel(defaultModel);
@@ -17295,7 +17314,7 @@ function App({ args = [] }) {
       } else if (aiProvider === "DeepSeek") {
         defaultModel = "deepseek-v4-flash";
       } else if (aiProvider === "NVIDIA") {
-        defaultModel = "moonshotai/kimi-k2.6";
+        defaultModel = "stepfun-ai/step-3.7-flash";
       }
       setActiveModel(defaultModel);
       setMessages((prev) => [...prev, { role: "system", text: `${aiProvider} API Key saved successfully! Model set to ${defaultModel}. Initialization complete.`, isMeta: true }]);
@@ -17469,9 +17488,13 @@ function App({ args = [] }) {
       ] : aiProvider === "NVIDIA" ? [
         // --- Kimi (Moonshot AI) ---
         {
-          cmd: "moonshotai/kimi-k2.6",
+          cmd: "moonshotai/kimi-k2.7",
           desc: "Multimodal"
         },
+        {
+          cmd: "moonshotai/kimi-k2.6",
+          desc: "[DEPRICATED]"
+        },
         // --- DeepSeek Family ---
         {
           cmd: "deepseek-ai/deepseek-v4-flash",
@@ -17510,10 +17533,6 @@ function App({ args = [] }) {
           desc: "Text Only"
         },
         // --- GLM (Zhipu AI) ---
-        {
-          cmd: "z-ai/glm-5.1",
-          desc: "Text Only [DEPRICATED]"
-        },
         {
           cmd: "z-ai/glm-5.2",
           desc: "Text Only"
@@ -17854,7 +17873,7 @@ ${cleanText}`, color: "magenta" }];
           setTimeout(() => {
             if (global.gc) {
               const gCAsync = async () => {
-                for (let i = 0; i < 5; i++) {
+                for (let i = 0; i < 3; i++) {
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
@@ -17881,7 +17900,7 @@ ${cleanText}`, color: "magenta" }];
           setTimeout(() => {
             if (global.gc) {
               const gCAsync = async () => {
-                for (let i = 0; i < 5; i++) {
+                for (let i = 0; i < 3; i++) {
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
@@ -18504,12 +18523,24 @@ ${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 updatedPrev = prev.map((m) => m.isStreaming ? { ...m, isStreaming: false } : m);
+            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 newMsgs = [...updatedPrev, {
               id: "cancel-" + Date.now(),
               role: "system",
@@ -18520,6 +18551,159 @@ ${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 = 1;
+              if (queue.length > 35) batchSize = 5;
+              else if (queue.length > 15) batchSize = 3;
+              else if (queue.length > 5) batchSize = 2;
+              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);
+            }
+          }, 35);
+        };
+        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());
@@ -18741,27 +18925,29 @@ 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());
             }
             if (isFirstPacket && packet.type === "text") {
               apiStart = Date.now();
               isFirstPacket = false;
+              if (systemSettings.progressiveRendering) {
+                startTypewriter(apiStart);
+              }
             }
             if (packet.type === "status") {
               if (!packet.content?.includes("[start]")) {
                 setStatusText(packet.content);
               }
               if (packet.content?.includes("[start]")) {
-                clearInterval(interval_for_timer);
+                clearInterval(activeTimeIntervalRef.current);
                 setActiveTime(0);
-                interval_for_timer = setInterval(() => {
+                activeTimeIntervalRef.current = setInterval(() => {
                   setActiveTime((prev) => prev + 1);
                 }, 1e3);
               } else if (packet.content?.includes("[end]")) {
                 setActiveTime(0);
-                clearInterval(interval_for_timer);
+                clearInterval(activeTimeIntervalRef.current);
               }
               if (isBridgeConnected()) {
                 sendStatus(packet.content);
@@ -18794,6 +18980,9 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "turn_reset") {
+              if (systemSettings.progressiveRendering) {
+                await awaitTypewriter();
+              }
               currentThinkId = null;
               currentAgentId = null;
               inThinkMode = false;
@@ -18801,21 +18990,29 @@ Selection: ${val}`,
               inToolCall = false;
               toolCallEncounteredInTurn = false;
               thinkConsumedInTurn = false;
+              const streamingMsgs = activeStreamMessagesRef.current;
+              activeStreamMessagesRef.current = [];
+              setActiveStreamMessages([]);
               setMessages((prev) => {
-                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;
+                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, ...flushed];
                 setCompletedIndex(newMsgs.length);
                 return newMsgs;
               });
               clearBlocksCache();
               if (global.gc) {
-                for (let i = 0; i < 2; i++) {
+                for (let i = 0; i < 1; i++) {
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
@@ -18826,7 +19023,7 @@ Selection: ${val}`,
             if (packet.type === "interactive_turn_finished") {
               setIsProcessing(false);
               setActiveTime(0);
-              clearInterval(interval_for_timer);
+              clearInterval(activeTimeIntervalRef.current);
               if (isBridgeConnected()) {
                 sendStatus(null);
               }
@@ -18849,9 +19046,15 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "visual_feedback") {
+              if (systemSettings.progressiveRendering) {
+                await awaitTypewriter();
+              }
+              const streamingMsgs = activeStreamMessagesRef.current;
+              activeStreamMessagesRef.current = [];
+              setActiveStreamMessages([]);
               setMessages((prev) => {
-                const updatedPrev = prev.map((m) => m.isStreaming ? { ...m, isStreaming: false } : m);
-                const newMsgs = [...updatedPrev, {
+                const flushed = streamingMsgs.map((m) => ({ ...m, isStreaming: false }));
+                const newMsgs = [...prev, ...flushed, {
                   id: "feedback-" + Date.now() + "-" + Math.random().toString(36).substring(2, 9),
                   role: "system",
                   text: packet.content,
@@ -18889,9 +19092,15 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "tool_result") {
+              if (systemSettings.progressiveRendering) {
+                await awaitTypewriter();
+              }
+              const streamingMsgs = activeStreamMessagesRef.current;
+              activeStreamMessagesRef.current = [];
+              setActiveStreamMessages([]);
               setMessages((prev) => {
-                const updatedPrev = prev.map((m) => m.isStreaming ? { ...m, isStreaming: false } : m);
-                const newMsgs = [...updatedPrev, {
+                const flushed = streamingMsgs.map((m) => ({ ...m, isStreaming: false }));
+                const newMsgs = [...prev, ...flushed, {
                   id: "tool-" + Date.now(),
                   role: "system",
                   text: packet.content,
@@ -18957,7 +19166,7 @@ Selection: ${val}`,
             let chunkText = packet.content;
             if (packet.type === "text" && chunkText.includes("Request Cancelled")) {
               if (global.gc) {
-                for (let i = 0; i < 5; i++) {
+                for (let i = 0; i < 3; i++) {
                   global.gc();
                   await new Promise((resolve) => setImmediate(resolve));
                 }
@@ -19000,26 +19209,62 @@ Selection: ${val}`,
               if (beforeText) {
                 if (!currentAgentId) {
                   currentAgentId = "agent-" + Date.now();
-                  setMessages((prev) => [...prev, { id: currentAgentId, role: "agent", text: beforeText, isStreaming: true }]);
+                  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];
+                  }
                 } else {
-                  setMessages((prev) => prev.map(
-                    (m) => m.id === currentAgentId ? { ...m, text: m.text + beforeText, isStreaming: true } : m
-                  ));
+                  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]);
                 }
               }
               inThinkMode = true;
               thinkConsumedInTurn = true;
               let thinkStartText = afterText.replace(/<(think|thought)>/gi, "");
               currentThinkId = "think-" + Date.now();
-              setMessages((prev) => [...prev, { id: currentThinkId, role: "think", text: thinkStartText, isStreaming: true, startTime: 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]);
+              }
               continue;
             }
             if ((chunkLower.includes("</think>") || chunkLower.includes("</thought>")) && currentThinkId) {
               const parts = chunkText.split(/<\/(think|thought)>/gi);
               const thinkPart = parts[0] || "";
               const agentPart = parts.slice(2).join("").replace(/<\/?(think|thought)>/gi, "");
-              setMessages((prev) => {
-                const newMsgs = prev.map((m) => {
+              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;
@@ -19027,40 +19272,56 @@ Selection: ${val}`,
                   }
                   return m;
                 });
-                inThinkMode = false;
-                currentAgentId = "agent-" + Date.now();
-                return [...newMsgs, { id: currentAgentId, role: "agent", text: agentPart, isStreaming: true }];
-              });
+                activeStreamMessagesRef.current = [...activeStreamMessagesRef.current, { id: currentAgentId, role: "agent", text: agentPart, isStreaming: true }];
+                setActiveStreamMessages([...activeStreamMessagesRef.current]);
+              }
               continue;
             }
             if (inThinkMode && currentThinkId) {
-              setMessages((prev) => {
-                const next = [...prev];
-                let transitioning = false;
-                let transitionContent = "";
-                for (let i = next.length - 1; i >= 0; i--) {
-                  if (next[i].id === currentThinkId) {
-                    const newText = next[i].text + chunkText;
+              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);
+                }
+              } 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 = next[i].startTime || parseInt(String(next[i].id).split("-")[1]) || Date.now();
+                      const startTime = m.startTime || parseInt(String(m.id).split("-")[1]) || Date.now();
                       const duration = Date.now() - startTime;
-                      next[i] = { ...next[i], text: parts[0], isStreaming: false, duration };
-                    } else {
-                      next[i] = { ...next[i], text: newText, isStreaming: true };
+                      return { ...m, text: parts[0], isStreaming: false, duration };
                     }
-                    break;
+                    return { ...m, text: newText, isStreaming: true };
                   }
-                }
+                  return m;
+                });
                 if (transitioning) {
                   inThinkMode = false;
                   currentAgentId = "agent-" + Date.now();
-                  next.push({ id: currentAgentId, role: "agent", text: transitionContent.replace(/<\/?(think|thought)>/gi, ""), isStreaming: true });
+                  activeStreamMessagesRef.current = [...activeStreamMessagesRef.current, { id: currentAgentId, role: "agent", text: transitionContent.replace(/<\/?(think|thought)>/gi, ""), isStreaming: true }];
                 }
-                return next;
-              });
+                setActiveStreamMessages([...activeStreamMessagesRef.current]);
+              }
             } else if (!inThinkMode) {
               const chunkLower2 = chunkText.toLowerCase();
               if (!toolCallEncounteredInTurn && (chunkLower2.includes("tool:functions.") || chunkLower2.includes("agent:generalist."))) {
@@ -19068,91 +19329,69 @@ Selection: ${val}`,
               }
               if (!currentAgentId) {
                 currentAgentId = "agent-" + Date.now();
-                setMessages((prev) => [...prev, { id: currentAgentId, role: "agent", text: chunkText, isStreaming: true }]);
+                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]);
+                }
               } else {
-                setMessages((prev) => {
-                  const next = [...prev];
+                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;
                     }
                   }
-                  return next;
-                });
+                  activeStreamMessagesRef.current = next;
+                  setActiveStreamMessages([...activeStreamMessagesRef.current]);
+                }
               }
             }
           }
+          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 {
-          setIsProcessing(false);
-          setStatusText(null);
-          setActiveTime(0);
-          clearInterval(interval_for_timer);
-          if (didSignalTerminationRef.current) {
-            appendCancelMessage();
-          }
-          clearBlocksCache();
-          if (global.gc) {
-            try {
-              for (let i = 0; i < 5; 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 (!systemSettings.progressiveRendering) {
+            setIsProcessing(false);
+            setStatusText(null);
+            setActiveTime(0);
+            clearInterval(activeTimeIntervalRef.current);
+            if (didSignalTerminationRef.current) {
+              appendCancelMessage();
             }
-          }
-          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]");
+            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) {
               }
-              return newMsgs.reverse();
-            });
-            setActiveView("resolution");
+            }
           }
-          setMessages((prev) => {
-            const totalDuration = 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: 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;
-          });
         }
       };
       streamChat();
@@ -19386,7 +19625,7 @@ Selection: ${val}`,
                 } else if (selectedProvider === "DeepSeek") {
                   defaultModel = "deepseek-v4-flash";
                 } else if (selectedProvider === "NVIDIA") {
-                  defaultModel = "moonshotai/kimi-k2.6";
+                  defaultModel = "stepfun-ai/step-3.7-flash";
                 }
                 setActiveModel(defaultModel);
                 const targetTier = (quotas.providerTiers || {})[selectedProvider] || "Free";
@@ -19714,7 +19953,7 @@ Selection: ${val}`,
                 } else if (prov === "DeepSeek") {
                   defaultModel = "deepseek-v4-flash";
                 } else if (prov === "NVIDIA") {
-                  defaultModel = "moonshotai/kimi-k2.6";
+                  defaultModel = "stepfun-ai/step-3.7-flash";
                 }
                 setActiveModel(defaultModel);
                 const targetTier = (quotas.providerTiers || {})[prov] || "Free";
@@ -20625,16 +20864,30 @@ var init_app = __esm({
       if (delay >= 5e3) return "#ff0000";
       const points = [
         { t: 370, r: 0, g: 165, b: 100 },
-        { t: 800, r: 120, g: 220, b: 80 },
-        { t: 1500, r: 250, g: 210, b: 40 },
-        { t: 3e3, r: 255, g: 120, b: 0 },
+        // deep green
+        { t: 550, r: 40, g: 195, b: 80 },
+        // green
+        { t: 800, r: 120, g: 220, b: 50 },
+        // lime-green
+        { t: 1100, r: 190, g: 225, b: 20 },
+        // yellow-green
+        { t: 1500, r: 250, g: 210, b: 15 },
+        // yellow
+        { t: 2e3, r: 255, g: 170, b: 0 },
+        // amber
+        { t: 2800, r: 255, g: 110, b: 0 },
+        // orange
+        { t: 3800, r: 255, g: 50, b: 0 },
+        // deep orange
         { t: 5e3, r: 255, g: 0, b: 0 }
+        // red
       ];
       for (let i = 0; i < points.length - 1; i++) {
         const p1 = points[i];
         const p2 = points[i + 1];
         if (delay >= p1.t && delay <= p2.t) {
-          const ratio = (delay - p1.t) / (p2.t - p1.t);
+          let ratio = (delay - p1.t) / (p2.t - p1.t);
+          ratio = ratio * ratio * (3 - 2 * ratio);
           const r = Math.round(p1.r + (p2.r - p1.r) * ratio);
           const g = Math.round(p1.g + (p2.g - p1.g) * ratio);
           const b = Math.round(p1.b + (p2.b - p1.b) * ratio);
@@ -20646,6 +20899,7 @@ var init_app = __esm({
     SubagentRow = React16.memo(({ sa }) => {
       const [dotColor, setDotColor] = useState15("green");
       const chunkTimesRef = useRef4([]);
+      const smoothedDelayRef = useRef4(370);
       useEffect12(() => {
         if (sa.status !== "running") {
           chunkTimesRef.current = [];
@@ -20656,7 +20910,7 @@ var init_app = __esm({
           const times = chunkTimesRef.current;
           if (times.length === 0 || times[times.length - 1] !== lastChunkTime) {
             times.push(lastChunkTime);
-            if (times.length > 5) {
+            if (times.length > 10) {
               times.shift();
             }
           }
@@ -20676,8 +20930,13 @@ var init_app = __esm({
             averageInterval = sum / (times.length - 1);
           }
           const timeSinceLast = Date.now() - lastChunkTime;
-          const delay = Math.max(averageInterval, timeSinceLast);
-          setDotColor(getLatencyColor2(delay));
+          const STALL_THRESHOLD = 2500;
+          const isStalled = timeSinceLast >= STALL_THRESHOLD;
+          const cappedTimeSinceLast = !isStalled && averageInterval > 0 ? Math.min(timeSinceLast, averageInterval * 3) : timeSinceLast;
+          const rawDelay = Math.max(averageInterval, cappedTimeSinceLast);
+          const alpha = isStalled ? 0.4 : 0.2;
+          smoothedDelayRef.current = smoothedDelayRef.current * (1 - alpha) + rawDelay * alpha;
+          setDotColor(getLatencyColor2(smoothedDelayRef.current));
         };
         checkLatency();
         const timer = setInterval(checkLatency, 100);

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "fluxflow-cli",
-    "version": "3.2.2",
-    "date": "2026-07-07",
+    "version": "3.2.5",
+    "date": "2026-07-08",
     "description": "A High-Fidelity Agentic CLI with Sub-Agents for the Flux Era.",
     "keywords": [
         "ai",