fluxflow-cli 3.2.7 → 3.3.1

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,
@@ -2562,7 +2563,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}`;
       if (!msg.isStreaming && blocksCache.has(cacheKey)) {
         return blocksCache.get(cacheKey);
       }
@@ -4124,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;
@@ -4257,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;
           }
@@ -4313,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);
@@ -4969,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;
@@ -5205,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
@@ -5984,6 +5991,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:
@@ -6152,6 +6160,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) => {
@@ -6188,7 +6202,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") {
@@ -6236,7 +6250,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))
@@ -8923,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) {
@@ -9001,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}`;
         }
@@ -9825,8 +9846,11 @@ var init_invokeSync = __esm({
         }
         return result;
       } catch (err) {
+        const { isTerminationSignaled: isTerminationSignaled2 } = await init_ai().then(() => ai_exports);
+        const isCancelled = err.message === "Subagent task was cancelled by user." || isTerminationSignaled2();
         if (context.onVisualFeedback) {
-          context.onVisualFeedback(`\x1B[95mSubAgent\x1B[0m: \x1B[32mGeneralist\x1B[0m \u2192 ${title} [FAILED]
+          const statusLabel = isCancelled ? "[CANCELLED]" : "[FAILED]";
+          context.onVisualFeedback(`\x1B[95mSubAgent\x1B[0m: \x1B[32mGeneralist\x1B[0m \u2192 ${title} ${statusLabel}
 `);
         }
         return `ERROR: Subagent execution failed: ${err.message}`;
@@ -9946,8 +9970,18 @@ ${finalAnswer}`);
         if (context.onSubagentUpdate) {
           context.onSubagentUpdate();
         }
-      }).catch((err) => {
-        if (taskEntry.status === "cancelled") return;
+      }).catch(async (err) => {
+        const { isTerminationSignaled: isTerminationSignaled2 } = await init_ai().then(() => ai_exports);
+        const isCancelled = err.message === "Subagent task was cancelled." || taskEntry.status === "cancelled" || isTerminationSignaled2();
+        if (isCancelled) {
+          taskEntry.status = "cancelled";
+          currentTurnLogs.push(`[SUBAGENT CANCELLED] Task was cancelled.`);
+          taskEntry.progress.push([...currentTurnLogs]);
+          if (context.onSubagentUpdate) {
+            context.onSubagentUpdate();
+          }
+          return;
+        }
         currentTurnLogs.push(`[SUBAGENT FAILURE] Error: ${err.message}`);
         taskEntry.progress.push([...currentTurnLogs]);
         taskEntry.status = "failed";
@@ -10700,6 +10734,7 @@ __export(ai_exports, {
   getCleanGroupedLength: () => getCleanGroupedLength,
   initAI: () => initAI,
   isModelMultimodal: () => isModelMultimodal,
+  isTerminationSignaled: () => isTerminationSignaled,
   runJanitorTask: () => runJanitorTask,
   runSubagent: () => runSubagent,
   signalTermination: () => signalTermination
@@ -10707,7 +10742,7 @@ __export(ai_exports, {
 import { GoogleGenAI, ThinkingLevel, HarmBlockThreshold, HarmCategory } from "@google/genai";
 import path21, { normalize } from "path";
 import fs22 from "fs";
-var client, globalSettings, colorMainWords, withRetry, TERMINATION_SIGNAL, MULTIMODAL_MODELS, isModelMultimodal, getCleanGroupedLength, stripAnsi2, fetchWithBackoff, getDeepSeekStream, getNVIDIAStream, wrapNvidiaStreamWithQueueDepth, getOpenRouterStream, signalTermination, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, translateKimiToolCalls, detectToolCalls, initAI, generateSimpleContent, consolidatePastMemories, compressHistory, deleteChatSummary, getAIStream, runSubagent;
+var client, globalSettings, colorMainWords, withRetry, TERMINATION_SIGNAL, MULTIMODAL_MODELS, isModelMultimodal, getCleanGroupedLength, stripAnsi2, fetchWithBackoff, getDeepSeekStream, getNVIDIAStream, wrapNvidiaStreamWithQueueDepth, getOpenRouterStream, signalTermination, isTerminationSignaled, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, translateKimiToolCalls, detectToolCalls, initAI, generateSimpleContent, consolidatePastMemories, compressHistory, deleteChatSummary, getAIStream, runSubagent;
 var init_ai = __esm({
   async "src/utils/ai.js"() {
     await init_prompts();
@@ -10820,10 +10855,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;
         }
@@ -10846,7 +10889,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 = [];
@@ -11415,6 +11463,9 @@ var init_ai = __esm({
     signalTermination = () => {
       TERMINATION_SIGNAL = true;
     };
+    isTerminationSignaled = () => {
+      return TERMINATION_SIGNAL;
+    };
     TOOL_LABELS2 = {
       "write_file": "Writing",
       "update_file": "Editing",
@@ -11995,6 +12046,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") => {
@@ -12003,78 +12080,93 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
         let fullText = "";
         let usageMetadata = null;
         const normalizedContents = typeof contents === "string" ? [{ role: "user", parts: [{ text: contents }] }] : contents;
-        let stream;
-        if (aiProvider === "OpenRouter") {
-          stream = getOpenRouterStream(apiKey, model, normalizedContents, systemInstruction, thinkingLevel, mode, false, null, temperature);
-        } else if (aiProvider === "DeepSeek") {
-          stream = getDeepSeekStream(apiKey, model, normalizedContents, systemInstruction, thinkingLevel, mode, false, null, temperature);
-        } else if (aiProvider === "NVIDIA") {
-          stream = getNVIDIAStream(apiKey, model, normalizedContents, systemInstruction, thinkingLevel, mode, false, null, temperature);
-        } else {
-          const genStream = await client.models.generateContentStream({
-            model,
-            contents: normalizedContents,
-            config: {
-              systemInstruction,
-              temperature,
-              thinkingConfig: (() => {
-                const modelLower = (model || "").toLowerCase();
-                const isGemma4 = modelLower.includes("gemma-4") || modelLower.startsWith("gemma");
-                const isGemini3 = modelLower.includes("gemini-3");
-                if (isGemma4 || isGemini3) {
-                  if (isGemma4) {
-                    if (thinkingLevel.toLowerCase() !== "xhigh" || false) return { includeThoughts: false, thinkingLevel: ThinkingLevel.MINIMAL };
-                    else return { includeThoughts: true, thinkingLevel: ThinkingLevel.HIGH };
-                  }
-                  return {
-                    includeThoughts: true,
-                    thinkingLevel: {
-                      "Fast": modelLower.includes("pro") ? ThinkingLevel.LOW : ThinkingLevel.MINIMAL,
-                      "Low": ThinkingLevel.LOW,
-                      "Medium": ThinkingLevel.MEDIUM,
-                      "Standard": ThinkingLevel.MEDIUM,
-                      "High": ThinkingLevel.HIGH,
-                      "xHigh": ThinkingLevel.HIGH
-                    }[thinkingLevel] || ThinkingLevel.MEDIUM
-                  };
-                } else {
-                  const budget = {
-                    "Fast": 0,
-                    "Low": 512,
-                    "Medium": 2048,
-                    "Standard": 2048,
-                    "High": 16384,
-                    "xHigh": 24576
-                  }[thinkingLevel] || 2048;
-                  if (budget === 0) {
-                    return { includeThoughts: false };
+        const abortController = new AbortController();
+        const signal = abortController.signal;
+        let connectionPollInterval = setInterval(() => {
+          if (TERMINATION_SIGNAL) {
+            abortController.abort();
+            clearInterval(connectionPollInterval);
+          }
+        }, 100);
+        try {
+          let stream;
+          if (aiProvider === "OpenRouter") {
+            stream = getOpenRouterStream(apiKey, model, normalizedContents, systemInstruction, thinkingLevel, mode, false, signal, temperature);
+          } else if (aiProvider === "DeepSeek") {
+            stream = getDeepSeekStream(apiKey, model, normalizedContents, systemInstruction, thinkingLevel, mode, false, signal, temperature);
+          } else if (aiProvider === "NVIDIA") {
+            stream = getNVIDIAStream(apiKey, model, normalizedContents, systemInstruction, thinkingLevel, mode, false, signal, temperature);
+          } else {
+            const genStream = await client.models.generateContentStream({
+              model,
+              contents: normalizedContents,
+              config: {
+                systemInstruction,
+                temperature,
+                thinkingConfig: (() => {
+                  const modelLower = (model || "").toLowerCase();
+                  const isGemma4 = modelLower.includes("gemma-4") || modelLower.startsWith("gemma");
+                  const isGemini3 = modelLower.includes("gemini-3");
+                  if (isGemma4 || isGemini3) {
+                    if (isGemma4) {
+                      if (thinkingLevel.toLowerCase() !== "xhigh" || false) return { includeThoughts: false, thinkingLevel: ThinkingLevel.MINIMAL };
+                      else return { includeThoughts: true, thinkingLevel: ThinkingLevel.HIGH };
+                    }
+                    return {
+                      includeThoughts: true,
+                      thinkingLevel: {
+                        "Fast": modelLower.includes("pro") ? ThinkingLevel.LOW : ThinkingLevel.MINIMAL,
+                        "Low": ThinkingLevel.LOW,
+                        "Medium": ThinkingLevel.MEDIUM,
+                        "Standard": ThinkingLevel.MEDIUM,
+                        "High": ThinkingLevel.HIGH,
+                        "xHigh": ThinkingLevel.HIGH
+                      }[thinkingLevel] || ThinkingLevel.MEDIUM
+                    };
+                  } else {
+                    const budget = {
+                      "Fast": 0,
+                      "Low": 512,
+                      "Medium": 2048,
+                      "Standard": 2048,
+                      "High": 16384,
+                      "xHigh": 24576
+                    }[thinkingLevel] || 2048;
+                    if (budget === 0) {
+                      return { includeThoughts: false };
+                    }
+                    return {
+                      includeThoughts: true,
+                      thinkingBudget: budget
+                    };
                   }
-                  return {
-                    includeThoughts: true,
-                    thinkingBudget: budget
-                  };
-                }
-              })()
-            }
-          });
-          stream = genStream;
-        }
-        for await (const chunk of stream) {
-          if (settings?.taskId && typeof subagentProgress !== "undefined") {
-            const taskObj = subagentProgress.find((t) => t.id === settings.taskId);
-            if (taskObj && taskObj.status === "cancelled") {
+                })()
+              }
+            }, { signal });
+            stream = genStream;
+          }
+          for await (const chunk of stream) {
+            if (TERMINATION_SIGNAL) {
               throw new Error("Subagent task was cancelled.");
             }
-          }
-          if (settings && typeof settings.onTokenChunk === "function") {
-            settings.onTokenChunk();
-          }
-          if (chunk.candidates?.[0]?.content?.parts) {
-            for (const part of chunk.candidates[0].content.parts) {
-              if (part.text && !part.thought) fullText += part.text;
+            if (settings?.taskId && typeof subagentProgress !== "undefined") {
+              const taskObj = subagentProgress.find((t) => t.id === settings.taskId);
+              if (taskObj && taskObj.status === "cancelled") {
+                throw new Error("Subagent task was cancelled.");
+              }
             }
+            if (settings && typeof settings.onTokenChunk === "function") {
+              settings.onTokenChunk();
+            }
+            if (chunk.candidates?.[0]?.content?.parts) {
+              for (const part of chunk.candidates[0].content.parts) {
+                if (part.text && !part.thought) fullText += part.text;
+              }
+            }
+            if (chunk.usageMetadata) usageMetadata = chunk.usageMetadata;
           }
-          if (chunk.usageMetadata) usageMetadata = chunk.usageMetadata;
+        } finally {
+          clearInterval(connectionPollInterval);
         }
         if (usageMetadata) {
           const total = usageMetadata.totalTokenCount || 0;
@@ -12911,7 +13003,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}
@@ -12919,7 +13011,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;
@@ -12965,7 +13057,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") {
@@ -12973,7 +13065,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..."}` };
@@ -13020,6 +13112,7 @@ ${activeSummaryBlock}${thinkingLevel !== "Fast" && thinkingLevel !== "xHigh" &&
                 let text = msg.text || "";
                 if (msg.role === "agent") {
                   text = text.replace(/\[turn:\s*finish\]/gi, "").replace(/\[\[END\]\]/gi, "").trim();
+                  text = text.replaceAll("\x1B[33m\u24D8 Request Cancelled\x1B[0m", "*User Cancelled Response Generation*");
                 }
                 const parts = [{ text }];
                 if (msg.binaryPart && isModelMultimodal(targetModel)) {
@@ -14915,8 +15008,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 = `
@@ -14953,6 +15046,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);
@@ -14970,7 +15067,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`
@@ -15013,6 +15110,14 @@ Current Time: ${(/* @__PURE__ */ new Date()).toLocaleString("en-US", { year: "nu
       let turn = 0;
       let finalAnswer = "";
       while (turn < maxTurns) {
+        if (TERMINATION_SIGNAL) {
+          if (settings?.taskId && typeof subagentProgress !== "undefined") {
+            const taskObj = subagentProgress.find((t) => t.id === settings.taskId);
+            if (taskObj) taskObj.status = "cancelled";
+          }
+          if (logCallback) logCallback(`[SUBAGENT CANCELLED] Subagent task was cancelled.`);
+          throw new Error("Subagent task was cancelled.");
+        }
         if (settings?.taskId && typeof subagentProgress !== "undefined") {
           const taskObj = subagentProgress.find((t) => t.id === settings.taskId);
           if (taskObj && taskObj.status === "cancelled") {
@@ -15039,6 +15144,13 @@ ${cleanResponse}
         }
         let toolResultsStr = "";
         for (const toolCall of toolCalls) {
+          if (TERMINATION_SIGNAL) {
+            if (settings?.taskId && typeof subagentProgress !== "undefined") {
+              const taskObj = subagentProgress.find((t) => t.id === settings.taskId);
+              if (taskObj) taskObj.status = "cancelled";
+            }
+            throw new Error("Subagent task was cancelled.");
+          }
           if (settings?.taskId && typeof subagentProgress !== "undefined") {
             const taskObj = subagentProgress.find((t) => t.id === settings.taskId);
             if (taskObj && taskObj.status === "cancelled") {
@@ -15062,17 +15174,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;
@@ -16116,6 +16231,8 @@ function App({ args = [] }) {
   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 = {
@@ -16131,6 +16248,58 @@ function App({ args = [] }) {
       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;
@@ -16790,11 +16959,9 @@ 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];
-    for (let j = 0; j < streamingCompletedBlocks.length; j++) {
-      finalCompleted.push(streamingCompletedBlocks[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: {
@@ -18548,7 +18715,7 @@ ${timestamp}` };
             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
             }];
@@ -18647,6 +18814,8 @@ ${timestamp}` };
                 setActiveCommand(null);
                 setIsTerminalFocused(false);
                 setExecOutput("");
+                activeCommandRef.current = null;
+                execOutputRef.current = "";
               },
               onToolResult: (status, toolName) => {
                 if (status === "success") {
@@ -18784,6 +18953,9 @@ Selection: ${val}`,
             if (isFirstPacket && packet.type === "text") {
               apiStart = Date.now();
               isFirstPacket = false;
+              if (systemSettings.progressiveRendering) {
+                startTypewriter();
+              }
             }
             if (packet.type === "status") {
               if (!packet.content?.includes("[start]")) {
@@ -18803,6 +18975,7 @@ Selection: ${val}`,
                 sendStatus(packet.content);
               }
               if (packet.content === "Request Cancelled") {
+                flushTypewriterNow();
                 commitActiveStreamingMessage();
                 appendCancelMessage();
               }
@@ -18831,6 +19004,7 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "turn_reset") {
+              flushTypewriterNow();
               currentThinkId = null;
               currentAgentId = null;
               inThinkMode = false;
@@ -18886,6 +19060,7 @@ Selection: ${val}`,
               continue;
             }
             if (packet.type === "visual_feedback") {
+              flushTypewriterNow();
               commitActiveStreamingMessage();
               setMessages((prev) => {
                 const newMsgs = [...prev, {
@@ -19041,13 +19216,14 @@ Selection: ${val}`,
                   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();
-              activeStreamingMsgRef.current = { id: currentThinkId, role: "think", text: flattenString(thinkStartText), isStreaming: true, startTime: Date.now() };
-              forceRender();
+              activeStreamingMsgRef.current = { id: currentThinkId, role: "think", text: "", isStreaming: true, startTime: Date.now() };
+              appendStreamText(thinkStartText);
               continue;
             }
             if ((chunkLower.includes("</think>") || chunkLower.includes("</thought>")) && activeStreamingMsgRef.current?.role === "think") {
@@ -19057,11 +19233,12 @@ Selection: ${val}`,
               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();
-              activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: flattenString(agentPart), isStreaming: true };
-              forceRender();
+              activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: "", isStreaming: true };
+              appendStreamText(agentPart);
               continue;
             }
             if (inThinkMode && activeStreamingMsgRef.current?.role === "think") {
@@ -19073,14 +19250,15 @@ Selection: ${val}`,
                 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: flattenString(agentPart.replace(/<\/?(think|thought)>/gi, "")), isStreaming: true };
+                activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: "", isStreaming: true };
+                appendStreamText(agentPart.replace(/<\/?(think|thought)>/gi, ""));
               } else {
-                activeStreamingMsgRef.current.text = flattenString(newText);
+                appendStreamText(chunkText);
               }
-              forceRender();
             } else if (!inThinkMode) {
               const chunkLower2 = chunkText.toLowerCase();
               if (!toolCallEncounteredInTurn && (chunkLower2.includes("tool:functions.") || chunkLower2.includes("agent:generalist."))) {
@@ -19089,10 +19267,10 @@ Selection: ${val}`,
               if (!activeStreamingMsgRef.current || activeStreamingMsgRef.current.role !== "agent") {
                 currentAgentId = "agent-" + Date.now();
                 activeStreamingMsgRef.current = { id: currentAgentId, role: "agent", text: flattenString(chunkText), isStreaming: true };
+                forceRender();
               } else {
-                activeStreamingMsgRef.current.text = flattenString(activeStreamingMsgRef.current.text + chunkText);
+                appendStreamText(chunkText);
               }
-              forceRender();
             }
           }
           const apiEnd = Date.now();
@@ -19103,6 +19281,15 @@ Selection: ${val}`,
             return [...prev, { id: "error-" + Date.now(), role: "system", text: `\u274C ERROR: ${err.message}` }];
           });
         } finally {
+          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);
@@ -19148,7 +19335,7 @@ Selection: ${val}`,
             setActiveView("resolution");
           }
           setMessages((prev) => {
-            const totalDuration = Date.now() - apiStart;
+            const totalDuration2 = Date.now() - apiStart;
             let foundLastAgent = false;
             const newMsgs = [...prev].reverse().map((m) => {
               let updated = m.isStreaming ? { ...m, isStreaming: false } : m;
@@ -19157,7 +19344,7 @@ Selection: ${val}`,
               }
               if (!foundLastAgent && updated.role === "agent") {
                 foundLastAgent = true;
-                updated = { ...updated, workedDuration: totalDuration };
+                updated = { ...updated, workedDuration: totalDuration2 };
               }
               return updated;
             }).reverse();

package/package.json

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