fluxflow-cli 1.17.5 → 1.18.1

package/dist/fluxflow.js

@@ -97,7 +97,7 @@ var init_MultilineInput = __esm({
             };
           }
           return {
-            preCursor: [{ value: " ", type: "cursor" }],
+            preCursor: [{ value: showCursor && focus ? "\u2502" : "", type: "cursor" }],
             postCursor: []
           };
         }
@@ -119,7 +119,7 @@ var init_MultilineInput = __esm({
             preCursor: [
               { value: formattedBefore.slice(0, lineStart) },
               { value: formattedBefore.slice(lineStart), type: "highlight" },
-              { value: showCursor && focus ? " " : "", type: "cursor" }
+              { value: showCursor && focus ? "\u2502" : "", type: "cursor" }
             ],
             postCursor: [
               { value: formattedAfter.slice(0, lineEnd), type: "highlight" },
@@ -135,7 +135,7 @@ var init_MultilineInput = __esm({
                 type: "highlight"
               },
               { value: formatText(textBefore.slice(highlight.end)) },
-              { value: " ", type: "cursor" }
+              { value: showCursor && focus ? "\u2502" : "", type: "cursor" }
             ],
             postCursor: [
               {
@@ -188,8 +188,10 @@ var init_MultilineInput = __esm({
               return highlightStyle ?? textStyle;
             case "cursor":
               return {
-                ...highlightStyle ?? textStyle,
-                inverse: showCursor && focus
+                ...textStyle,
+                color: "cyan",
+                bold: true,
+                inverse: false
               };
             default:
               return textStyle;
@@ -207,6 +209,7 @@ var init_MultilineInput = __esm({
       showCursor = true,
       highlightPastedText = false,
       focus = true,
+      columns = 80,
       useCustomInput = (inputHandler, isActive) => useInput(inputHandler, { isActive }),
       ...controlledProps
     }) => {
@@ -217,6 +220,49 @@ var init_MultilineInput = __esm({
           setCursorIndex(value.length);
         }
       }, [value, cursorIndex]);
+      const getVisualPosition = useCallback((index) => {
+        const text = normalizeLineEndings(value);
+        const lines = text.split("\n");
+        const wrapWidth = Math.max(20, columns - 10);
+        let visualLine = 0;
+        let visualCol = 0;
+        let currentIdx = 0;
+        for (let i = 0; i < lines.length; i++) {
+          const line = lines[i];
+          const lineLen = line.length;
+          if (index >= currentIdx && index <= currentIdx + lineLen) {
+            const offsetInLine = index - currentIdx;
+            visualLine += Math.floor(offsetInLine / wrapWidth);
+            visualCol = offsetInLine % wrapWidth;
+            return { visualLine, visualCol };
+          }
+          const numVisualLines = Math.max(1, Math.ceil(lineLen / wrapWidth));
+          visualLine += numVisualLines;
+          currentIdx += lineLen + 1;
+        }
+        return { visualLine, visualCol };
+      }, [value, columns]);
+      const getIndexFromVisual = useCallback((targetLine, targetCol) => {
+        const text = normalizeLineEndings(value);
+        const lines = text.split("\n");
+        const wrapWidth = Math.max(20, columns - 10);
+        let currentVisualLine = 0;
+        let currentIdx = 0;
+        for (let i = 0; i < lines.length; i++) {
+          const line = lines[i];
+          const lineLen = line.length;
+          const numVisualLines = Math.max(1, Math.ceil(lineLen / wrapWidth));
+          if (targetLine >= currentVisualLine && targetLine < currentVisualLine + numVisualLines) {
+            const lineOffset = (targetLine - currentVisualLine) * wrapWidth;
+            const colInLine = Math.min(targetCol, lineLen - lineOffset);
+            const finalCol = Math.max(0, colInLine);
+            return Math.min(currentIdx + lineOffset + finalCol, currentIdx + lineLen);
+          }
+          currentVisualLine += numVisualLines;
+          currentIdx += lineLen + 1;
+        }
+        return value.length;
+      }, [value, columns]);
       useCustomInput((input, key) => {
         const submitKey = keyBindings?.submit ?? ((key2) => key2.return && key2.ctrl);
         const newlineKey = keyBindings?.newline ?? ((key2) => key2.return);
@@ -233,83 +279,26 @@ var init_MultilineInput = __esm({
         if (key.tab || key.shift && key.tab || key.ctrl && input === "c") {
           return;
         }
-        if (keyBindings?.newline?.(key)) {
-          const newValue = value.slice(0, cursorIndex) + "\n" + value.slice(cursorIndex);
-          onChange(newValue);
-          setCursorIndex(cursorIndex + 1);
-          setPasteLength(0);
-          return;
-        }
         let nextPasteLength = 0;
         if (input.length > 1) {
           nextPasteLength = input.length;
         }
         if (key.upArrow) {
           if (showCursor) {
-            const lines = normalizeLineEndings(value).split("\n");
-            let currentLineIndex = 0;
-            let currentPos = 0;
-            let col = 0;
-            for (let i = 0; i < lines.length; i++) {
-              const line = lines[i];
-              if (line === void 0) continue;
-              const lineLen = line.length;
-              const lineEnd = currentPos + lineLen;
-              if (cursorIndex >= currentPos && cursorIndex <= lineEnd) {
-                currentLineIndex = i;
-                col = cursorIndex - currentPos;
-                break;
-              }
-              currentPos = lineEnd + 1;
-            }
-            if (currentLineIndex > 0) {
-              const targetLineIndex = currentLineIndex - 1;
-              const targetLine = lines[targetLineIndex];
-              if (targetLine !== void 0) {
-                const targetLineLen = targetLine.length;
-                const newCol = Math.min(col, targetLineLen);
-                let newIndex = 0;
-                for (let i = 0; i < targetLineIndex; i++) {
-                  newIndex += lines[i].length + 1;
-                }
-                newIndex += newCol;
-                setCursorIndex(newIndex);
-                setPasteLength(0);
-              }
+            const { visualLine, visualCol } = getVisualPosition(cursorIndex);
+            if (visualLine > 0) {
+              const newIndex = getIndexFromVisual(visualLine - 1, visualCol);
+              setCursorIndex(newIndex);
+              setPasteLength(0);
             }
           }
         } else if (key.downArrow) {
           if (showCursor) {
-            const lines = normalizeLineEndings(value).split("\n");
-            let currentLineIndex = 0;
-            let currentPos = 0;
-            let col = 0;
-            for (let i = 0; i < lines.length; i++) {
-              const line = lines[i];
-              if (line === void 0) continue;
-              const lineLen = line.length;
-              const lineEnd = currentPos + lineLen;
-              if (cursorIndex >= currentPos && cursorIndex <= lineEnd) {
-                currentLineIndex = i;
-                col = cursorIndex - currentPos;
-                break;
-              }
-              currentPos = lineEnd + 1;
-            }
-            if (currentLineIndex < lines.length - 1) {
-              const targetLineIndex = currentLineIndex + 1;
-              const targetLine = lines[targetLineIndex];
-              if (targetLine !== void 0) {
-                const targetLineLen = targetLine.length;
-                const newCol = Math.min(col, targetLineLen);
-                let newIndex = 0;
-                for (let i = 0; i < targetLineIndex; i++) {
-                  newIndex += lines[i].length + 1;
-                }
-                newIndex += newCol;
-                setCursorIndex(newIndex);
-                setPasteLength(0);
-              }
+            const { visualLine, visualCol } = getVisualPosition(cursorIndex);
+            const newIndex = getIndexFromVisual(visualLine + 1, visualCol);
+            if (newIndex !== cursorIndex) {
+              setCursorIndex(newIndex);
+              setPasteLength(0);
             }
           }
         } else if (key.leftArrow) {
@@ -374,66 +363,53 @@ var init_text = __esm({
   "src/utils/text.js"() {
     wrapText = (text, width) => {
       if (!text) return "";
-      const sourceLines = text.split(/\r?\n/);
+      const ansiRegex = /\x1B\[[0-?]*[ -/]*[@-~]/g;
+      const sourceLines = text.split("\n");
       let finalLines = [];
       if (width <= 5) return text;
+      const getVisibleLength = (str) => str.replace(ansiRegex, "").length;
       sourceLines.forEach((sLine) => {
-        if (sLine.length <= width) {
+        const visibleLength = getVisibleLength(sLine);
+        if (visibleLength <= width) {
           finalLines.push(sLine);
           return;
         }
         const tokens = sLine.split(/(\s+)/);
         let currentLine = "";
-        let originalXPos = 0;
-        let lastSignificantGap = 0;
+        let currentVisibleLength = 0;
         const leadingSpaceMatch = sLine.match(/^(\s*)/);
-        if (leadingSpaceMatch) {
-          lastSignificantGap = leadingSpaceMatch[1].length;
-        }
-        const listMatch = sLine.match(/^\s*([-*]|\d+\.)\s+/);
-        if (listMatch) {
-          lastSignificantGap = listMatch[0].length;
-        }
+        const indent = leadingSpaceMatch ? leadingSpaceMatch[1] : "";
         tokens.forEach((token, idx) => {
           if (token.length === 0) return;
-          const isWhitespace = token.trim().length === 0;
-          if (isWhitespace) {
-            if (token.length >= 2) {
-              lastSignificantGap = originalXPos + token.length;
-            }
-            if (currentLine.length > 0) {
-              currentLine += token;
-            }
-          } else {
-            if (token.includes("|") || token.includes("\u2502")) {
-              const pipeIdx = token.includes("|") ? token.indexOf("|") : token.indexOf("\u2502");
-              lastSignificantGap = originalXPos + pipeIdx + 1;
-            }
-            if ((currentLine + token).length > width) {
-              if (currentLine.trim().length > 0) {
-                finalLines.push(currentLine.replace(/\s+$/, ""));
-                const safeIndent = Math.min(lastSignificantGap, Math.max(0, width - 12));
-                const indent = " ".repeat(safeIndent);
-                currentLine = indent + token;
-                while (currentLine.length > width && width > 20) {
-                  finalLines.push(currentLine.substring(0, width));
-                  currentLine = indent + currentLine.substring(width);
-                }
+          const tokenVisibleLength = getVisibleLength(token);
+          if (currentVisibleLength + tokenVisibleLength > width) {
+            if (currentLine.trim().length > 0) {
+              finalLines.push(currentLine.trimEnd());
+              currentLine = indent + token;
+              currentVisibleLength = getVisibleLength(currentLine);
+            } else {
+              if (ansiRegex.test(token)) {
+                finalLines.push(token);
+                currentLine = indent;
+                currentVisibleLength = getVisibleLength(currentLine);
               } else {
                 let word = token;
-                while (word.length > width && width > 5) {
+                while (getVisibleLength(word) > width && width > 10) {
                   finalLines.push(word.substring(0, width));
                   word = word.substring(width);
                 }
                 currentLine = word;
+                currentVisibleLength = getVisibleLength(currentLine);
               }
-            } else {
-              currentLine += token;
             }
+          } else {
+            currentLine += token;
+            currentVisibleLength += tokenVisibleLength;
           }
-          originalXPos += token.length;
         });
-        if (currentLine) finalLines.push(currentLine.replace(/\s+$/, ""));
+        if (currentLine.trimEnd().length > 0 || currentLine === indent) {
+          finalLines.push(currentLine.trimEnd());
+        }
       });
       return finalLines.join("\n");
     };
@@ -463,10 +439,14 @@ var TerminalBox;
 var init_TerminalBox = __esm({
   "src/components/TerminalBox.jsx"() {
     init_text();
-    TerminalBox = React2.memo(({ command, output, completed = false, isFocused = false, columns = 80 }) => {
-      const cleanOutput = (output || "").replace(/\r/g, "").trim();
-      const wrappedOutput = cleanOutput ? wrapText(cleanOutput, columns - 6) : "";
-      return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", borderStyle: isFocused ? "double" : "round", borderColor: completed ? "#334155" : isFocused ? "yellow" : "cyan", paddingX: 2, paddingY: completed ? 0 : 1, width: "100%" }, /* @__PURE__ */ React2.createElement(Box2, { marginBottom: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "gray" : isFocused ? "yellow" : "cyan", bold: true }, completed ? "\u{1F3C1} FINISHED:" : "\u26A1 EXECUTING:", " "), /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "gray" : "white" }, command)), wrappedOutput ? /* @__PURE__ */ React2.createElement(Box2, { marginTop: completed ? 0 : 1, backgroundColor: "#0a0a0a", paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "gray" : "green" }, wrappedOutput)) : !completed && /* @__PURE__ */ React2.createElement(Box2, { marginTop: 1, backgroundColor: "#0a0a0a", paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: "gray", italic: true }, "Waiting for output...")), /* @__PURE__ */ React2.createElement(Box2, { justifyContent: "space-between", marginTop: 1 }, !completed ? /* @__PURE__ */ React2.createElement(Text2, { color: "gray", dimColor: true, italic: true }, "Double-press ESC to terminate if hanging.") : /* @__PURE__ */ React2.createElement(Box2, null), /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "#475569" : isFocused ? "yellow" : "cyan", bold: true }, completed ? "\u25CF ARCHIVED" : isFocused ? "\u25B6 TERMINAL FOCUSED" : "\u25CF LIVE (Press TAB to focus)")));
+    TerminalBox = React2.memo(({ command, output, completed = false, isFocused = false, columns = 80, isPty = false }) => {
+      const processOutput = (text) => {
+        if (!text) return "";
+        return text.split(/\r\n|\r|\n/).map((line) => line.trimEnd()).join("\n").replace(/^\n+|\n+$/g, "");
+      };
+      const cleanOutput = processOutput(output);
+      const displayOutput = isPty ? cleanOutput : cleanOutput ? wrapText(cleanOutput, columns - 6) : "";
+      return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", borderStyle: isFocused ? "double" : "round", borderColor: completed ? "#334155" : isFocused ? "yellow" : "cyan", paddingX: 2, paddingY: completed ? 0 : 1, width: "100%" }, /* @__PURE__ */ React2.createElement(Box2, { marginBottom: 1, justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React2.createElement(Box2, { flexShrink: 1, paddingRight: 2 }, /* @__PURE__ */ React2.createElement(Text2, null, /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "gray" : isFocused ? "yellow" : "cyan", bold: true }, completed ? "\u{1F3C1} FINISHED:" : "\u26A1 EXECUTING:", " "), /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "gray" : "white" }, command))), isPty && /* @__PURE__ */ React2.createElement(Box2, { flexShrink: 0, paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "gray" : "magenta", bold: true }, "ADVANCE"))), displayOutput ? /* @__PURE__ */ React2.createElement(Box2, { marginTop: completed ? 0 : 1, backgroundColor: isPty ? void 0 : "#0a0a0a", paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "gray" : void 0 }, displayOutput)) : !completed && /* @__PURE__ */ React2.createElement(Box2, { marginTop: 1, backgroundColor: isPty ? void 0 : "#0a0a0a", paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: "gray", italic: true }, "Waiting for output...")), /* @__PURE__ */ React2.createElement(Box2, { justifyContent: "space-between", marginTop: 1 }, !completed ? /* @__PURE__ */ React2.createElement(Text2, { color: "gray", dimColor: true, italic: true }, "Double-press ESC to terminate if hanging.") : /* @__PURE__ */ React2.createElement(Box2, null), /* @__PURE__ */ React2.createElement(Text2, { color: completed ? "#475569" : isFocused ? "yellow" : "cyan", bold: true }, completed ? "\u25CF ARCHIVED" : isFocused ? "\u25B6 TERMINAL FOCUSED" : "\u25CF LIVE (Press TAB to focus)")));
     });
   }
 });
@@ -510,7 +490,7 @@ var init_ChatLayout = __esm({
       "exec_command": "ExecuteCommand",
       "web_search": "WebSearch",
       "web_scrape": "ReadSite",
-      "search_keyword": "FindFiles",
+      "search_keyword": "SearchKeyword",
       "write_pdf": "CreatePDF",
       "write_docx": "CreateDocument",
       "generate_image": "GenerateImage",
@@ -744,20 +724,26 @@ var init_ChatLayout = __esm({
     DiffLine = React3.memo(({ line, columns = 80 }) => {
       const isContext = line.includes("[UI_CONTEXT]");
       const cleanLine = line.replace("[UI_CONTEXT]", "");
+      if (isContext && cleanLine.includes("\u2550")) {
+        return /* @__PURE__ */ React3.createElement(Box3, { backgroundColor: "#1a1a1a", paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(Text3, { color: "gray", dimColor: true }, "\u2550".repeat(Math.max(10, columns - 4))));
+      }
       const isRemoval = cleanLine.startsWith("-");
       const isAddition = cleanLine.startsWith("+");
-      const parts = cleanLine.substring(1).split("|");
-      const lineNum = parts[0]?.trim() || "";
-      const content = parts.slice(1).join("|");
+      const prefixChar = cleanLine[0];
+      const rest = cleanLine.substring(1);
+      const splitIdx = rest.indexOf("|");
+      const lineNum = splitIdx !== -1 ? rest.substring(0, splitIdx).trim() : "";
+      const content = splitIdx !== -1 ? rest.substring(splitIdx + 1) : rest;
       const bgColor = isRemoval ? "#3a0c0c" : isAddition ? "#0c3a1a" : "#1a1a1a";
-      const textColor = isRemoval ? "#ff4d4d" : isAddition ? "#4dff88" : "white";
-      return /* @__PURE__ */ React3.createElement(Box3, { backgroundColor: bgColor, paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { width: 5, flexShrink: 0 }, /* @__PURE__ */ React3.createElement(Text3, { color: isRemoval ? "#cf3a3a" : isAddition ? "#3acf65" : "gray", dimColor: true }, lineNum)), /* @__PURE__ */ React3.createElement(Box3, { width: 2, flexShrink: 0, marginLeft: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: textColor, bold: true }, isRemoval ? "-" : isAddition ? "+" : " ")), /* @__PURE__ */ React3.createElement(Box3, { flexGrow: 1, marginLeft: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: textColor }, wrapText(content, columns - 10))));
+      const textColor = isRemoval ? "#ff4d4d" : isAddition ? "#4dff88" : isContext ? "gray" : "white";
+      const numColor = isRemoval ? "#cf3a3a" : isAddition ? "#3acf65" : "gray";
+      return /* @__PURE__ */ React3.createElement(Box3, { backgroundColor: bgColor, paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { width: 5, flexShrink: 0 }, /* @__PURE__ */ React3.createElement(Text3, { color: numColor, dimColor: isContext }, lineNum)), /* @__PURE__ */ React3.createElement(Box3, { width: 2, flexShrink: 0, marginLeft: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: textColor, bold: true }, isRemoval ? "-" : isAddition ? "+" : " ")), /* @__PURE__ */ React3.createElement(Box3, { flexGrow: 1, marginLeft: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: textColor, dimColor: isContext }, wrapText(content, columns - 14))));
     });
     DiffBlock = React3.memo(({ text, columns = 80 }) => {
       const match = text.match(/\[DIFF_START\]([\s\S]*?)\[DIFF_END\]/);
       const diffBody = match ? match[1].trim() : "";
       const diffLines = diffBody.split("\n");
-      return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", width: "100%", marginBottom: 0 }, /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", backgroundColor: "#1a1a1a", paddingY: 0, width: "100%" }, diffLines.map((line, i) => /* @__PURE__ */ React3.createElement(DiffLine, { key: i, line, columns }))));
+      return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", width: columns - 3, marginBottom: 0 }, /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", backgroundColor: "#1a1a1a", paddingY: 0, width: "100%" }, diffLines.map((line, i) => /* @__PURE__ */ React3.createElement(DiffLine, { key: i, line, columns: columns - 3 }))));
     });
     CodeRenderer = React3.memo(({ text, columns = 80 }) => {
       if (!text) return null;
@@ -774,11 +760,11 @@ var init_ChatLayout = __esm({
         const footer = contentAndFooter[1] ? `${footerMarker}${contentAndFooter[1]}` : "";
         const codeLines = content.split("\n");
         const gutterWidth = String(codeLines.length).length;
-        return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", borderStyle: "round", borderColor: "#444", paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { alignSelf: "flex-end", marginTop: -1, marginRight: 1 }, /* @__PURE__ */ React3.createElement(Text3, { backgroundColor: "#444", color: "white" }, " FILE SNAPSHOT ")), /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", paddingY: 1, width: "100%" }, codeLines.map((line, idx) => /* @__PURE__ */ React3.createElement(Box3, { key: idx, width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React3.createElement(Text3, { color: "gray", dimColor: true }, String(idx + 1).padStart(gutterWidth, " "), " ")), /* @__PURE__ */ React3.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: "white" }, line)))))));
+        return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", width: columns - 3 }, /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", borderStyle: "round", borderColor: "#444", paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { alignSelf: "flex-end", marginTop: -1, marginRight: 1 }, /* @__PURE__ */ React3.createElement(Text3, { backgroundColor: "#444", color: "white" }, " FILE SNAPSHOT ")), /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", paddingY: 1, width: "100%" }, codeLines.map((line, idx) => /* @__PURE__ */ React3.createElement(Box3, { key: idx, width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { width: gutterWidth + 2, flexShrink: 0 }, /* @__PURE__ */ React3.createElement(Text3, { color: "gray", dimColor: true }, String(idx + 1).padStart(gutterWidth, " "), " ")), /* @__PURE__ */ React3.createElement(Box3, { flexGrow: 1 }, /* @__PURE__ */ React3.createElement(Text3, { color: "white" }, line)))))));
       }
       if (text.includes("```")) {
         const parts = text.split(/(```\w*\n?[\s\S]*?(?:```|$))/g);
-        return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", width: "100%" }, parts.map((part, i) => {
+        return /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", width: columns - 3 }, parts.map((part, i) => {
           if (part.startsWith("```")) {
             const match = part.match(/```(\w*)\n?([\s\S]*?)(?:```|$)/);
             const lang = match ? match[1] : "code";
@@ -795,10 +781,10 @@ var init_ChatLayout = __esm({
             cleanPart = cleanPart.replace(/[\r\n]+$/, "");
           }
           if (!cleanPart) return null;
-          return /* @__PURE__ */ React3.createElement(MarkdownText, { key: i, text: cleanPart, columns });
+          return /* @__PURE__ */ React3.createElement(MarkdownText, { key: i, text: cleanPart, columns: columns - 3 });
         }));
       }
-      return /* @__PURE__ */ React3.createElement(MarkdownText, { text, columns });
+      return /* @__PURE__ */ React3.createElement(MarkdownText, { text, columns: columns - 3 });
     });
     formatThinkingDuration = (ms) => {
       const totalSecs = Math.round(ms / 1e3);
@@ -876,12 +862,14 @@ var init_ChatLayout = __esm({
         ];
         return /* @__PURE__ */ React3.createElement(Box3, { marginBottom: 1, paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", borderStyle: "round", borderColor: "magenta", paddingX: 2, paddingY: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(Text3, { color: "magenta", bold: true, underline: true }, "\u{1F4DC} COMMAND REFERENCE"), /* @__PURE__ */ React3.createElement(Box3, { flexDirection: "column", marginTop: 1 }, commandList.map((c, i) => /* @__PURE__ */ React3.createElement(Box3, { key: i, flexDirection: "row" }, /* @__PURE__ */ React3.createElement(Box3, { width: 15 }, /* @__PURE__ */ React3.createElement(Text3, { color: "cyan", bold: true }, c.cmd)), /* @__PURE__ */ React3.createElement(Text3, { color: "gray" }, " - ", c.desc))))));
       }
-      if (isTerminalRecord) {
-        const cmdMatch = msg.text.match(/COMMAND: (.*)\n/);
-        const outputMatch = msg.text.match(/OUTPUT: ([\s\S]*)$/);
+      if (msg.isTerminalRecord) {
+        const cmdMatch = msg.text.match(/COMMAND: (.*)/);
+        const ptyMatch = msg.text.match(/PTY: (true|false)/);
+        const outputMatch = msg.text.match(/OUTPUT: ([\s\S]*)/);
         const cmd = cmdMatch ? cmdMatch[1] : "Unknown";
+        const isPty = ptyMatch ? ptyMatch[1] === "true" : false;
         const outputList = outputMatch ? outputMatch[1] : "";
-        return /* @__PURE__ */ React3.createElement(Box3, { marginBottom: 1, paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(TerminalBox, { command: cmd, output: outputList, completed: true, columns }));
+        return /* @__PURE__ */ React3.createElement(Box3, { marginBottom: 1, paddingX: 1, width: "100%" }, /* @__PURE__ */ React3.createElement(TerminalBox, { command: cmd, output: outputList, completed: true, columns, isPty }));
       }
       const [animationDone, setAnimationDone] = React3.useState(!msg.isStreaming);
       const content = React3.useMemo(() => cleanSignals(msg.text), [msg.text]);
@@ -1648,9 +1636,22 @@ var init_secrets = __esm({
 });
 
 // src/data/main_tools.js
-var TOOL_PROTOCOL;
+import { execSync } from "child_process";
+var _isPsAvailable, isPsAvailable, TOOL_PROTOCOL;
 var init_main_tools = __esm({
   "src/data/main_tools.js"() {
+    _isPsAvailable = null;
+    isPsAvailable = () => {
+      if (process.platform !== "win32") return false;
+      if (_isPsAvailable !== null) return _isPsAvailable;
+      try {
+        execSync('powershell.exe -NoProfile -Command "exit"', { stdio: "ignore" });
+        _isPsAvailable = true;
+      } catch (e) {
+        _isPsAvailable = false;
+      }
+      return _isPsAvailable;
+    };
     TOOL_PROTOCOL = (mode, osDetected) => `
 -- TOOL DEFINITIONS --
 Access to internal tools. To call a tool, MUST use the exact syntax on a new line: [tool:functions.ToolName(args)]
@@ -1668,10 +1669,10 @@ Suggest best options; don't ask for preferences
 ${mode === "Flux" ? `- PROJECT TOOLS (path = relative to CWD) -
 1. [tool:functions.ReadFile(path="...", startLine=number, endLine=number)]. Supports images/docs. User gives image/doc: VIEW FIRST
 2. [tool:functions.ReadFolder(path="...")]. Detailed DIR stats
-3. [tool:functions.PatchFile(path="...", replaceContent="exact old content", newContent="new content")]. Surgical patching. Unsure replaceContent? ReadFile > guessing
+3. [tool:functions.PatchFile(path="...", replaceContent1="exact string", newContent1="...", ...MAX 8)]. Surgical Patch. Unsure? ReadFile > guessing. Multiple blocks same file? Use replaceContent2, newContent2 etc.
 4. [tool:functions.WriteFile(path="...", content="...")]. Creates/Overwrites. File Exist? PatchFile >> WriteFile. Verify Imports
-5. [tool:functions.SearchKeyword(keyword="...")]. Global project search. Finds definitions/logic without reading every file
-6. [tool:functions.Run(command="...")]. Runs a ${osDetected === "Windows" ? "Windows CMD" : "Bash"} command. Destructive/Irreversible ops -> Ask user
+5. [tool:functions.SearchKeyword(keyword="...", file="path/to/file")]. Global project search. If 'file' is provided, searches only that file. Finds definitions/logic without reading every file
+6. [tool:functions.Run(command="...")]. Runs a ${osDetected === "Windows" ? isPsAvailable() ? "Windows Powershell" : "Windows CMD" : "Bash"} command. Destructive/Irreversible ops -> Ask user
 7. [tool:functions.GenerateImage(path="... png", prompt="detailed", ratio="16:9, 9:16, 1:1")]. Usage: Mockups, PDF thumbnails, any visual content
 8. [tool:functions.WritePDF(path="...", content="...", orientation="...")]. PROACTIVE A4 PAGE BREAKS MUST IN CSS. HTML/CSS for PREMIUM layout (100vh/vw)
 9. [tool:functions.WriteDoc(path="...", content="...")]. A4 Word document
@@ -3223,14 +3224,24 @@ var init_update_file = __esm({
     update_file = async (args) => {
       const parsed = parseArgs(args);
       const targetPath = parsed.path;
-      let content_to_replace = parsed.content_to_replace !== void 0 ? parsed.content_to_replace : parsed.replaceContent;
-      let content_to_add = parsed.content_to_add !== void 0 ? parsed.content_to_add : parsed.newContent;
       if (!targetPath) return 'ERROR: Missing "path" argument for update_file.';
-      if (content_to_replace === void 0) return 'ERROR: Missing "replaceContent" argument.';
-      if (content_to_add === void 0) return 'ERROR: Missing "newContent" argument.';
+      const patchPairs = [];
+      const legacyReplace = parsed.content_to_replace !== void 0 ? parsed.content_to_replace : parsed.replaceContent;
+      const legacyNew = parsed.content_to_add !== void 0 ? parsed.content_to_add : parsed.newContent;
+      if (legacyReplace !== void 0 && legacyNew !== void 0) {
+        patchPairs.push({ replace: legacyReplace, new: legacyNew });
+      }
+      for (let i = 1; i <= 10; i++) {
+        const r = parsed[`replaceContent${i}`];
+        const n = parsed[`newContent${i}`];
+        if (r !== void 0 && n !== void 0 && r !== legacyReplace) {
+          patchPairs.push({ replace: r, new: n });
+        }
+      }
+      if (patchPairs.length === 0) {
+        return "ERROR: No valid replacement pairs found. Use replaceContent1, newContent1, etc.";
+      }
       const strip = (t) => t.replace(/^```[\w]*\n?/, "").replace(/```\s*$/, "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-      content_to_replace = strip(content_to_replace);
-      content_to_add = strip(content_to_add);
       const absolutePath = path9.resolve(process.cwd(), targetPath);
       try {
         if (!fs10.existsSync(absolutePath)) {
@@ -3238,122 +3249,164 @@ var init_update_file = __esm({
         }
         await RevertManager.recordFileChange(absolutePath);
         let diskContent = fs10.readFileSync(absolutePath, "utf8");
-        if (diskContent.startsWith("\uFEFF")) {
-          diskContent = diskContent.slice(1);
-        }
-        const normalizedDisk = diskContent.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
-        if (diskContent !== normalizedDisk) {
-          fs10.writeFileSync(absolutePath, normalizedDisk, "utf8");
-          diskContent = normalizedDisk;
-        }
-        const currentContent = diskContent;
-        const adjustIndentation = (newText, originalMatch, leadingContext = "") => {
-          if (!newText || originalMatch === void 0) return newText;
-          const getIndent = (line) => line.match(/^\s*/)[0];
-          const getMinIndent = (text) => {
-            const lines = text.split("\n").filter((l) => l.trim() !== "");
-            if (lines.length === 0) return "";
-            let min = getIndent(lines[0]);
-            for (const line of lines) {
-              const indent = getIndent(line);
-              if (indent.length < min.length) min = indent;
-            }
-            return min;
+        if (diskContent.startsWith("\uFEFF")) diskContent = diskContent.slice(1);
+        let currentFileContent = diskContent.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+        const results = [];
+        let totalInstances = 0;
+        for (let i = 0; i < patchPairs.length; i++) {
+          const pair = patchPairs[i];
+          const content_to_replace = strip(pair.replace);
+          const content_to_add = strip(pair.new);
+          const adjustIndentation = (newText, originalMatch, leadingContext2 = "") => {
+            if (!newText || originalMatch === void 0) return newText;
+            const getIndent = (line) => line.match(/^\s*/)[0];
+            const getMinIndent = (text) => {
+              const lines = text.split("\n").filter((l) => l.trim() !== "");
+              if (lines.length === 0) return "";
+              let min = getIndent(lines[0]);
+              for (const line of lines) {
+                const indent = getIndent(line);
+                if (indent.length < min.length) min = indent;
+              }
+              return min;
+            };
+            const matchBaseIndent = getMinIndent(originalMatch);
+            const targetBaseIndent = leadingContext2.match(/^\s*/)[0] + matchBaseIndent;
+            const newBaseIndent = getMinIndent(newText);
+            const delta = targetBaseIndent.length - newBaseIndent.length;
+            const indentChar = (targetBaseIndent.match(/\s/) || originalMatch.match(/\s/) || [" "])[0];
+            const newLines = newText.split("\n");
+            return newLines.map((line, i2) => {
+              if (line.trim() === "" && i2 !== 0) return "";
+              const currentLineIndent = getIndent(line).length;
+              const shiftedIndentLength = Math.max(0, currentLineIndent + delta);
+              const prependedIndentLength = i2 === 0 ? Math.max(0, shiftedIndentLength - leadingContext2.length) : shiftedIndentLength;
+              return indentChar.repeat(prependedIndentLength) + line.trimStart();
+            }).join("\n");
           };
-          const matchBaseIndent = getMinIndent(originalMatch);
-          const targetBaseIndent = leadingContext.match(/^\s*/)[0] + matchBaseIndent;
-          const newBaseIndent = getMinIndent(newText);
-          const delta = targetBaseIndent.length - newBaseIndent.length;
-          const indentChar = (targetBaseIndent.match(/\s/) || originalMatch.match(/\s/) || [" "])[0];
-          const newLines = newText.split("\n");
-          return newLines.map((line, i) => {
-            if (line.trim() === "" && i !== 0) return "";
-            const currentLineIndent = getIndent(line).length;
-            const shiftedIndentLength = Math.max(0, currentLineIndent + delta);
-            const prependedIndentLength = i === 0 ? Math.max(0, shiftedIndentLength - leadingContext.length) : shiftedIndentLength;
-            return indentChar.repeat(prependedIndentLength) + line.trimStart();
-          }).join("\n");
-        };
-        let instances = 0;
-        let startPos = -1;
-        let matchRegex = null;
-        const exactPattern = content_to_replace.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        if (content_to_replace !== "" && currentContent.includes(content_to_replace)) {
-          matchRegex = new RegExp(exactPattern, "g");
-        } else {
-          const fuzzyLines = content_to_replace.split("\n").map((line) => line.trim()).filter((line) => line.length > 0).map((line) => line.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/\s+/g, "\\s*"));
-          if (fuzzyLines.length > 0) {
-            const fuzzyPattern = fuzzyLines.join("\\s*");
-            try {
-              matchRegex = new RegExp(fuzzyPattern, "g");
-            } catch (e) {
+          const exactPattern = content_to_replace.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+          let matchRegex = null;
+          if (content_to_replace !== "" && currentFileContent.includes(content_to_replace)) {
+            matchRegex = new RegExp(exactPattern, "g");
+          } else {
+            const fuzzyLines = content_to_replace.split("\n").map((line) => line.trim()).filter((line) => line.length > 0).map((line) => line.replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(/\s+/g, "\\s*"));
+            if (fuzzyLines.length > 0) {
+              const fuzzyPattern = fuzzyLines.join("\\s*");
+              try {
+                matchRegex = new RegExp(fuzzyPattern, "g");
+              } catch (e) {
+                matchRegex = new RegExp(exactPattern, "g");
+              }
+            } else {
               matchRegex = new RegExp(exactPattern, "g");
             }
-          } else {
-            matchRegex = new RegExp(exactPattern, "g");
           }
+          const matches = [...currentFileContent.matchAll(matchRegex)];
+          if (matches.length === 0) {
+            results.push({ success: false, error: `Block ${i + 1}: Could not find match.` });
+            continue;
+          }
+          if (matches.length > 1) {
+            results.push({ success: false, error: `Block ${i + 1}: Found ${matches.length} matches (must be unique).` });
+            continue;
+          }
+          const startPos = matches[0].index;
+          const firstMatchContent = matches[0][0];
+          const lineStart = currentFileContent.lastIndexOf("\n", startPos) + 1;
+          const leadingContext = currentFileContent.substring(lineStart, startPos);
+          const finalReplacement = adjustIndentation(content_to_add, firstMatchContent, leadingContext);
+          const allOriginalLines = currentFileContent.split("\n");
+          const patchStartLine = currentFileContent.substring(0, startPos).split("\n").length;
+          const patchOldLines = firstMatchContent.split("\n");
+          const contextBefore = [];
+          for (let j = Math.max(0, patchStartLine - 4); j < patchStartLine - 1; j++) {
+            contextBefore.push({ num: j + 1, text: allOriginalLines[j] });
+          }
+          const contextAfter = [];
+          const patchEndLineIdx = patchStartLine + patchOldLines.length - 1;
+          for (let j = patchEndLineIdx; j < Math.min(allOriginalLines.length, patchEndLineIdx + 3); j++) {
+            contextAfter.push({ num: j + 1, text: allOriginalLines[j] });
+          }
+          results.push({
+            success: true,
+            startPos,
+            oldContent: firstMatchContent,
+            newContent: finalReplacement,
+            originalStartLine: patchStartLine,
+            contextBefore,
+            contextAfter
+          });
+          currentFileContent = currentFileContent.substring(0, startPos) + finalReplacement + currentFileContent.substring(startPos + firstMatchContent.length);
+          totalInstances++;
         }
-        const matches = matchRegex ? [...currentContent.matchAll(matchRegex)] : [];
-        instances = matches.length;
-        if (instances === 0) {
-          return `ERROR: Could not find match for "content_to_replace" in [${targetPath}]. Check for whitespace discrepancies or ReadFile to get exact content.`;
-        }
-        if (instances > 1) {
-          return `ERROR: Unable to find unique match. [${instances}] instances of the specified "content_to_replace" were found in [${targetPath}]. Try providing more context (surrounding lines) to make the match unique.`;
+        if (totalInstances === 0) {
+          return `ERROR: Failed to apply any patches to [${targetPath}].
+${results.map((r) => r.error).join("\n")}`;
         }
-        startPos = matches[0].index;
-        const firstMatchContent = matches[0][0];
-        const newFileContent = currentContent.replace(matchRegex, (match, offset) => {
-          const lineStart = currentContent.lastIndexOf("\n", offset) + 1;
-          const leadingContext = currentContent.substring(lineStart, offset);
-          return adjustIndentation(content_to_add, match, leadingContext);
-        });
-        const firstLineStart = currentContent.lastIndexOf("\n", startPos) + 1;
-        const firstLeadingContext = currentContent.substring(firstLineStart, startPos);
-        const finalContentToAdd = adjustIndentation(content_to_add, firstMatchContent, firstLeadingContext);
-        const finalContentToReplace = firstMatchContent;
-        fs10.writeFileSync(absolutePath, newFileContent, "utf8");
-        const allOriginalLines = currentContent.split(/\r?\n/);
-        const startLine = currentContent.substring(0, startPos).split(/\r?\n/).length;
-        const oldLines = content_to_replace.split(/\r?\n/);
-        const endLine = startLine + oldLines.length - 1;
-        let diffText = `SUCCESS: File [${targetPath}] updated. [${instances}] instances replaced.
+        fs10.writeFileSync(absolutePath, currentFileContent, "utf8");
+        let diffText = `SUCCESS: File [${targetPath}] updated. [${totalInstances}/${patchPairs.length}] blocks applied.
 
 `;
         diffText += `[DIFF_START]
 `;
-        const contextStart = Math.max(0, startLine - 16);
-        for (let i = contextStart; i < startLine - 1; i++) {
-          diffText += `[UI_CONTEXT]  ${i + 1}|${allOriginalLines[i]}
+        const terminalWidth = process.stdout.columns || 100;
+        const separatorLine = "\u2550".repeat(Math.max(20, terminalWidth - 12));
+        const allLinesFinal = currentFileContent.split("\n");
+        const successfulPatches = results.filter((r) => r.success);
+        successfulPatches.forEach((res, idx) => {
+          if (idx === 0) {
+            res.contextBefore.forEach((ctx) => {
+              diffText += `[UI_CONTEXT]  ${ctx.num} |${ctx.text}
 `;
-        }
-        const lineStartPos = currentContent.lastIndexOf("\n", startPos) + 1;
-        const affectedEndPos = startPos + content_to_replace.length;
-        const lineEndPos = currentContent.indexOf("\n", affectedEndPos);
-        const actualEndPos = lineEndPos === -1 ? currentContent.length : lineEndPos;
-        const fullOldLines = currentContent.substring(lineStartPos, actualEndPos).split("\n");
-        const newAffectedEndPos = startPos + finalContentToAdd.length;
-        const newLineEndPos = newFileContent.indexOf("\n", newAffectedEndPos);
-        const actualNewEndPos = newLineEndPos === -1 ? newFileContent.length : newLineEndPos;
-        const fullNewLines = newFileContent.substring(lineStartPos, actualNewEndPos).split("\n");
-        fullOldLines.forEach((line, i) => {
-          diffText += `-${startLine + i}|${line}
+            });
+          } else {
+            const prev = successfulPatches[idx - 1];
+            const prevLinesCount = prev.newContent.split("\n").length;
+            const prevEndLine = prev.originalStartLine + prevLinesCount - 1;
+            const gap = res.originalStartLine - prevEndLine - 1;
+            if (gap >= 1 && gap < 12) {
+              for (let j = prevEndLine; j < res.originalStartLine - 1; j++) {
+                diffText += `[UI_CONTEXT]  ${j + 1} |${allLinesFinal[j]}
 `;
-        });
-        let currentNewLine = startLine;
-        fullNewLines.forEach((line) => {
-          diffText += `+${currentNewLine}|${line}
+              }
+            } else if (gap >= 12) {
+              prev.contextAfter.forEach((ctx) => {
+                diffText += `[UI_CONTEXT]  ${ctx.num} |${ctx.text}
 `;
-          currentNewLine++;
-        });
-        const linesAffected = fullOldLines.length;
-        const originalContextIdx = startLine + linesAffected - 1;
-        for (let i = originalContextIdx; i < Math.min(allOriginalLines.length, originalContextIdx + 15); i++) {
-          diffText += `[UI_CONTEXT]  ${currentNewLine}|${allOriginalLines[i]}
+              });
+              diffText += `[UI_CONTEXT] ${separatorLine}
 `;
-          currentNewLine++;
-        }
+              res.contextBefore.forEach((ctx) => {
+                diffText += `[UI_CONTEXT]  ${ctx.num} |${ctx.text}
+`;
+              });
+            }
+          }
+          const oldLines = res.oldContent.split("\n");
+          const newLines = res.newContent.split("\n");
+          oldLines.forEach((line, i) => {
+            diffText += `-${res.originalStartLine + i}|${line}
+`;
+          });
+          newLines.forEach((line, i) => {
+            diffText += `+${res.originalStartLine + i}|${line}
+`;
+          });
+          if (idx === successfulPatches.length - 1) {
+            res.contextAfter.forEach((ctx) => {
+              diffText += `[UI_CONTEXT]  ${ctx.num} |${ctx.text}
+`;
+            });
+          }
+        });
         diffText += `[DIFF_END]`;
+        const errors = results.filter((r) => !r.success);
+        if (errors.length > 0) {
+          diffText += `
+
+\u26A0\uFE0F WARNING: Some blocks failed:
+${errors.map((e) => `  \u2022 ${e.error}`).join("\n")}`;
+        }
         return diffText;
       } catch (err) {
         return `ERROR: Failed to update file [${targetPath}]: ${err.message}`;
@@ -3364,15 +3417,26 @@ var init_update_file = __esm({
 
 // src/tools/exec_command.js
 import { spawn } from "child_process";
-var activeChildProcess, writeToActiveCommand, terminateActiveCommand, adjustWindowsCommand, exec_command;
+var pty, activeChildProcess, isActiveCommandPty, writeToActiveCommand, terminateActiveCommand, adjustWindowsCommand, exec_command, runStandardSpawn;
 var init_exec_command = __esm({
-  "src/tools/exec_command.js"() {
+  async "src/tools/exec_command.js"() {
     init_arg_parser();
+    pty = null;
+    try {
+      const ptyModule = await import("node-pty");
+      pty = ptyModule.default || ptyModule;
+    } catch (err) {
+    }
     activeChildProcess = null;
+    isActiveCommandPty = false;
     writeToActiveCommand = (data) => {
       try {
-        if (activeChildProcess && activeChildProcess.stdin && activeChildProcess.stdin.writable) {
-          activeChildProcess.stdin.write(data);
+        if (activeChildProcess) {
+          if (isActiveCommandPty && typeof activeChildProcess.write === "function") {
+            activeChildProcess.write(data);
+          } else if (activeChildProcess.stdin && activeChildProcess.stdin.writable) {
+            activeChildProcess.stdin.write(data);
+          }
         }
       } catch (err) {
       }
@@ -3380,13 +3444,18 @@ var init_exec_command = __esm({
     terminateActiveCommand = () => {
       if (activeChildProcess) {
         try {
-          activeChildProcess.kill("SIGKILL");
+          if (isActiveCommandPty && typeof activeChildProcess.destroy === "function") {
+            activeChildProcess.destroy();
+          } else if (typeof activeChildProcess.kill === "function") {
+            activeChildProcess.kill("SIGKILL");
+          }
         } catch (err) {
         }
         activeChildProcess = null;
+        isActiveCommandPty = false;
       }
     };
-    adjustWindowsCommand = (command) => {
+    adjustWindowsCommand = (command, usePowerShell = false) => {
       if (process.platform !== "win32") return command;
       const tokens = [];
       let current = "";
@@ -3423,7 +3492,7 @@ var init_exec_command = __esm({
               tokens.push(current);
               current = "";
             }
-            tokens.push("&");
+            tokens.push(usePowerShell ? ";" : "&");
           } else if (char === "|" && !current.includes("://")) {
             if (current.length > 0) {
               tokens.push(current);
@@ -3516,7 +3585,7 @@ var init_exec_command = __esm({
       const { command: rawCommand } = parseArgs(args);
       const { onChunk } = options;
       if (!rawCommand) return 'ERROR: Missing "command" argument for exec_command.';
-      const command = adjustWindowsCommand(rawCommand);
+      const isWin = process.platform === "win32";
       const systemSettings = options.systemSettings || {};
       const netEnv = {};
       if (systemSettings.networkAccess === false) {
@@ -3529,58 +3598,127 @@ var init_exec_command = __esm({
         netEnv.NO_PROXY = "localhost,127.0.0.1";
       }
       return new Promise((resolve) => {
-        const child = spawn(command, {
-          shell: true,
-          cwd: process.cwd(),
-          env: {
-            ...process.env,
-            CI: "false",
-            TERM: "xterm-256color",
-            FORCE_COLOR: "1",
-            ...netEnv
+        const attempt = (usePowerShell) => {
+          const command = adjustWindowsCommand(rawCommand, usePowerShell);
+          const shell = isWin ? usePowerShell ? "powershell.exe" : "cmd.exe" : process.env.SHELL || "bash";
+          const shellArgs = isWin ? usePowerShell ? ["-NoProfile", "-Command", command] : ["/c", command] : ["-c", command];
+          if (pty) {
+            try {
+              const ptyProcess = pty.spawn(shell, shellArgs, {
+                name: "xterm-256color",
+                cols: options.cols || 120,
+                rows: options.rows || 30,
+                cwd: process.cwd(),
+                env: {
+                  ...process.env,
+                  CI: "false",
+                  TERM: "xterm-256color",
+                  FORCE_COLOR: "1",
+                  ...netEnv
+                }
+              });
+              activeChildProcess = ptyProcess;
+              isActiveCommandPty = true;
+              let output = "";
+              ptyProcess.onData((data) => {
+                output += data;
+                if (onChunk) onChunk(data);
+              });
+              ptyProcess.onExit(({ exitCode }) => {
+                activeChildProcess = null;
+                const finalOutput = output || "Command executed with no output.";
+                if (exitCode !== 0) {
+                  resolve(`ERROR: Command [${rawCommand}] failed with exit code [${exitCode}].
+
+${finalOutput}`);
+                } else {
+                  resolve(`SUCCESS: Command [${rawCommand}] completed.
+
+${finalOutput}`);
+                }
+              });
+              return true;
+            } catch (err) {
+              if (isWin && usePowerShell && err.code === "ENOENT") {
+                return false;
+              }
+              runStandardSpawn(resolve, command, rawCommand, netEnv, onChunk, usePowerShell);
+              return true;
+            }
+          } else {
+            runStandardSpawn(resolve, command, rawCommand, netEnv, onChunk, usePowerShell);
+            return true;
           }
-        });
-        activeChildProcess = child;
-        if (child.stdin) {
-          child.stdin.on("error", () => {
-            activeChildProcess = null;
-          });
+        };
+        if (isWin) {
+          if (!attempt(true)) {
+            attempt(false);
+          }
+        } else {
+          attempt(false);
         }
-        let stdout = "";
-        let stderr = "";
-        child.stdout.on("data", (data) => {
-          const chunk = data.toString();
-          stdout += chunk;
-          if (onChunk) onChunk(chunk);
-        });
-        child.stderr.on("data", (data) => {
-          const chunk = data.toString();
-          stderr += chunk;
-          if (onChunk) onChunk(chunk);
-        });
-        child.on("close", (code) => {
+      });
+    };
+    runStandardSpawn = (resolve, command, rawCommand, netEnv, onChunk, usePowerShell = true) => {
+      const isWin = process.platform === "win32";
+      const shell = isWin ? usePowerShell ? "powershell.exe" : "cmd.exe" : process.env.SHELL || "bash";
+      const shellArgs = isWin ? usePowerShell ? ["-NoProfile", "-Command", command] : ["/c", command] : ["-c", command];
+      const child = isWin ? spawn(shell, shellArgs, { cwd: process.cwd(), env: { ...process.env, ...netEnv } }) : spawn(command, {
+        shell: true,
+        cwd: process.cwd(),
+        env: {
+          ...process.env,
+          CI: "false",
+          TERM: "xterm-256color",
+          FORCE_COLOR: "1",
+          ...netEnv
+        }
+      });
+      activeChildProcess = child;
+      isActiveCommandPty = false;
+      if (child.stdin) {
+        child.stdin.on("error", () => {
           activeChildProcess = null;
-          const result = [];
-          if (stdout) result.push(`STDOUT:
+        });
+      }
+      let stdout = "";
+      let stderr = "";
+      child.stdout.on("data", (data) => {
+        const chunk = data.toString();
+        stdout += chunk;
+        if (onChunk) onChunk(chunk);
+      });
+      child.stderr.on("data", (data) => {
+        const chunk = data.toString();
+        stderr += chunk;
+        if (onChunk) onChunk(chunk);
+      });
+      child.on("close", (code) => {
+        activeChildProcess = null;
+        const result = [];
+        if (stdout) result.push(`STDOUT:
 ${stdout}`);
-          if (stderr) result.push(`STDERR:
+        if (stderr) result.push(`STDERR:
 ${stderr}`);
-          if (code !== 0) result.push(`EXIT CODE: ${code}`);
-          const finalOutput = result.join("\n\n") || "Command executed with no output.";
-          if (code !== 0) {
-            resolve(`ERROR: Command [${rawCommand}] failed with exit code [${code}].
+        if (code !== 0) result.push(`EXIT CODE: ${code}`);
+        const finalOutput = result.join("\n\n") || "Command executed with no output.";
+        if (code !== 0) {
+          resolve(`ERROR: Command [${rawCommand}] failed with exit code [${code}].
 
 ${finalOutput}`);
-          } else {
-            resolve(`SUCCESS: Command [${rawCommand}] completed.
+        } else {
+          resolve(`SUCCESS: Command [${rawCommand}] completed.
 
 ${finalOutput}`);
-          }
-        });
-        child.on("error", (err) => {
-          activeChildProcess = null;
-          resolve(`ERROR: Failed to start command [${rawCommand}]: ${err.message}`);
-        });
+        }
+      });
+      child.on("error", (err) => {
+        if (isWin && usePowerShell && err.code === "ENOENT") {
+          const cmdCommand = adjustWindowsCommand(rawCommand, false);
+          return runStandardSpawn(resolve, cmdCommand, rawCommand, netEnv, onChunk, false);
+        }
+        activeChildProcess = null;
+        resolve(`ERROR: Failed to start command [${rawCommand}]: ${err.message}`);
       });
     };
   }
@@ -3916,33 +4054,44 @@ var init_search_keyword = __esm({
   "src/tools/search_keyword.js"() {
     init_arg_parser();
     search_keyword = async (args) => {
-      const { keyword } = parseArgs(args);
+      const { keyword, file } = parseArgs(args);
       if (!keyword) return 'ERROR: Missing "keyword" argument.';
       const isWindows = process.platform === "win32";
       const excludes = ["node_modules", ".git", "dist", ".next", ".gemini"];
       let command = "";
-      if (isWindows) {
-        const excludePattern = excludes.join("|").replace(/\./g, "\\.");
-        command = `powershell -Command "Get-ChildItem -Path . -Recurse -File | Where-Object { $_.FullName -notmatch '${excludePattern}' } | Select-String -Pattern '${keyword}' | Select-Object -First 150 | ForEach-Object { $rel = Resolve-Path $_.Path -Relative; '{0}:{1}:' -f $rel, $_.LineNumber }"`;
+      if (file) {
+        if (isWindows) {
+          command = `powershell -Command "if (Test-Path '${file}') { Select-String -Path '${file}' -Pattern '${keyword}' | Select-Object -First 150 | ForEach-Object { $rel = Resolve-Path $_.Path -Relative; '{0}:{1}:' -f $rel, $_.LineNumber } } else { Write-Error 'File not found: ${file}' }"`;
+        } else {
+          command = `grep -HnI "${keyword}" "${file}" | head -n 150`;
+        }
       } else {
-        const excludeDirArgs = excludes.map((d) => `--exclude-dir="${d}"`).join(" ");
-        command = `grep -rnI ${excludeDirArgs} "${keyword}" . | head -n 150`;
+        if (isWindows) {
+          const excludePattern = excludes.join("|").replace(/\./g, "\\.");
+          command = `powershell -Command "Get-ChildItem -Path . -Recurse -File | Where-Object { $_.FullName -notmatch '${excludePattern}' } | Select-String -Pattern '${keyword}' | Select-Object -First 150 | ForEach-Object { $rel = Resolve-Path $_.Path -Relative; '{0}:{1}:' -f $rel, $_.LineNumber }"`;
+        } else {
+          const excludeDirArgs = excludes.map((d) => `--exclude-dir="${d}"`).join(" ");
+          command = `grep -rnI ${excludeDirArgs} "${keyword}" . | head -n 150`;
+        }
       }
       return new Promise((resolve) => {
         exec(command, { cwd: process.cwd(), maxBuffer: 15 * 1024 * 1024 }, (error, stdout, stderr) => {
+          if (error && stderr && stderr.includes("File not found")) {
+            return resolve(`ERROR: File not found: ${file}`);
+          }
           if (error && error.code === 1 && !stdout) {
-            return resolve(`Found 0 matches for keyword: "${keyword}"`);
+            return resolve(`Found 0 matches for keyword: "${keyword}"${file ? ` in file: ${file}` : ""}`);
           }
           if (error && !stdout) {
             return resolve(`ERROR: ${stderr || error.message}`);
           }
           const rawLines = stdout.trim().split("\n").filter((l) => l.trim() !== "");
-          if (rawLines.length === 0) return resolve(`Found 0 matches for keyword: "${keyword}"`);
+          if (rawLines.length === 0) return resolve(`Found 0 matches for keyword: "${keyword}"${file ? ` in file: ${file}` : ""}`);
           const filteredLines = rawLines.filter((line) => {
             const lower = line.toLowerCase();
             return !lower.includes("node_modules") && !lower.includes(".git") && !lower.includes("dist") && !lower.includes(".next") && !lower.includes(".gemini");
           });
-          if (filteredLines.length === 0) return resolve(`Found 0 matches for keyword: "${keyword}"`);
+          if (filteredLines.length === 0) return resolve(`Found 0 matches for keyword: "${keyword}"${file ? ` in file: ${file}` : ""}`);
           const matches = filteredLines.slice(0, 150).map((line) => {
             const firstColon = line.indexOf(":");
             const secondColon = line.indexOf(":", firstColon + 1);
@@ -4385,7 +4534,7 @@ var init_addMemScore = __esm({
 // src/utils/tools.js
 var TOOL_MAP, dispatchTool;
 var init_tools = __esm({
-  "src/utils/tools.js"() {
+  async "src/utils/tools.js"() {
     init_web_search();
     init_web_scrape();
     init_memory();
@@ -4393,7 +4542,7 @@ var init_tools = __esm({
     init_view_file();
     init_write_file();
     init_update_file();
-    init_exec_command();
+    await init_exec_command();
     init_read_folder();
     init_ask_user();
     init_write_pdf();
@@ -4462,11 +4611,11 @@ import path15 from "path";
 import fs16 from "fs";
 var client, TERMINATION_SIGNAL, signalTermination, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, consolidatePastMemories, getAIStream;
 var init_ai = __esm({
-  "src/utils/ai.js"() {
+  async "src/utils/ai.js"() {
     init_prompts();
     init_history();
     init_usage();
-    init_tools();
+    await init_tools();
     init_crypto();
     init_arg_parser();
     init_terminal();
@@ -5015,7 +5164,7 @@ ${newMemoryListStr}
         const isContext32k = (sessionStats?.tokens || 0) >= 32e3;
         const memoryPrompt = getMemoryPrompt(otherMemories, mainUserMemories, isMemoryEnabled, isContext32k);
         const dateTimeStr = (/* @__PURE__ */ new Date()).toLocaleString([], { year: "numeric", month: "numeric", day: "numeric", hour: "2-digit", minute: "2-digit", hour12: true });
-        const getDirTree = (dir, prefix = "") => {
+        const getDirTree = (dir, prefix = "", depth = 1) => {
           try {
             const files = fs16.readdirSync(dir);
             const sep = path15.sep;
@@ -5052,13 +5201,13 @@ ${newMemoryListStr}
                 const stat = fs16.statSync(filePath);
                 if (stat.isDirectory()) {
                   const subFiles = fs16.readdirSync(filePath);
-                  if (subFiles.length > 80) {
+                  if (subFiles.length > 80 || depth >= 7) {
                     result += `${prefix}${connector}${file}${sep}...
 `;
                   } else {
                     result += `${prefix}${connector}${file}${sep}
 `;
-                    result += getDirTree(filePath, childPrefix);
+                    result += getDirTree(filePath, childPrefix, depth + 1);
                   }
                 } else {
                   result += `${prefix}${connector}${file}
@@ -5076,7 +5225,7 @@ ${newMemoryListStr}
         };
         yield { type: "status", content: "Gathering Context..." };
         let dirStructure = process.cwd() + "\n" + getDirTree(process.cwd());
-        const firstUserMsg = `[METADATA (PRIORITY: DYNAMIC)] Time: ${dateTimeStr} | v${versionFluxflow2}
+        const firstUserMsg = `[SYSTEM METADATA (PRIORITY: DYNAMIC)] Time: ${dateTimeStr} | v${versionFluxflow2}
 CWD: ${process.cwd()}
 **DIRECTORY STRUCTURE**
 ${dirStructure}
@@ -5178,8 +5327,7 @@ ${thinkingLevel != "Fast" ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITI
               }
               const currentSystemInstruction = getSystemInstruction(profile, thinkingLevel, mode, systemSettings, isMemoryEnabled, MAX_LOOPS, loop + 1);
               const jitInstruction = `
-
-[SYSTEM] Tool result received. Analyze output and proceed with your turn.${thinkingLevel != "Fast" ? "**STRICTLY MAINTAIN THINKING POLICY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**" : ""}`;
+[SYSTEM] Tool result received. Analyze output and proceed with your turn${thinkingLevel != "Fast" ? ". **STRICTLY MAINTAIN THINKING POLICY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**" : ""}`;
               const lastUserMsg = contents[contents.length - 1];
               let addedMarker = false;
               if (lastUserMsg && lastUserMsg.role === "user" && lastUserMsg.parts?.[0]?.text?.startsWith("[TOOL RESULT]")) {
@@ -5800,7 +5948,7 @@ ${boxBottom}` };
                   const waitTime = Math.min(1e3 * Math.pow(2, inStreamRetryCount - 1), 24e3);
                   if (turnText.trim().length > 0) {
                     modifiedHistory.push({ role: "agent", text: turnText });
-                    const recoveryText = "[SYSTEM: STREAM RECOVERY]\n- SEAMLESS CONTINUATION: Resume immediately. Pick up from last words with zero gap/disruption.\n- NO REPETITION: Do not repeat any text already written.\n- NO RE-THINK: Do not restart or open <think> if reasoning already started.\n- MID-TOOL SAFETY: If cutoff was mid-tool call, restart that tool call from start.\n- STEALTH: Do not mention/apologize for cutoff.\n- KEEP LENGTH: Maintain standard depth/length.";
+                    const recoveryText = "[SYSTEM]\n- SEAMLESS CONTINUATION: Resume immediately. Pick up from last words with zero gap/disruption\n- NO REPETITION: Do not repeat any text already written\n- NO RE-THINK: Do not restart or open <think> if reasoning already started. Continue the thinking and close thinking block with </think> if opened\n- MID-TOOL SAFETY: If cutoff was mid-tool call, restart that tool call from start\n- STEALTH: Do not mention/apologize for cutoff";
                     if (toolResults.length > 0) {
                       toolResults.forEach((tr, idx) => {
                         if (idx === toolResults.length - 1) {
@@ -5820,7 +5968,7 @@ ${recoveryText}`
                     accumulatedContext += turnText;
                   }
                   for (let i = waitTime / 1e3; i > 0; i--) {
-                    yield { type: "status", content: `Error Occured. Recovering Stream (${inStreamRetryCount}/${MAX_RETRIES}) [${i}s]...` };
+                    yield { type: "status", content: `Error Occured. Recovering Stream (${inStreamRetryCount}/${MAX_RETRIES}) [Retrying in ${i}s]...` };
                     await new Promise((resolve) => setTimeout(resolve, 1e3));
                   }
                   yield { type: "status", content: `Error Occured. Recovering Stream...` };
@@ -5835,14 +5983,14 @@ Error Log can be found in ${path15.join(LOGS_DIR, "agent", "error.log")}`);
                   accumulatedContext = "";
                   const waitTime = Math.min(1e3 * Math.pow(2, retryCount - 1), 32e3);
                   isInitialAttempt = true;
-                  yield { type: "status", content: `Retrying Connection (${retryCount}/${MAX_RETRIES}) [${(waitTime / 1e3).toFixed(0)}s]...` };
+                  yield { type: "status", content: `Trying to reach ${modelName} (${retryCount}/${MAX_RETRIES}) [Retrying in ${(waitTime / 1e3).toFixed(0)}s]...` };
                   for (let i = waitTime / 1e3; i > 0; i--) {
-                    yield { type: "status", content: `Retrying Connection (${retryCount}/${MAX_RETRIES}) [${i}s]...` };
+                    yield { type: "status", content: `Trying to reach ${modelName} (${retryCount}/${MAX_RETRIES}) [Retrying in ${i}s]...` };
                     await new Promise((resolve) => setTimeout(resolve, 1e3));
                   }
-                  yield { type: "status", content: `Retrying Connection...` };
+                  yield { type: "status", content: `Trying to reach ${modelName}...` };
                 } else {
-                  throw new Error(`Model cannot be reached. (Failed ${MAX_RETRIES} times)
+                  throw new Error(`Model ${modelName} cannot be reached. (Failed ${MAX_RETRIES} times)
 Error Log can be found in ${path15.join(LOGS_DIR, "agent", "error.log")}`);
                 }
               }
@@ -6092,15 +6240,28 @@ var init_MemoryModal = __esm({
 // src/components/UpdateProcessor.jsx
 import React11, { useState as useState8, useEffect as useEffect6 } from "react";
 import { Box as Box11, Text as Text11 } from "ink";
-import Spinner from "ink-spinner";
-import { exec as exec2 } from "child_process";
-var UpdateProcessor, UpdateProcessor_default;
+import { spawn as spawn2 } from "child_process";
+var pty2, SPINNER_FRAMES, UpdateProcessor, UpdateProcessor_default;
 var init_UpdateProcessor = __esm({
-  "src/components/UpdateProcessor.jsx"() {
+  async "src/components/UpdateProcessor.jsx"() {
+    pty2 = null;
+    try {
+      const ptyModule = await import("node-pty");
+      pty2 = ptyModule.default || ptyModule;
+    } catch (err) {
+    }
+    SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
     UpdateProcessor = ({ latest, current, settings, onClose, onUpdateSettings, onSuccess }) => {
       const [status, setStatus] = useState8("initializing");
       const [log, setLog] = useState8("");
       const [error, setError] = useState8(null);
+      const [tick, setTick] = useState8(0);
+      useEffect6(() => {
+        const interval = setInterval(() => {
+          setTick((t) => (t + 1) % 1e3);
+        }, 33);
+        return () => clearInterval(interval);
+      }, []);
       useEffect6(() => {
         let child;
         const runUpdate = async () => {
@@ -6117,31 +6278,101 @@ var init_UpdateProcessor = __esm({
           else command = `npm install -g fluxflow-cli@${latest}`;
           setStatus("downloading");
           setLog(`Running: ${command}...`);
-          child = exec2(command, (err, stdout, stderr) => {
-            if (err) {
-              setError(stderr || err.message);
-              setStatus("error");
-              return;
+          const isWin = process.platform === "win32";
+          const executeCommand = (usePowerShell) => {
+            return new Promise((resolve) => {
+              const shell = isWin ? usePowerShell ? "powershell.exe" : "cmd.exe" : process.env.SHELL || "bash";
+              const shellArgs = isWin ? usePowerShell ? ["-NoProfile", "-Command", command] : ["/c", command] : ["-c", command];
+              const handleOutput = (data) => {
+                const str = data.toString();
+                const cleanStr = str.replace(/\x1B\[[0-?]*[ -/]*[@-~]|\x1B\][^\x07\x1B]*[\x07\x1B]|\b|\x07/g, "").replace(/\r/g, "").trim();
+                if (cleanStr) {
+                  setLog((prev) => (prev + "\n" + cleanStr).split("\n").slice(-5).join("\n"));
+                }
+              };
+              if (pty2) {
+                try {
+                  const ptyProcess = pty2.spawn(shell, shellArgs, {
+                    name: "xterm-256color",
+                    cols: 80,
+                    rows: 30,
+                    cwd: process.cwd(),
+                    env: process.env
+                  });
+                  child = ptyProcess;
+                  ptyProcess.onData(handleOutput);
+                  ptyProcess.onExit(({ exitCode }) => {
+                    child = null;
+                    if (exitCode !== 0) {
+                      resolve({ error: `Process exited with code ${exitCode}` });
+                    } else {
+                      resolve({ success: true });
+                    }
+                  });
+                  return;
+                } catch (err) {
+                  if (isWin && usePowerShell && err.code === "ENOENT") {
+                    resolve({ retryCmd: true });
+                    return;
+                  }
+                }
+              }
+              const cp = isWin ? spawn2(shell, shellArgs, { cwd: process.cwd(), env: process.env }) : spawn2(command, { shell: true, cwd: process.cwd(), env: process.env });
+              child = cp;
+              cp.stdout.on("data", handleOutput);
+              cp.stderr.on("data", handleOutput);
+              cp.on("close", (code) => {
+                child = null;
+                if (code !== 0) {
+                  resolve({ error: `Process exited with code ${code}` });
+                } else {
+                  resolve({ success: true });
+                }
+              });
+              cp.on("error", (err) => {
+                if (isWin && usePowerShell && err.code === "ENOENT") {
+                  resolve({ retryCmd: true });
+                } else {
+                  child = null;
+                  resolve({ error: err.message });
+                }
+              });
+            });
+          };
+          let result = {};
+          if (isWin) {
+            result = await executeCommand(true);
+            if (result.retryCmd) {
+              result = await executeCommand(false);
             }
+          } else {
+            result = await executeCommand(false);
+          }
+          if (result.error) {
+            setError(result.error);
+            setStatus("error");
+          } else if (result.success) {
             setStatus("success");
             if (onSuccess) onSuccess();
-          });
-          child.stdout.on("data", (data) => {
-            setLog((prev) => (prev + "\n" + data).split("\n").slice(-5).join("\n"));
-          });
+          }
         };
         runUpdate();
         return () => {
           if (child) {
             try {
-              child.kill();
+              if (typeof child.destroy === "function") {
+                child.destroy();
+              } else if (typeof child.kill === "function") {
+                child.kill();
+              }
             } catch (e) {
             }
           }
         };
       }, []);
       if (status === "initializing" || status === "downloading") {
-        return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React11.createElement(Box11, null, /* @__PURE__ */ React11.createElement(Text11, { color: "cyan" }, /* @__PURE__ */ React11.createElement(Spinner, { type: "dots" })), /* @__PURE__ */ React11.createElement(Text11, { marginLeft: 1, bold: true }, " Updating Flux Flow to v", latest, "...")), /* @__PURE__ */ React11.createElement(Box11, { marginTop: 1, paddingX: 1, borderStyle: "single", borderColor: "#333" }, /* @__PURE__ */ React11.createElement(Text11, { color: "gray", dimColor: true, italic: true }, log || "Preparing environment...")), /* @__PURE__ */ React11.createElement(Text11, { marginTop: 1, dimColor: true }, "(Please do not close the terminal)"));
+        const frame = SPINNER_FRAMES[Math.floor(tick / 3) % SPINNER_FRAMES.length];
+        return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React11.createElement(Box11, null, /* @__PURE__ */ React11.createElement(Text11, { color: "magenta" }, frame), /* @__PURE__ */ React11.createElement(Text11, { marginLeft: 1, bold: true }, " Updating Flux Flow to v", latest, "...")), /* @__PURE__ */ React11.createElement(Box11, { marginTop: 1, paddingX: 1, borderStyle: "single", borderColor: "#333" }, /* @__PURE__ */ React11.createElement(Text11, { color: "gray", dimColor: true, italic: true }, log || "Preparing environment...")), /* @__PURE__ */ React11.createElement(Text11, { marginTop: 1, dimColor: true }, "(Please do not close the terminal)"));
       }
       if (status === "success") {
         return /* @__PURE__ */ React11.createElement(Box11, { flexDirection: "column", borderStyle: "round", borderColor: "green", paddingX: 2, paddingY: 1 }, /* @__PURE__ */ React11.createElement(Text11, { color: "green", bold: true }, "\u2705 UPDATE SUCCESSFUL!"), /* @__PURE__ */ React11.createElement(Text11, { marginTop: 1 }, "Flux Flow has been updated to ", /* @__PURE__ */ React11.createElement(Text11, { color: "cyan" }, "v", latest), "."), /* @__PURE__ */ React11.createElement(Text11, { marginTop: 1, color: "yellow", bold: true }, "CRITICAL: Please restart your terminal session to apply changes."), /* @__PURE__ */ React11.createElement(Box11, { marginTop: 1 }, /* @__PURE__ */ React11.createElement(Text11, { dimColor: true }, "(Press ESC to return to chat)")));
@@ -6241,13 +6472,13 @@ var init_RevertModal = __esm({
 
 // src/utils/setup.js
 import puppeteer4 from "puppeteer";
-import { exec as exec3 } from "child_process";
+import { exec as exec2 } from "child_process";
 import { promisify } from "util";
 import fs17 from "fs";
 var execAsync, checkPuppeteerReady, installPuppeteerBrowser;
 var init_setup = __esm({
   "src/utils/setup.js"() {
-    execAsync = promisify(exec3);
+    execAsync = promisify(exec2);
     checkPuppeteerReady = () => {
       try {
         const exePath = puppeteer4.executablePath();
@@ -6284,10 +6515,9 @@ __export(app_exports, {
 import os4 from "os";
 import React13, { useState as useState10, useEffect as useEffect7, useRef as useRef3, useMemo as useMemo2 } from "react";
 import { Box as Box13, Text as Text13, useInput as useInput7, useStdout } from "ink";
-import Spinner2 from "ink-spinner";
 import fs18 from "fs-extra";
 import path16 from "path";
-import { exec as exec4 } from "child_process";
+import { exec as exec3 } from "child_process";
 import { fileURLToPath } from "url";
 import TextInput4 from "ink-text-input";
 import gradient from "gradient-string";
@@ -6439,6 +6669,7 @@ function App({ args = [] }) {
   const [activeCommand, setActiveCommand] = useState10(null);
   const [execOutput, setExecOutput] = useState10("");
   const [isTerminalFocused, setIsTerminalFocused] = useState10(false);
+  const [tick, setTick] = useState10(0);
   useEffect7(() => {
     if (apiTier !== "Free" && activeModel === "gemma-4-31b-it") {
       setActiveModel("gemini-3-flash-preview");
@@ -6579,13 +6810,17 @@ function App({ args = [] }) {
       if (key.return) {
         const isWin = process.platform === "win32";
         writeToActiveCommand(isWin ? "\r\n" : "\n");
-        setExecOutput((prev) => prev + "\n");
+        if (!isActiveCommandPty) setExecOutput((prev) => prev + "\n");
       } else if (key.backspace || key.delete) {
-        writeToActiveCommand("\b \b");
-        setExecOutput((prev) => prev.slice(0, -1));
+        if (isActiveCommandPty) {
+          writeToActiveCommand("\x7F");
+        } else {
+          writeToActiveCommand("\b \b");
+          setExecOutput((prev) => prev.slice(0, -1));
+        }
       } else if (inputText) {
         writeToActiveCommand(inputText);
-        setExecOutput((prev) => prev + inputText);
+        if (!isActiveCommandPty) setExecOutput((prev) => prev + inputText);
       }
       return;
     }
@@ -6634,17 +6869,21 @@ function App({ args = [] }) {
             } else if (nextCount === 2) {
               if (escDoubleTimerRef.current) clearTimeout(escDoubleTimerRef.current);
               setEscPressCount(0);
-              RevertManager.getChatHistory(chatId).then((prompts) => {
-                if (prompts.length > 0) {
-                  setRecentPrompts(prompts.reverse());
-                  setActiveView("revert");
-                } else {
-                  setMessages((prev2) => {
-                    setCompletedIndex(prev2.length + 1);
-                    return [...prev2, { id: "revert-empty-" + Date.now(), role: "system", text: "\u{1F6C8} No revert checkpoints found for this session.", isMeta: true }];
-                  });
-                }
-              });
+              if (input.length > 0) {
+                setInput("");
+              } else {
+                RevertManager.getChatHistory(chatId).then((prompts) => {
+                  if (prompts.length > 0) {
+                    setRecentPrompts(prompts.reverse());
+                    setActiveView("revert");
+                  } else {
+                    setMessages((prev2) => {
+                      setCompletedIndex(prev2.length + 1);
+                      return [...prev2, { id: "revert-empty-" + Date.now(), role: "system", text: "\u{1F6C8} No revert checkpoints found for this session.", isMeta: true }];
+                    });
+                  }
+                });
+              }
             }
             return nextCount;
           });
@@ -6667,6 +6906,10 @@ function App({ args = [] }) {
     if (key.tab && activeView === "chat") {
     }
     if (key.ctrl && inputText === "c" && activeView !== "exit") {
+      if (input.length > 0) {
+        setInput("");
+        return;
+      }
       if (key.shift) {
         setActiveView("exit");
         setConfirmExit(false);
@@ -7100,7 +7343,7 @@ ${hintText}`, color: "magenta" }];
                   isMeta: true
                 }];
               });
-              exec4("start https://enter.pollinations.ai/#pollen");
+              exec3("start https://enter.pollinations.ai/#pollen");
             } else {
               try {
                 const stats = await getImageQuotaStats();
@@ -7426,7 +7669,7 @@ ${list || "No saved chats found."}`, isMeta: true }];
         case "/changelog": {
           const platform = process.platform;
           const command = platform === "win32" ? "start" : platform === "darwin" ? "open" : "xdg-open";
-          exec4(`${command} ${CHANGELOG_URL}`);
+          exec3(`${command} ${CHANGELOG_URL}`);
           setMessages((prev) => {
             setCompletedIndex(prev.length + 1);
             return [...prev, { id: Date.now(), role: "system", text: `\u{1F310} [BROWSER] Opening changelog: ${CHANGELOG_URL}`, isMeta: true }];
@@ -7530,6 +7773,8 @@ ${timestamp}` };
               janitorModel,
               sessionStats,
               chatId,
+              cols: terminalSize.columns - 6,
+              rows: 30,
               onExecStart: (cmd) => {
                 setActiveCommand(cmd);
                 setExecOutput("");
@@ -7542,6 +7787,7 @@ ${timestamp}` };
                   if (!activeCommandRef.current) return prev;
                   const finalStatus = `[TERMINAL_RECORD]
 COMMAND: ${activeCommandRef.current}
+PTY: ${isActiveCommandPty}
 OUTPUT: ${execOutputRef.current}`;
                   return [...prev, { id: "term-" + Date.now(), role: "system", text: finalStatus, isTerminalRecord: true }];
                 });
@@ -8431,7 +8677,7 @@ Selection: ${val}`,
           }
         )));
       default:
-        return /* @__PURE__ */ React13.createElement(Box13, { flexDirection: "column", marginTop: 1, flexShrink: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginBottom: 0, justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React13.createElement(Box13, null, statusText ? /* @__PURE__ */ React13.createElement(Box13, null, isSpinnerActive && /* @__PURE__ */ React13.createElement(Text13, { color: "magenta" }, /* @__PURE__ */ React13.createElement(Spinner2, { type: "dots" })), /* @__PURE__ */ React13.createElement(Text13, { color: "magenta", bold: true, italic: true }, isSpinnerActive ? " " : "", statusText.toUpperCase())) : /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", dimColor: true, italic: true }, "READY FOR COMMAND...")), /* @__PURE__ */ React13.createElement(Box13, null, /* @__PURE__ */ React13.createElement(Text13, { color: "gray", bold: true }, "[ "), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, tempModelOverride || activeModel), /* @__PURE__ */ React13.createElement(Text13, { color: "gray", bold: true }, " ]"))), /* @__PURE__ */ React13.createElement(
+        return /* @__PURE__ */ React13.createElement(Box13, { flexDirection: "column", marginTop: 1, flexShrink: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginBottom: 0, justifyContent: "space-between", width: "100%" }, /* @__PURE__ */ React13.createElement(Box13, null, statusText ? /* @__PURE__ */ React13.createElement(Box13, null, isSpinnerActive && /* @__PURE__ */ React13.createElement(StatusSpinner, null), /* @__PURE__ */ React13.createElement(Text13, { color: "magenta", bold: true, italic: true }, isSpinnerActive ? " " : "", statusText.toUpperCase())) : /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", dimColor: true, italic: true }, "READY FOR COMMAND...")), /* @__PURE__ */ React13.createElement(Box13, null, /* @__PURE__ */ React13.createElement(Text13, { color: "gray", bold: true }, "[ "), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, tempModelOverride || activeModel), /* @__PURE__ */ React13.createElement(Text13, { color: "gray", bold: true }, " ]"))), /* @__PURE__ */ React13.createElement(
           Box13,
           {
             borderStyle: "round",
@@ -8457,12 +8703,13 @@ Selection: ${val}`,
                 newline: (key) => key.return && key.shift || key.return && key.ctrl || key.return && key.leftAlt || key.return && key.rightAlt
               }
             }
-          )))) : /* @__PURE__ */ React13.createElement(Box13, { flexDirection: "row", width: "100%", paddingY: 0 }, /* @__PURE__ */ React13.createElement(Box13, { flexShrink: 0, width: 4 }, /* @__PURE__ */ React13.createElement(Text13, { color: isProcessing ? "magenta" : "cyan", bold: true }, isProcessing ? "\u2726  " : "\u{1F4A0} ")), /* @__PURE__ */ React13.createElement(Box13, { flexGrow: 1 }, /* @__PURE__ */ React13.createElement(Box13, { flexGrow: 1, position: "relative" }, input === "" && /* @__PURE__ */ React13.createElement(Box13, { position: "absolute", paddingLeft: 0 }, activeCommand && !isTerminalFocused ? /* @__PURE__ */ React13.createElement(Text13, { color: "yellow" }, "  Press TAB to interact with terminal...") : activeCommand && isTerminalFocused ? /* @__PURE__ */ React13.createElement(Text13, { color: "yellow", bold: true }, "  [ TERMINAL FOCUSED ] Type to interact, press TAB to exit...") : escPressCount === 1 ? /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "  Press ESC again to revert codebase to checkpoint...") : /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, escPressed ? "  Press ESC again to cancel the request." : !isProcessing ? `  Send message or /cmd... (${terminalEnv.shortcut} for newline)` : "  Enter a prompt to steer the agent.")), /* @__PURE__ */ React13.createElement(
+          )))) : /* @__PURE__ */ React13.createElement(Box13, { flexDirection: "row", width: "100%", paddingY: 0 }, /* @__PURE__ */ React13.createElement(Box13, { flexShrink: 0, width: 4 }, /* @__PURE__ */ React13.createElement(Text13, { color: isProcessing ? "magenta" : "cyan", bold: true }, isProcessing ? "\u2726  " : "\u{1F4A0} ")), /* @__PURE__ */ React13.createElement(Box13, { flexGrow: 1 }, /* @__PURE__ */ React13.createElement(Box13, { flexGrow: 1, position: "relative" }, input === "" && /* @__PURE__ */ React13.createElement(Box13, { position: "absolute", paddingLeft: 0 }, activeCommand && !isTerminalFocused ? /* @__PURE__ */ React13.createElement(Text13, { color: "yellow" }, "  Press TAB to interact with terminal...") : activeCommand && isTerminalFocused ? /* @__PURE__ */ React13.createElement(Text13, { color: "yellow", bold: true }, "  [ TERMINAL FOCUSED ] Type to interact, press TAB to exit...") : escPressCount === 1 ? /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "  Press ESC again to ", input.length > 0 ? "clear input" : "revert codebase to checkpoint", "...") : /* @__PURE__ */ React13.createElement(Text13, { color: "gray" }, escPressed ? "  Press ESC again to cancel the request." : !isProcessing ? `  Send message or /cmd... (${terminalEnv.shortcut} for newline)` : "  Enter a prompt to steer the agent.")), /* @__PURE__ */ React13.createElement(
             MultilineInput,
             {
               key: `input-${inputKey}`,
               focus: !isTerminalFocused,
               value: input,
+              columns: terminalSize.columns,
               onChange: (val) => {
                 const cleanVal = val.replace(/\r\n/g, "\n").replace(/\r/g, "\n").replace(/\\\s*\n/g, "\n");
                 setInput(cleanVal);
@@ -8486,7 +8733,7 @@ Selection: ${val}`,
       showFullThinking,
       columns: Math.max(20, (stdout?.columns || 80) - 1)
     }
-  ), activeCommand && /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(TerminalBox, { command: activeCommand, output: execOutput, isFocused: isTerminalFocused }))), isInitializing ? /* @__PURE__ */ React13.createElement(Box13, { borderStyle: "double", borderColor: "magenta", padding: 1, flexShrink: 0 }, /* @__PURE__ */ React13.createElement(Text13, { color: "magenta" }, "\u{1F30A} Starting Flux Flow...")) : !apiKey ? /* @__PURE__ */ React13.createElement(Box13, { borderStyle: "round", borderColor: "gray", padding: 0, flexDirection: "column", flexShrink: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginBottom: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "yellow", bold: true }, "\u{1F511}", emojiSpace(2), "API KEY REQUIRED")), /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, flexDirection: "column" }, /* @__PURE__ */ React13.createElement(Text13, null, "Please enter your Gemini API Key to initialize the agent."), /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "\u{1F4A0} "), /* @__PURE__ */ React13.createElement(
+  ), activeCommand && /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(TerminalBox, { command: activeCommand, output: execOutput, isFocused: isTerminalFocused, isPty: isActiveCommandPty }))), isInitializing ? /* @__PURE__ */ React13.createElement(Box13, { borderStyle: "double", borderColor: "magenta", padding: 1, flexShrink: 0 }, /* @__PURE__ */ React13.createElement(Text13, { color: "magenta" }, "\u{1F30A} Starting Flux Flow...")) : !apiKey ? /* @__PURE__ */ React13.createElement(Box13, { borderStyle: "round", borderColor: "gray", padding: 0, flexDirection: "column", flexShrink: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginBottom: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "yellow", bold: true }, "\u{1F511}", emojiSpace(2), "API KEY REQUIRED")), /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, flexDirection: "column" }, /* @__PURE__ */ React13.createElement(Text13, null, "Please enter your Gemini API Key to initialize the agent."), /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "\u{1F4A0} "), /* @__PURE__ */ React13.createElement(
     TextInput4,
     {
       value: tempKey,
@@ -8561,9 +8808,9 @@ Selection: ${val}`,
     );
   })()));
 }
-var SESSION_START_TIME, CHANGELOG_URL, linesAdded, linesRemoved, packageJsonPath, packageJson, versionFluxflow, updatedOn, ResolutionModal, FLUX_LOGO, parseAgentText, getProjectFiles;
+var SESSION_START_TIME, CHANGELOG_URL, linesAdded, linesRemoved, packageJsonPath, packageJson, versionFluxflow, updatedOn, SPINNER_FRAMES2, StatusSpinner, ResolutionModal, FLUX_LOGO, parseAgentText, getProjectFiles;
 var init_app = __esm({
-  "src/app.jsx"() {
+  async "src/app.jsx"() {
     init_MultilineInput();
     init_ChatLayout();
     init_StatusBar();
@@ -8572,12 +8819,12 @@ var init_app = __esm({
     init_ProfileForm();
     init_AskUserModal();
     init_secrets();
-    init_ai();
+    await init_ai();
     init_settings();
     init_history();
     init_ResumeModal();
     init_MemoryModal();
-    init_UpdateProcessor();
+    await init_UpdateProcessor();
     init_revert();
     init_RevertModal();
     init_usage();
@@ -8585,7 +8832,7 @@ var init_app = __esm({
     init_arg_parser();
     init_paths();
     init_terminal();
-    init_exec_command();
+    await init_exec_command();
     init_setup();
     init_text();
     SESSION_START_TIME = Date.now();
@@ -8596,6 +8843,17 @@ var init_app = __esm({
     packageJson = JSON.parse(fs18.readFileSync(packageJsonPath, "utf8"));
     versionFluxflow = packageJson.version;
     updatedOn = packageJson.date || "2026-05-20";
+    SPINNER_FRAMES2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
+    StatusSpinner = () => {
+      const [tick, setTick] = useState10(0);
+      useEffect7(() => {
+        const interval = setInterval(() => {
+          setTick((t) => (t + 1) % 1e3);
+        }, 33);
+        return () => clearInterval(interval);
+      }, []);
+      return /* @__PURE__ */ React13.createElement(Text13, { color: "magenta" }, SPINNER_FRAMES2[Math.floor(tick / 3) % SPINNER_FRAMES2.length]);
+    };
     ResolutionModal = ({ data, onResolve, onEdit }) => /* @__PURE__ */ React13.createElement(Box13, { flexDirection: "column", borderStyle: "round", borderColor: "gray", padding: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "magenta", bold: true, underline: true }, "\u{1F7E3} STEERING HINT RESOLUTION")), /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, null, "The agent already finished the task before your hint was consumed.")), /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1, backgroundColor: "#222", paddingX: 2, width: "100%" }, /* @__PURE__ */ React13.createElement(Text13, { italic: true, color: "gray" }, '"', data, '"')), /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "cyan" }, "How would you like to proceed?")), /* @__PURE__ */ React13.createElement(Box13, { marginTop: 0 }, /* @__PURE__ */ React13.createElement(
       CommandMenu,
       {
@@ -8723,12 +8981,12 @@ var init_app = __esm({
 });
 
 // src/cli.jsx
-import { spawn as spawn2 } from "child_process";
+import { spawn as spawn3 } from "child_process";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var HEAP_LIMIT = 4096;
 var isBundled = fileURLToPath2(import.meta.url).endsWith(".js");
 if (isBundled && !process.execArgv.some((arg) => arg.includes("max-old-space-size"))) {
-  const cp = spawn2(process.execPath, [
+  const cp = spawn3(process.execPath, [
     `--max-old-space-size=${HEAP_LIMIT}`,
     fileURLToPath2(import.meta.url),
     ...process.argv.slice(2)
@@ -8737,7 +8995,7 @@ if (isBundled && !process.execArgv.some((arg) => arg.includes("max-old-space-siz
 } else {
   const { default: React14 } = await import("react");
   const { render } = await import("ink");
-  const { default: App2 } = await Promise.resolve().then(() => (init_app(), app_exports));
+  const { default: App2 } = await init_app().then(() => app_exports);
   process.env.NODE_NO_WARNINGS = "1";
   const silentPatterns = [
     "cuimp",