fluxflow-cli 1.8.14 → 1.8.16

package/dist/fluxflow.js

@@ -740,7 +740,7 @@ var init_janitor_tools = __esm({
     JANITOR_TOOLS_PROTOCOL = (isMemoryEnabled = true, needTitle = false) => `
 ${needTitle ? `-- START CHAT MANAGEMENT TOOLS --
 1. YOU MUST UPDATE CHAT TITLE (URGENT PRIORITY):
-   tool:functions.chat(title='<short summary of conversation in 3-5 words>')
+   tool:functions.chat(title='<short summary of conversation context in 3-5 words>')
 -- END CHAT MANAGEMENT TOOLS --
 
 ` : ""}
@@ -3061,6 +3061,9 @@ ${boxBottom}
             const agentErrDir = path16.join(LOGS_DIR, "agent");
             if (!fs16.existsSync(agentErrDir)) fs16.mkdirSync(agentErrDir, { recursive: true });
             fs16.appendFileSync(path16.join(agentErrDir, "error.log"), `ERROR [${date}]: ${errLog}
+
+----------------------------------------------------------------------
+
 `);
             if (retryCount < MAX_RETRIES) {
               retryCount++;
@@ -3112,7 +3115,7 @@ ${boxBottom}
             cleanedFullResponse,
             janitorUserMemories,
             isMemoryEnabled,
-            needTitle
+            true
           );
           janitorContents.push({ role: "user", parts: [{ text: janitorPrompt }] });
           let finalSynthesis = "";
@@ -3121,52 +3124,75 @@ ${boxBottom}
               console.warn("Quota Exhausted for Background Model. Skipping refinement.");
               throw new Error("QUOTA_BLOCKED");
             }
-            const janitorResult = await client.models.generateContent({
-              model: janitorModel || "gemma-4-26b-a4b-it",
-              contents: janitorContents,
-              config: {
-                maxOutputTokens: 384,
-                temperature: 0.69,
-                safetySettings: [
-                  {
-                    category: HarmCategory.HARM_CATEGORY_HARASSMENT,
-                    threshold: HarmBlockThreshold.BLOCK_NONE
-                  },
-                  {
-                    category: HarmCategory.HARM_CATEGORY_HATE_SPEECH,
-                    threshold: HarmBlockThreshold.BLOCK_NONE
-                  },
-                  {
-                    category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT,
-                    threshold: HarmBlockThreshold.BLOCK_NONE
-                  },
-                  {
-                    category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT,
-                    threshold: HarmBlockThreshold.BLOCK_NONE
+            yield { type: "spinner", content: false };
+            let fullContent = "";
+            let lastUsage2 = null;
+            try {
+              const timeoutPromise = new Promise(
+                (_, reject) => setTimeout(() => reject(new Error("JANITOR_TIMEOUT")), 15e3)
+              );
+              const streamPromise = (async () => {
+                const stream2 = await client.models.generateContentStream({
+                  model: janitorModel || "gemma-4-26b-a4b-it",
+                  contents: janitorContents,
+                  config: {
+                    maxOutputTokens: 384,
+                    temperature: 0.69,
+                    safetySettings: [
+                      { category: HarmCategory.HARM_CATEGORY_HARASSMENT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                      { category: HarmCategory.HARM_CATEGORY_HATE_SPEECH, threshold: HarmBlockThreshold.BLOCK_NONE },
+                      { category: HarmCategory.HARM_CATEGORY_SEXUALLY_EXPLICIT, threshold: HarmBlockThreshold.BLOCK_NONE },
+                      { category: HarmCategory.HARM_CATEGORY_DANGEROUS_CONTENT, threshold: HarmBlockThreshold.BLOCK_NONE }
+                    ],
+                    thinkingConfig: { includeThoughts: false, thinkingLevel: ThinkingLevel.MINIMAL }
                   }
-                ],
-                thinkingConfig: {
-                  includeThoughts: false,
-                  thinkingLevel: ThinkingLevel.MINIMAL
+                });
+                await incrementUsage("background");
+                const iterator2 = stream2[Symbol.asyncIterator]();
+                const firstResult2 = await iterator2.next();
+                return { iterator: iterator2, firstResult: firstResult2 };
+              })();
+              const { iterator, firstResult } = await Promise.race([streamPromise, timeoutPromise]);
+              let { value: firstChunk, done: firstDone } = firstResult;
+              if (!firstDone && firstChunk) {
+                const parts = firstChunk.candidates?.[0]?.content?.parts;
+                const chunkText = parts?.[1]?.text || parts?.[0]?.text || (typeof firstChunk.text === "function" ? firstChunk.text() : "");
+                if (chunkText) {
+                  fullContent += chunkText;
+                  yield { type: "status", content: "Finishing..." };
+                }
+                lastUsage2 = firstChunk.usageMetadata;
+                for await (const chunk of { [Symbol.asyncIterator]: () => iterator }) {
+                  const p = chunk.candidates?.[0]?.content?.parts;
+                  const t = p?.[1]?.text || p?.[0]?.text || (typeof chunk.text === "function" ? chunk.text() : "");
+                  if (t) {
+                    fullContent += t;
+                  }
+                  lastUsage2 = chunk.usageMetadata;
                 }
               }
-            });
-            const parts = janitorResult.candidates?.[0]?.content?.parts;
-            if (parts && parts[1]?.text) {
-              finalSynthesis = parts[1].text;
+            } catch (e) {
+              if (e.message === "JANITOR_TIMEOUT") {
+                throw new Error("Janitor API Timeout: No tokens received within 15s.");
+              }
+              throw e;
+            }
+            yield { type: "spinner", content: true };
+            if (fullContent) {
+              finalSynthesis = fullContent;
+              if (lastUsage2) {
+                await addToUsage("tokens", lastUsage2.totalTokenCount || 0);
+              }
               const date = (/* @__PURE__ */ new Date()).toLocaleString();
               const janitorLogDir = path16.join(LOGS_DIR, "janitor");
               if (!fs16.existsSync(janitorLogDir)) {
                 fs16.mkdirSync(janitorLogDir, { recursive: true });
               }
               fs16.appendFileSync(path16.join(janitorLogDir, "debug.log"), `DEBUG [${date}]: ${finalSynthesis}
+
 `);
-            } else if (parts && parts[0]?.text) finalSynthesis = parts[0].text;
-            else if (janitorResult.response && janitorResult.response.text) finalSynthesis = janitorResult.response.text();
-            else throw new Error("No synthesis generated by Janitor.");
-            await incrementUsage("background");
-            if (janitorResult.usageMetadata) {
-              await addToUsage("tokens", janitorResult.usageMetadata.totalTokenCount || 0);
+            } else {
+              throw new Error("No synthesis generated by Janitor.");
             }
             yield { type: "background_increment" };
             const janitorToolCalls = detectToolCalls(finalSynthesis);
@@ -3176,6 +3202,10 @@ ${boxBottom}
               const date = (/* @__PURE__ */ new Date()).toLocaleString();
               const janitorLogDir = path16.join(LOGS_DIR, "janitor");
               fs16.appendFileSync(path16.join(janitorLogDir, "debug.log"), `DEBUG [${date}]: RESULT [${janitorToolCall.toolName}]: ${result}
+
+----------------------------------------------------------------------
+
+
 `);
               if (janitorToolCall.toolName === "memory" && !janitorToolCall.args.includes("action='temp'")) {
                 yield { type: "memory_updated" };
@@ -3188,6 +3218,10 @@ ${boxBottom}
               fs16.mkdirSync(janitorErrDir, { recursive: true });
             }
             fs16.appendFileSync(path16.join(janitorErrDir, "error.log"), `ERROR [${date}]: ${String(janitorErr)}
+
+----------------------------------------------------------------------
+
+
 `);
             console.error("Janitor Background Tasks Failed:", janitorErr.message);
           }
@@ -3601,6 +3635,20 @@ Check what's new using \`/changelog\` command.`,
   const [activeCommand, setActiveCommand] = useState7(null);
   const [execOutput, setExecOutput] = useState7("");
   const [isTerminalFocused, setIsTerminalFocused] = useState7(false);
+  useEffect5(() => {
+    if (apiTier !== "Free" && activeModel === "gemma-4-31b-it") {
+      setActiveModel("gemini-3-flash-preview");
+      setMessages((prev) => {
+        setCompletedIndex(prev.length + 1);
+        return [...prev, {
+          id: "tier-switch-" + Date.now(),
+          role: "system",
+          text: `\u26A0\uFE0F **[TIER LIMIT]** Gemma is only available on Free API tier. Automatically switched to Gemini 3 Flash Preview.`,
+          isMeta: true
+        }];
+      });
+    }
+  }, [apiTier, activeModel]);
   const terminalEnv = useMemo(() => {
     const isIDE = process.env.TERM_PROGRAM === "vscode" || !!process.env.VSC_TERMINAL_URL || !!process.env.INTELLIJ_TERMINAL_COMMAND_BLOCKS;
     return {
@@ -3878,7 +3926,7 @@ Check what's new using \`/changelog\` command.`,
       cmd: "/model",
       desc: "Switch AI model",
       subs: [
-        { cmd: "gemma-4-31b-it", desc: "Standard Default (Free, Recommended)" },
+        { cmd: "gemma-4-31b-it", desc: apiTier === "Free" ? "Standard Default (Free, Recommended)" : "Standard Default (Free, Recommended) - Cannot use Gemma with paid API" },
         { cmd: "gemini-3.1-pro-preview", desc: "Most Capable (Paid)" },
         { cmd: "gemini-3-flash-preview", desc: "Fast & Lightweight (Paid, Free limited quota)" },
         { cmd: "gemini-3.1-flash-lite-preview", desc: "Ultra Fast (Paid, Free limited quota)" }
@@ -3968,7 +4016,7 @@ ${hintText}`, color: "magenta" }];
                   resumedMsgs.unshift({ id: "welcome-" + Date.now(), role: "system", text: FLUX_LOGO + "\n\n\u{1F30A}\u26A1 Resuming Flux Flow Session...\n" });
                 }
                 setMessages(resumedMsgs);
-                setMessages((prev) => [...prev, { id: "sys-" + Date.now(), role: "system", text: `\u{1F4E1} SESSION RESUMED: [${targetId}]` }]);
+                setMessages((prev) => [...prev, { id: "sys-" + Date.now(), role: "system", text: `\u{1F4E1} SESSION RESUMED: [${targetId}]`, isMeta: true }]);
                 setCompletedIndex(0);
               } else {
                 setMessages((prev) => [...prev, { id: "err-" + Date.now(), role: "system", text: `\u274C ERROR: Session [${targetId}] not found.` }]);
@@ -4045,11 +4093,24 @@ ${hintText}`, color: "magenta" }];
         case "/model": {
           if (parts[1]) {
             const mod = parts.slice(1).join(" ");
-            setActiveModel(mod);
-            setMessages((prev) => {
-              setCompletedIndex(prev.length + 1);
-              return [...prev, { id: Date.now(), role: "system", text: `\u2699\uFE0F [SYSTEM] Model switched to ${mod}`, isMeta: true }];
-            });
+            if (mod === "gemma-4-31b-it" && apiTier !== "Free") {
+              setMessages((prev) => {
+                setCompletedIndex(prev.length + 1);
+                return [...prev, {
+                  id: Date.now(),
+                  role: "system",
+                  text: `\u274C **[ACCESS DENIED]** Gemma is restricted to the Free API tier. Automatically switching you to **Gemini 3 Flash Preview** for optimal performance.`,
+                  isMeta: true
+                }];
+              });
+              setActiveModel("gemini-3-flash-preview");
+            } else {
+              setActiveModel(mod);
+              setMessages((prev) => {
+                setCompletedIndex(prev.length + 1);
+                return [...prev, { id: Date.now(), role: "system", text: `\u2699\uFE0F [SYSTEM] Model switched to ${mod}`, isMeta: true }];
+              });
+            }
           } else {
             setActiveView("model");
           }
@@ -5094,8 +5155,17 @@ Selection: ${val}`,
       visible.map((s, i) => {
         const actualIdx = startIdx + i;
         const isActive = actualIdx === selectedIndex;
+        const isGemmaDisabled = s.cmd === "gemma-4-31b-it" && apiTier !== "Free";
         const cmdText = s.cmd.padEnd(32);
-        return /* @__PURE__ */ React10.createElement(Box10, { key: s.cmd, flexDirection: "row" }, /* @__PURE__ */ React10.createElement(Text10, { color: isActive ? "cyan" : "gray" }, isActive ? "\u276F " : "  "), /* @__PURE__ */ React10.createElement(Text10, { color: isActive ? "yellow" : "gray", bold: isActive }, cmdText), /* @__PURE__ */ React10.createElement(Text10, { color: "gray", dimColor: true, italic: true }, s.desc));
+        return /* @__PURE__ */ React10.createElement(Box10, { key: s.cmd, flexDirection: "row" }, /* @__PURE__ */ React10.createElement(Text10, { color: isActive ? "cyan" : "gray" }, isActive ? "\u276F " : "  "), /* @__PURE__ */ React10.createElement(
+          Text10,
+          {
+            color: isGemmaDisabled ? "gray" : isActive ? "yellow" : "gray",
+            bold: isActive,
+            dimColor: isGemmaDisabled
+          },
+          cmdText
+        ), /* @__PURE__ */ React10.createElement(Text10, { color: "gray", dimColor: true, italic: true }, s.desc));
       }),
       suggestions.length > 5 && /* @__PURE__ */ React10.createElement(Box10, { height: 1 }, remaining > 0 && /* @__PURE__ */ React10.createElement(Text10, { color: "gray", dimColor: true }, "  ...(", remaining, "more)"))
     );
@@ -5126,7 +5196,7 @@ var init_app = __esm({
     init_text();
     SESSION_START_TIME = Date.now();
     CHANGELOG_URL = "https://fluxflow-cli.onrender.com/changelog.html";
-    versionFluxflow = "1.8.14";
+    versionFluxflow = "1.8.16";
     updatedOn = "2026-05-09";
     ResolutionModal = ({ data, onResolve, onEdit }) => /* @__PURE__ */ React10.createElement(Box10, { flexDirection: "column", borderStyle: "round", borderColor: "magenta", paddingX: 2, paddingY: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { color: "magenta", bold: true, underline: true }, "\u{1F7E3} STEERING HINT RESOLUTION"), /* @__PURE__ */ React10.createElement(Text10, { marginTop: 1 }, "The agent already finished the task before your hint was consumed."), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1, backgroundColor: "#222", paddingX: 1, width: "100%" }, /* @__PURE__ */ React10.createElement(Text10, { italic: true, color: "gray" }, '"', data, '"')), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(Text10, { color: "cyan" }, "How would you like to proceed?")), /* @__PURE__ */ React10.createElement(Box10, { marginTop: 1 }, /* @__PURE__ */ React10.createElement(
       CommandMenu,

package/package.json

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