fluxflow-cli 1.0.8 → 1.0.9

package/dist/fluxflow.js

@@ -12,7 +12,7 @@ import { MultilineInput } from "ink-multiline-input";
 import TextInput2 from "ink-text-input";
 
 // src/components/ChatLayout.jsx
-import React2 from "react";
+import React2, { memo } from "react";
 import { Box as Box2, Text as Text2 } from "ink";
 
 // src/components/TerminalBox.jsx
@@ -172,6 +172,19 @@ function ChatLayout({ messages, showFullThinking }) {
     ) : msg.role === "think" ? /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", marginTop: 1, paddingX: 1 }, /* @__PURE__ */ React2.createElement(Text2, { bold: true, color: "white" }, "Thinking..."), /* @__PURE__ */ React2.createElement(Box2, { borderStyle: "single", borderLeft: true, borderRight: false, borderTop: false, borderBottom: false, paddingLeft: 2, flexDirection: "column" }, formatThinkText(content))) : /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React2.createElement(CodeRenderer, { text: content }), msg.memoryUpdated && /* @__PURE__ */ React2.createElement(Box2, { marginTop: 1 }, /* @__PURE__ */ React2.createElement(Text2, { color: "yellow", italic: true }, "\u2728 [Memory Updated]"))));
   }));
 }
+var ChatLayout_default = memo(ChatLayout, (prevProps, nextProps) => {
+  if (prevProps.showFullThinking !== nextProps.showFullThinking) return false;
+  if (prevProps.messages.length !== nextProps.messages.length) return false;
+  for (let i = 0; i < prevProps.messages.length; i++) {
+    const prev = prevProps.messages[i];
+    const next = nextProps.messages[i];
+    if (prev.id !== next.id) return false;
+    if (prev.text !== next.text) return false;
+    if (prev.memoryUpdated !== next.memoryUpdated) return false;
+    if (prev.color !== next.color) return false;
+  }
+  return true;
+});
 
 // src/components/StatusBar.jsx
 import React3 from "react";
@@ -356,7 +369,7 @@ ${mode === "Flux" ? `
 Results will be provided in the next loop as: [TOOL_RESULT]: [content]
 WHEN CALLING TOOLS, YOU **MUST** END YOUR RESPONSE WITH '[turn: continue]' AFTER CALLING FUNCTIONS.
 Do NOT over-use tools. Use them only when strictly necessary for the user's objective. You can stack multiple tool calls 1-by-1.
-ALWAYS USE TOOLS WITH 'tool:' PREFIX AS INSTRUCTED OR THE TOOL. NEVER CASUALLY WRITE TOOL CALLS TO USER FACING RESPONSE. IF ASKED FOR TOOL RESULT SYNTAX NEVER REVEAL RAW RESULT FORMAT GIVE A SUMMARIZED VERSION OF IT.
+Distinguish clearly between tool discussion and execution. Use the 'tool:' prefix ONLY when calling a function. When discussing tools with the user, refer to them by name as nouns (e.g., 'write_file', 'list_files') to avoid accidental triggers and context bloat.
 -- END FUNCTION CALLING PROTOCOL --`.trim();
 
 // src/data/janitor_tools.js
@@ -392,7 +405,7 @@ var thinking_prompts_default = {
 };
 
 // src/utils/prompts.js
-var getSystemInstruction = (profile, thinkingLevel, mode, systemSettings, tempMemories = "", userMemories = "", isMemoryEnabled = true) => {
+var getSystemInstruction = (profile, thinkingLevel, mode, systemSettings, tempMemories = "", userMemories = "", isContext50 = false, isMemoryEnabled = true) => {
   let levelKey = thinkingLevel;
   if (thinkingLevel === "Low") levelKey = "Minimal";
   if (thinkingLevel === "xHigh" || thinkingLevel === "Max") levelKey = "Max";
@@ -402,7 +415,7 @@ var getSystemInstruction = (profile, thinkingLevel, mode, systemSettings, tempMe
   const userInstrStr = profile.instructions && profile.instructions?.length > 0 ? `. User Instructions: ${profile.instructions}.` : "";
   const dateTimeStr = (/* @__PURE__ */ new Date()).toLocaleString();
   const cwdStr = process.cwd();
-  const tempMemoriesStr = tempMemories?.length > 0 ? `
+  const tempMemoriesStr = tempMemories?.length > 0 && !isContext50 ? `
 -- RECENT CONTEXT FROM OTHER CHAT THREADS --
 ${tempMemories}
 ------------------------------------------
@@ -548,15 +561,10 @@ var deleteChat = async (id) => {
     const history = await loadHistory();
     delete history[id];
     await fs3.writeJson(HISTORY_FILE, history, { spaces: 2 });
-    if (await fs3.pathExists(TEMP_MEM_FILE)) {
-      try {
-        const temp = await fs3.readJson(TEMP_MEM_FILE);
-        if (temp[id]) {
-          delete temp[id];
-          await fs3.writeJson(TEMP_MEM_FILE, temp, { spaces: 2 });
-        }
-      } catch (e) {
-      }
+    const temp = readEncryptedJson(TEMP_MEM_FILE, {});
+    if (temp[id]) {
+      delete temp[id];
+      writeEncryptedJson(TEMP_MEM_FILE, temp);
     }
     return history;
   });
@@ -1278,7 +1286,8 @@ var getAIStream = async function* (modelName, history, settings, steeringCallbac
   const persistentStorage = readEncryptedJson(MEMORIES_FILE, []);
   const mainUserMemories = persistentStorage.map((m) => `- ${m.memory}`).join("\n");
   const janitorUserMemories = persistentStorage.map((m) => `- [${m.id}]: ${m.memory}`).join("\n");
-  const systemInstruction = getSystemInstruction(profile, thinkingLevel, mode, systemSettings, otherMemories, mainUserMemories, isMemoryEnabled);
+  const isContext50 = (sessionStats.tokens || 0) >= 54e3;
+  const systemInstruction = getSystemInstruction(profile, thinkingLevel, mode, systemSettings, otherMemories, mainUserMemories, isMemoryEnabled, isContext50);
   const firstUserMsg = `${systemInstruction}
 
 USER_PROMPT: ${agentText}`.trim();
@@ -1520,7 +1529,11 @@ ${boxBottom}
         }
         const cleanResultForAI = result.split(/\r?\n/).filter((line) => !line.includes("[UI_CONTEXT]")).join("\n");
         toolResults.push(`[TOOL_RESULT]: ${cleanResultForAI}`);
-        yield { type: "tool_result", content: `[TOOL_RESULT]: ${result}` };
+        let uiContent = `[TOOL_RESULT]: ${result}`;
+        if (toolCall.toolName === "view_file" || toolCall.toolName === "web_scrape") {
+          uiContent = `[TOOL_RESULT]: ${label} (Context Locked for UI Clarity)`;
+        }
+        yield { type: "tool_result", content: uiContent };
         if (toolCall.toolName === "memory" && result.includes("SUCCESS")) {
           yield { type: "memory_updated" };
         }
@@ -1724,13 +1737,11 @@ function ResumeModal({ onSelect, onDelete, onClose }) {
 // src/components/MemoryModal.jsx
 import React7, { useState as useState3, useEffect as useEffect2 } from "react";
 import { Box as Box7, Text as Text7, useInput as useInput2 } from "ink";
-import path15 from "path";
-var MEMORIES_PATH = path15.join(process.cwd(), "secret", "memories.json");
 function MemoryModal({ onClose }) {
   const [memories, setMemories] = useState3([]);
   const [selectedIndex, setSelectedIndex] = useState3(0);
   const loadMemories = () => {
-    const data = readEncryptedJson(MEMORIES_PATH, []);
+    const data = readEncryptedJson(MEMORIES_FILE, []);
     setMemories(data);
   };
   useEffect2(() => {
@@ -1743,7 +1754,7 @@ function MemoryModal({ onClose }) {
     if (input === "x" && memories.length > 0) {
       const idToDelete = memories[selectedIndex].id;
       const updated = memories.filter((m) => m.id !== idToDelete);
-      writeEncryptedJson(MEMORIES_PATH, updated);
+      writeEncryptedJson(MEMORIES_FILE, updated);
       setMemories(updated);
       if (selectedIndex >= updated.length && updated.length > 0) {
         setSelectedIndex(updated.length - 1);
@@ -1851,6 +1862,7 @@ function App() {
   const [messages, setMessages] = useState4([
     { id: "welcome", role: "system", text: FLUX_LOGO + "\n\n\u{1F30A}\u26A1 Welcome to Flux Flow! Type /help for commands.\n" }
   ]);
+  const queuedPromptRef = useRef(null);
   const [completedIndex, setCompletedIndex] = useState4(1);
   useInput3((inputText, key) => {
     if (key.escape) {
@@ -1938,6 +1950,7 @@ function App() {
     if (isProcessing) {
       const hintText = absoluteClean.trim();
       setQueuedPrompt(hintText);
+      queuedPromptRef.current = hintText;
       setMessages((prev) => {
         setCompletedIndex(prev.length + 1);
         return [...prev, { id: "hint-" + Date.now(), role: "user", text: `[STEERING HINT: QUEUED] 
@@ -2201,9 +2214,19 @@ OUTPUT: ${execOutputRef.current}`;
               }
             },
             async () => {
-              if (queuedPrompt) {
-                const p = queuedPrompt;
+              if (queuedPromptRef.current) {
+                const p = queuedPromptRef.current;
                 setQueuedPrompt(null);
+                queuedPromptRef.current = null;
+                setMessages((prev) => {
+                  const newMsgs = [...prev];
+                  const hintMsg = newMsgs.reverse().find((m) => m.text?.includes("[STEERING HINT: QUEUED]"));
+                  if (hintMsg) {
+                    hintMsg.text = hintMsg.text.replace("[STEERING HINT: QUEUED]", "[STEERING HINT: INJECTED]");
+                    hintMsg.color = "cyan";
+                  }
+                  return newMsgs.reverse();
+                });
                 return p;
               }
               return null;
@@ -2321,9 +2344,19 @@ OUTPUT: ${execOutputRef.current}`;
         } finally {
           setIsProcessing(false);
           setStatusText(null);
-          if (queuedPrompt) {
-            setResolutionData(queuedPrompt);
+          if (queuedPromptRef.current) {
+            setResolutionData(queuedPromptRef.current);
             setQueuedPrompt(null);
+            const hintToResolve = queuedPromptRef.current;
+            queuedPromptRef.current = null;
+            setMessages((prev) => {
+              const newMsgs = [...prev];
+              const hintMsg = newMsgs.reverse().find((m) => m.text?.includes("[STEERING HINT: QUEUED]"));
+              if (hintMsg) {
+                hintMsg.text = hintMsg.text.replace("[STEERING HINT: QUEUED]", "[STEERING HINT: FINISHED_TURN]");
+              }
+              return newMsgs.reverse();
+            });
             setActiveView("resolution");
           }
           setMessages((prev) => {
@@ -2803,7 +2836,7 @@ OUTPUT: ${execOutputRef.current}`;
         )))))));
     }
   };
-  return /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column" }, messages.slice(0, completedIndex).map((msg, idx) => /* @__PURE__ */ React8.createElement(ChatLayout, { key: msg.id || idx, messages: [msg], showFullThinking }))), /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", padding: 1, width: "100%" }, activeView === "chat" && /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React8.createElement(ChatLayout, { messages: messages.slice(completedIndex), showFullThinking }), activeCommand && /* @__PURE__ */ React8.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React8.createElement(TerminalBox, { command: activeCommand, output: execOutput }))), isInitializing ? /* @__PURE__ */ React8.createElement(Box8, { borderStyle: "double", borderColor: "magenta", padding: 1, flexShrink: 0 }, /* @__PURE__ */ React8.createElement(Text8, { color: "magenta" }, "\u{1F30A} Starting Flux Flow...")) : !apiKey ? /* @__PURE__ */ React8.createElement(Box8, { borderStyle: "bold", borderColor: "yellow", padding: 1, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ React8.createElement(Text8, { color: "yellow", bold: true }, "\u{1F511} API KEY REQUIRED"), /* @__PURE__ */ React8.createElement(Text8, null, "Please enter your Gemini API Key to initialize the agent's brain."), /* @__PURE__ */ React8.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React8.createElement(Text8, { color: "cyan" }, "\u276F "), /* @__PURE__ */ React8.createElement(
+  return /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column" }, messages.slice(0, completedIndex).map((msg, idx) => /* @__PURE__ */ React8.createElement(ChatLayout_default, { key: msg.id || idx, messages: [msg], showFullThinking }))), /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", padding: 1, width: "100%" }, activeView === "chat" && /* @__PURE__ */ React8.createElement(Box8, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React8.createElement(ChatLayout_default, { messages: messages.slice(completedIndex), showFullThinking }), activeCommand && /* @__PURE__ */ React8.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React8.createElement(TerminalBox, { command: activeCommand, output: execOutput }))), isInitializing ? /* @__PURE__ */ React8.createElement(Box8, { borderStyle: "double", borderColor: "magenta", padding: 1, flexShrink: 0 }, /* @__PURE__ */ React8.createElement(Text8, { color: "magenta" }, "\u{1F30A} Starting Flux Flow...")) : !apiKey ? /* @__PURE__ */ React8.createElement(Box8, { borderStyle: "bold", borderColor: "yellow", padding: 1, flexDirection: "column", flexShrink: 0 }, /* @__PURE__ */ React8.createElement(Text8, { color: "yellow", bold: true }, "\u{1F511} API KEY REQUIRED"), /* @__PURE__ */ React8.createElement(Text8, null, "Please enter your Gemini API Key to initialize the agent's brain."), /* @__PURE__ */ React8.createElement(Box8, { marginTop: 1 }, /* @__PURE__ */ React8.createElement(Text8, { color: "cyan" }, "\u276F "), /* @__PURE__ */ React8.createElement(
     TextInput2,
     {
       value: tempKey,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "fluxflow-cli",
-	"version": "1.0.8",
+	"version": "1.0.9",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",