fluxflow-cli 1.18.1 → 1.18.3

package/dist/fluxflow.js

@@ -440,11 +440,15 @@ var init_TerminalBox = __esm({
   "src/components/TerminalBox.jsx"() {
     init_text();
     TerminalBox = React2.memo(({ command, output, completed = false, isFocused = false, columns = 80, isPty = false }) => {
-      const processOutput = (text) => {
+      const processPTY = (text) => {
         if (!text) return "";
-        return text.split(/\r\n|\r|\n/).map((line) => line.trimEnd()).join("\n").replace(/^\n+|\n+$/g, "");
+        const noTrailingCr = text.replace(/\r+\n/g, "\n");
+        return noTrailingCr.split("\n").map((line) => {
+          const parts = line.split("\r");
+          return parts[parts.length - 1];
+        }).join("\n");
       };
-      const cleanOutput = processOutput(output);
+      const cleanOutput = isPty ? processPTY(output) : (output || "").replace(/\r\n/g, "\n");
       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)")));
     });
@@ -3226,16 +3230,28 @@ var init_update_file = __esm({
       const targetPath = parsed.path;
       if (!targetPath) return 'ERROR: Missing "path" argument for update_file.';
       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) {
+      const indices = /* @__PURE__ */ new Set();
+      Object.keys(parsed).forEach((key) => {
+        const m = key.match(/^(replaceContent|newContent|content_to_replace|content_to_add)(\d+)?$/);
+        if (m) {
+          const index = m[2] ? parseInt(m[2]) : 1;
+          indices.add(index);
+        }
+      });
+      const sortedIndices = Array.from(indices).sort((a, b) => a - b);
+      for (const i of sortedIndices) {
+        let r, n;
+        if (i === 1) {
+          r = parsed.replaceContent1 ?? (parsed.content_to_replace ?? parsed.replaceContent);
+          n = parsed.newContent1 ?? (parsed.content_to_add ?? parsed.newContent);
+        } else {
+          r = parsed[`replaceContent${i}`] ?? parsed[`content_to_replace${i}`];
+          n = parsed[`newContent${i}`] ?? parsed[`content_to_add${i}`];
+        }
+        if (r !== void 0 && n !== void 0) {
           patchPairs.push({ replace: r, new: n });
+        } else if (r !== void 0 || n !== void 0) {
+          return `ERROR: Mismatched replacement pair for index ${i}. Both replacement and new content must be provided.`;
         }
       }
       if (patchPairs.length === 0) {
@@ -3626,7 +3642,8 @@ var init_exec_command = __esm({
               });
               ptyProcess.onExit(({ exitCode }) => {
                 activeChildProcess = null;
-                const finalOutput = output || "Command executed with no output.";
+                const normalizedOutput = (output || "").replace(/\r\n/g, "\n").replace(/\r/g, "\n");
+                const finalOutput = normalizedOutput || "Command executed with no output.";
                 if (exitCode !== 0) {
                   resolve(`ERROR: Command [${rawCommand}] failed with exit code [${exitCode}].
 
@@ -7785,10 +7802,21 @@ ${timestamp}` };
               onExecEnd: () => {
                 setMessages((prev) => {
                   if (!activeCommandRef.current) return prev;
+                  const rawOutput = execOutputRef.current || "";
+                  let normalizedOutput = "";
+                  if (isActiveCommandPty) {
+                    const noTrailingCr = rawOutput.replace(/\r+\n/g, "\n");
+                    normalizedOutput = noTrailingCr.split("\n").map((line) => {
+                      const parts = line.split("\r");
+                      return parts[parts.length - 1];
+                    }).join("\n");
+                  } else {
+                    normalizedOutput = rawOutput.replace(/\r\n/g, "\n");
+                  }
                   const finalStatus = `[TERMINAL_RECORD]
 COMMAND: ${activeCommandRef.current}
 PTY: ${isActiveCommandPty}
-OUTPUT: ${execOutputRef.current}`;
+OUTPUT: ${normalizedOutput}`;
                   return [...prev, { id: "term-" + Date.now(), role: "system", text: finalStatus, isTerminalRecord: true }];
                 });
                 setActiveCommand(null);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fluxflow-cli",
-	"version": "1.18.1",
+	"version": "1.18.3",
 	"date": "2026-05-30",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [