fluxflow-cli 1.19.5 → 1.20.0

package/dist/fluxflow.js

@@ -1171,7 +1171,7 @@ var init_main_tools = __esm({
       }
       return _isPsAvailable;
     };
-    TOOL_PROTOCOL = (mode, osDetected) => `
+    TOOL_PROTOCOL = (mode, osDetected, isMultiModal, aiProvider) => `
 -- TOOL DEFINITIONS --
 Access to internal tools. MUST use the exact syntax on a new line: [tool:functions.ToolName(args)]
 MANDATORY TOOL POLICY:
@@ -1185,8 +1185,8 @@ ${mode === "Flux" ? "- **File Tools >> Code in chat**\n" : ""}
 1. [tool:functions.WebSearch(query="...", limit=number)]. Limit 3-10. Proactive use for unknown topics
 2. [tool:functions.WebScrape(url="...")]. Proactive use for specific webpage/docs/api
 
-${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
+${mode === "Flux" ? `- PROJECT TOOLS (path = relative to CWD, path separator: '/') -
+1. [tool:functions.ReadFile(path="...", startLine=number, endLine=number)]. ${aiProvider !== "Google" ? `${isMultiModal ? `Supports images/docs. User gives image/doc: VIEW FIRST` : `No Multimodal support`}` : `Supports images/docs. User gives image/doc: VIEW FIRST`}
 2. [tool:functions.ReadFolder(path="...")]. Detailed DIR stats
 3. [tool:functions.PatchFile(path="...", replaceContent1="exact string", newContent1="...", ...MAX 8)]. Surgical Patch. **Multiple patch on same file/path? Use replaceContent2, newContent2 etc >>> multiple spams**. Unsure? ReadFile > guessing.
 4. [tool:functions.WriteFile(path="...", content="...")]. Creates/Overwrites. File Exist? PatchFile >>> WriteFile. Verify Imports
@@ -2413,7 +2413,7 @@ ${userMemories}` : "";
 ${parts.join("\n\n")}
 ` : "";
     };
-    getSystemInstruction = (profile, thinkingLevel, mode, systemSettings, isMemoryEnabled = true, isFirstPrompt = false) => {
+    getSystemInstruction = (profile, thinkingLevel, mode, systemSettings, isMemoryEnabled = true, isFirstPrompt = false, aiProvider = "Google", isMultiModal = false) => {
       let thinkingConfig = "";
       if (thinkingLevel !== "GEM") {
         let levelKey = thinkingLevel;
@@ -2472,15 +2472,15 @@ Mode: ${mode}${thinkingLevel !== "Fast" ? " (Thinking Mode)" : ""}. ${mode === "
 -- MARKERS --
 - TOOL SYSTEM: [TOOL RESULT] (system priority)
 - SYSTEM NOTIFICATION: [SYSTEM], [METADATA] in user turn
-${thinkingLevel !== "GEM" ? `
+${aiProvider === "Google" ? `${thinkingLevel !== "GEM" ? `
 -- THINKING RULES --
 ${thinkingConfig}
 ${thinkingLevel !== "Fast" ? `
 CRITICAL THINKING POLICY
 - ALWAYS use <think> ... </think> before responding, even with simple queries/greetings
 - ${thinkingLevel === "Low" || thinkingLevel === "Medium" || thinkingLevel === "Fast" ? "C" : "Interrogate approaches adversarially, but c"}ommit once best solution is determined through analysis. Avoid spiraling after reaching decision point
-` : ""}` : ""}
-${TOOL_PROTOCOL(mode, osDetected)}
+` : ""}` : ""}` : ``}
+${TOOL_PROTOCOL(mode, osDetected, isMultiModal, aiProvider)}
 ${projectContextBlock}
 -- MEMORY RULES --
 - Memory: ${isMemoryEnabled ? "Subtly Personalize. Auto Saves" : "OFF. Decline Remembering Memories"}
@@ -4415,6 +4415,7 @@ var init_settings = __esm({
     DEFAULT_SETTINGS = {
       mode: "Flux",
       thinkingLevel: "Medium",
+      aiProvider: "Google",
       activeModel: "gemma-4-31b-it",
       showFullThinking: true,
       apiTier: "Free",
@@ -4922,7 +4923,7 @@ var init_tools = __esm({
 import { GoogleGenAI, ThinkingLevel, HarmBlockThreshold, HarmCategory } from "@google/genai";
 import path16 from "path";
 import fs17 from "fs";
-var client, TERMINATION_SIGNAL, stripAnsi2, signalTermination, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, consolidatePastMemories, getAIStream;
+var client, TERMINATION_SIGNAL, stripAnsi2, fetchWithBackoff, getOpenRouterStream, signalTermination, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, consolidatePastMemories, getAIStream;
 var init_ai = __esm({
   async "src/utils/ai.js"() {
     await init_prompts();
@@ -4940,6 +4941,141 @@ var init_ai = __esm({
       if (typeof str !== "string") return str;
       return str.replace(/[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g, "");
     };
+    fetchWithBackoff = async (url, options, retries = 5, delay = 1e3) => {
+      for (let i = 0; i < retries; i++) {
+        try {
+          const response = await fetch(url, options);
+          if (response.ok) return response;
+          if (response.status !== 429 && response.status < 500) return response;
+        } catch (e) {
+          if (i === retries - 1) throw e;
+        }
+        await new Promise((resolve) => setTimeout(resolve, delay * Math.pow(2, i)));
+      }
+      return fetch(url, options);
+    };
+    getOpenRouterStream = async function* (apiKey, model, contents, systemInstruction, thinkingLevel, mode, isMultiModal) {
+      const messages = [];
+      if (systemInstruction) {
+        messages.push({ role: "system", content: systemInstruction });
+      }
+      for (const content of contents) {
+        const role = content.role === "user" ? "user" : "assistant";
+        const msgContent = [];
+        if (Array.isArray(content.parts)) {
+          for (const part of content.parts) {
+            if (part.text) {
+              msgContent.push({ type: "text", text: part.text });
+            } else if (part.inlineData && isMultiModal) {
+              const mimeType = part.inlineData.mimeType;
+              const data = part.inlineData.data;
+              const isImage = mimeType.startsWith("image/");
+              if (isImage) {
+                msgContent.push({
+                  type: "image_url",
+                  image_url: {
+                    url: `data:${mimeType};base64,${data}`
+                  }
+                });
+              } else {
+                msgContent.push({
+                  type: "file",
+                  file: {
+                    filename: part.filename || "file",
+                    file_data: `data:${mimeType};base64,${data}`
+                  }
+                });
+              }
+            }
+          }
+        } else {
+          const text = content.text || "";
+          if (text) msgContent.push({ type: "text", text });
+        }
+        messages.push({
+          role,
+          content: msgContent.length === 1 && msgContent[0].type === "text" ? msgContent[0].text : msgContent
+        });
+      }
+      const reasoningEffortMap = {
+        "Low": "low",
+        "Medium": "medium",
+        "High": "high",
+        "xHigh": "high"
+      };
+      const requestPayload = {
+        model,
+        messages,
+        stream: true,
+        temperature: mode === "Flux" ? 1 : 1.4
+      };
+      const effort = reasoningEffortMap[thinkingLevel];
+      if (effort && thinkingLevel !== "Fast") {
+        requestPayload.reasoning_effort = effort;
+      }
+      const response = await fetchWithBackoff("https://openrouter.ai/api/v1/chat/completions", {
+        method: "POST",
+        headers: {
+          "Authorization": `Bearer ${apiKey}`,
+          "Content-Type": "application/json",
+          "X-Title": "FluxFlow CLI",
+          "X-Cache": "true"
+        },
+        body: JSON.stringify(requestPayload)
+      });
+      if (!response.ok) {
+        const errData = await response.json().catch(() => ({}));
+        throw new Error(`OpenRouter Error (${response.status}): ${errData.error?.message || response.statusText}`);
+      }
+      const reader = response.body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = "";
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) break;
+        buffer += decoder.decode(value, { stream: true });
+        const lines = buffer.split("\n");
+        buffer = lines.pop();
+        for (const line of lines) {
+          const cleanLine = line.trim();
+          if (!cleanLine || !cleanLine.startsWith("data: ")) continue;
+          if (cleanLine === "data: [DONE]") break;
+          try {
+            const json = JSON.parse(cleanLine.substring(6));
+            const delta = json.choices?.[0]?.delta;
+            const usage = json.usage;
+            let usageMetadata = null;
+            if (usage) {
+              usageMetadata = {
+                totalTokenCount: usage.total_tokens || usage.prompt_tokens + usage.completion_tokens,
+                promptTokenCount: usage.prompt_tokens || 0,
+                candidatesTokenCount: usage.completion_tokens || 0,
+                cachedContentTokenCount: usage.prompt_tokens_details?.cached_tokens || 0,
+                thoughtsTokenCount: usage.completion_tokens_details?.reasoning_tokens || 0
+              };
+            }
+            if (delta) {
+              const thought = delta.reasoning || (delta.reasoning_details ? delta.reasoning_details.map((d) => d.text).join("") : null);
+              const parts = [];
+              if (thought) parts.push({ text: thought, thought: true });
+              if (delta.content) parts.push({ text: delta.content });
+              if (parts.length > 0 || usageMetadata) {
+                yield {
+                  candidates: parts.length > 0 ? [{ content: { parts } }] : [],
+                  usageMetadata
+                };
+              }
+            } else if (usageMetadata) {
+              yield {
+                candidates: [],
+                usageMetadata
+              };
+            }
+          } catch (e) {
+          }
+        }
+      }
+    };
     signalTermination = () => {
       TERMINATION_SIGNAL = true;
     };
@@ -4974,7 +5110,7 @@ var init_ai = __esm({
       const USER_CONTEXT_LENGTH = 4 * (1024 * 2);
       const AGENT_CONTEXT_LENGTH = 4 * (1024 * 8);
       const { onStatus, onMemoryUpdated, onBackgroundIncrement } = callbacks;
-      const { profile, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats } = settings;
+      const { profile, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats, aiProvider = "Google", apiKey } = settings;
       const isMemoryEnabled = systemSettings?.memory !== false;
       const persistentStorage = readEncryptedJson(MEMORIES_FILE, []);
       const janitorUserMemories = persistentStorage.map((m) => `- [${m.id}]: ${m.memory}`).join("\n");
@@ -5031,25 +5167,41 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
               (_, reject) => setTimeout(() => reject(new Error("JANITOR_TIMEOUT")), 6e4)
             );
             const streamPromise = (async () => {
-              const stream = await client.models.generateContentStream({
-                model: janitorModel || "gemma-4-26b-a4b-it",
-                contents: janitorContents,
-                config: {
-                  systemInstruction: janitorPrompt,
-                  maxOutputTokens: 512,
-                  temperature: 0.3,
-                  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 }
-                }
-              });
-              const iterator2 = stream[Symbol.asyncIterator]();
-              const firstResult2 = await iterator2.next();
-              return { iterator: iterator2, firstResult: firstResult2 };
+              if (aiProvider === "OpenRouter") {
+                const janitorOpenRouterModel = "google/gemma-4-26b-a4b-it:free";
+                const stream = getOpenRouterStream(
+                  apiKey,
+                  janitorOpenRouterModel,
+                  janitorContents,
+                  janitorPrompt,
+                  "Fast",
+                  // Janitor always minimal
+                  mode
+                );
+                const iterator2 = stream[Symbol.asyncIterator]();
+                const firstResult2 = await iterator2.next();
+                return { iterator: iterator2, firstResult: firstResult2 };
+              } else {
+                const stream = await client.models.generateContentStream({
+                  model: janitorModel || "gemma-4-26b-a4b-it",
+                  contents: janitorContents,
+                  config: {
+                    systemInstruction: janitorPrompt,
+                    maxOutputTokens: 512,
+                    temperature: 0.3,
+                    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 }
+                  }
+                });
+                const iterator2 = stream[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;
@@ -5467,8 +5619,8 @@ ${newMemoryListStr}
       }
     };
     getAIStream = async function* (modelName, history, settings, steeringCallback, versionFluxflow2) {
-      if (!client) throw new Error("AI not initialized");
-      const { profile, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats } = settings;
+      const { profile, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats, aiProvider = "Google", isMultiModal } = settings;
+      if (!client && aiProvider === "Google") throw new Error("AI not initialized");
       const isMemoryEnabled = systemSettings?.memory !== false;
       const originalText = history[history.length - 1].text;
       const summariesFile = path16.join(SECRET_DIR, "chat-summaries.json");
@@ -5872,7 +6024,7 @@ CWD: ${process.cwd()}${cwdMismatch ? ` (WARNING: CWD Mismatch! Previous Path: ${
 ${dirStructure}
 ${summaryBlock}
 ${memoryPrompt}
-${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**\n" : ""}` : ""}[USER] ${agentText.replace(/\s*\[Prompted on:.*?\]/g, "").trim()}`.trim();
+${thinkingLevel != "Fast" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**\n" : ""}` : ""}[USER] ${agentText.replace(/\s*\[Prompted on:.*?\]/g, "").trim()}`.trim();
         modifiedHistory.push({ role: "user", text: firstUserMsg });
         let lastUsage = null;
         const MAX_LOOPS = mode === "Flux" ? 70 : 7;
@@ -5903,7 +6055,7 @@ ${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[S
 
 [STEERING HINT]: ${hint}`;
               } else {
-                modifiedHistory.push({ role: "user", text: `${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**\n" : ""}` : ""}[STEERING HINT]: ${hint}` });
+                modifiedHistory.push({ role: "user", text: `${thinkingLevel != "Fast" && aiProvider === "Google" ? `${modelName.toLowerCase().startsWith("gemma") ? "[SYSTEM] **STRICTLY FOLLOW THINKING POLICY AS CRITICAL PRIORITY. DO NOT START A RESPONSE WITHOUT <think> ... </think>**\n" : ""}` : ""}[STEERING HINT]: ${hint}` });
               }
               yield { type: "status", content: "Steering Hint Injected." };
             }
@@ -5973,12 +6125,12 @@ ${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[S
               } else if (retryCount > 0) {
                 yield { type: "model_update", content: null };
               }
-              currentSystemInstruction = getSystemInstruction(profile, !(targetModel || "gemma").toLowerCase().startsWith("gemma") ? "GEM" : thinkingLevel, mode, systemSettings, isMemoryEnabled, isFirstPrompt);
+              currentSystemInstruction = getSystemInstruction(profile, !(targetModel || "gemma").toLowerCase().startsWith("gemma") ? "GEM" : thinkingLevel, mode, systemSettings, isMemoryEnabled, isFirstPrompt, aiProvider, isMultiModal);
               const isGemma = modelName && modelName.toLowerCase().startsWith("gemma");
               const lastUserMsg = contents[contents.length - 1];
               if (isGemma) {
                 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" && aiProvider === "Google" ? `. **STRICTLY MAINTAIN THINKING POLICY. DO NOT START A RESPONSE WITHOUT <think> ... </think>}**` : ""}`;
                 if (lastUserMsg && lastUserMsg.role === "user" && lastUserMsg.parts?.[0]?.text?.startsWith("[TOOL RESULT]")) {
                   lastUserMsg.parts[0].text += jitInstruction;
                 }
@@ -5992,57 +6144,69 @@ ${thinkingLevel != "Fast" ? `${modelName.toLowerCase().startsWith("gemma") ? "[S
                 }
               }
               let activeContents = contents;
-              stream = await client.models.generateContentStream({
-                model: targetModel || "gemma-4-31b-it",
-                contents: activeContents,
-                config: {
-                  systemInstruction: currentSystemInstruction,
-                  temperature: mode === "Flux" ? 1 : 1.4,
-                  maxOutputTokens: 32768,
-                  mediaResolution: "MEDIA_RESOLUTION_MEDIUM",
-                  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: (() => {
-                    const modelLower = (targetModel || "").toLowerCase();
-                    const isGemma4 = modelLower.includes("gemma-4") || modelLower.startsWith("gemma");
-                    const isGemini3 = modelLower.includes("gemini-3");
-                    if (isGemma4 || isGemini3) {
-                      if (isGemma4) {
-                        return { includeThoughts: false, thinkingLevel: ThinkingLevel.MINIMAL };
-                      }
-                      return {
-                        includeThoughts: true,
-                        thinkingLevel: {
-                          "Fast": modelLower.includes("pro") ? ThinkingLevel.LOW : ThinkingLevel.MINIMAL,
-                          "Low": ThinkingLevel.LOW,
-                          "Medium": ThinkingLevel.MEDIUM,
-                          "High": ThinkingLevel.HIGH,
-                          "xHigh": ThinkingLevel.HIGH
-                        }[thinkingLevel] || ThinkingLevel.MEDIUM
-                      };
-                    } else {
-                      const budget = {
-                        "Fast": -1,
-                        "Low": 512,
-                        "Medium": 2048,
-                        "High": 16384,
-                        "xHigh": 24576
-                      }[thinkingLevel] || 2048;
-                      if (budget === -1) {
-                        return { includeThoughts: false };
+              if (aiProvider === "OpenRouter") {
+                stream = getOpenRouterStream(
+                  settings.apiKey,
+                  targetModel,
+                  activeContents,
+                  currentSystemInstruction,
+                  thinkingLevel,
+                  mode,
+                  isMultiModal
+                );
+              } else {
+                stream = await client.models.generateContentStream({
+                  model: targetModel || "gemma-4-31b-it",
+                  contents: activeContents,
+                  config: {
+                    systemInstruction: currentSystemInstruction,
+                    temperature: mode === "Flux" ? 1 : 1.4,
+                    maxOutputTokens: 32768,
+                    mediaResolution: "MEDIA_RESOLUTION_MEDIUM",
+                    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: (() => {
+                      const modelLower = (targetModel || "").toLowerCase();
+                      const isGemma4 = modelLower.includes("gemma-4") || modelLower.startsWith("gemma");
+                      const isGemini3 = modelLower.includes("gemini-3");
+                      if (isGemma4 || isGemini3) {
+                        if (isGemma4) {
+                          return { includeThoughts: false, thinkingLevel: ThinkingLevel.MINIMAL };
+                        }
+                        return {
+                          includeThoughts: true,
+                          thinkingLevel: {
+                            "Fast": modelLower.includes("pro") ? ThinkingLevel.LOW : ThinkingLevel.MINIMAL,
+                            "Low": ThinkingLevel.LOW,
+                            "Medium": ThinkingLevel.MEDIUM,
+                            "High": ThinkingLevel.HIGH,
+                            "xHigh": ThinkingLevel.HIGH
+                          }[thinkingLevel] || ThinkingLevel.MEDIUM
+                        };
+                      } else {
+                        const budget = {
+                          "Fast": 0,
+                          "Low": 512,
+                          "Medium": 2048,
+                          "High": 16384,
+                          "xHigh": 24576
+                        }[thinkingLevel] || 2048;
+                        if (budget === 0) {
+                          return { includeThoughts: false };
+                        }
+                        return {
+                          includeThoughts: true,
+                          thinkingBudget: budget
+                        };
                       }
-                      return {
-                        includeThoughts: true,
-                        thinkingBudget: budget
-                      };
-                    }
-                  })()
-                }
-              });
+                    })()
+                  }
+                });
+              }
               turnText = "";
               lastToolSniffed = null;
               lastToolEventTime = null;
@@ -6595,7 +6759,9 @@ ${boxBottom}` };
                     toolCallPointer++;
                   }
                 }
-                lastUsage = chunk.usageMetadata;
+                if (chunk.usageMetadata) {
+                  lastUsage = chunk.usageMetadata;
+                }
                 if (lastUsage) {
                   yield { type: "liveTokens", content: lastUsage.totalTokenCount };
                 }
@@ -7460,6 +7626,8 @@ function App({ args = [] }) {
     };
   }, [stdout]);
   const [thinkingLevel, setThinkingLevel] = useState10("Medium");
+  const [aiProvider, setAiProvider] = useState10("Google");
+  const [setupStep, setSetupStep] = useState10(0);
   const [latestVer, setLatestVer] = useState10(null);
   const [showFullThinking, setShowFullThinking] = useState10(false);
   const [activeModel, setActiveModel] = useState10("gemma-4-31b-it");
@@ -7717,6 +7885,11 @@ function App({ args = [] }) {
         } else if (activeView !== "chat" && activeView !== "settings") {
           setActiveView("chat");
         } else {
+          if (!apiKey && setupStep === 1) {
+            setSetupStep(0);
+            setTempKey("");
+            return;
+          }
           setEscPressCount((prev) => {
             const nextCount = prev + 1;
             if (nextCount === 1) {
@@ -7809,6 +7982,7 @@ function App({ args = [] }) {
       } else {
         setThinkingLevel(saved.thinkingLevel);
       }
+      setAiProvider(saved.aiProvider || "Google");
       persistedModelRef.current = saved.activeModel;
       if (parsedArgs.model) {
         setActiveModel(parsedArgs.model);
@@ -7919,6 +8093,7 @@ function App({ args = [] }) {
       saveSettings({
         mode,
         thinkingLevel,
+        aiProvider,
         activeModel: modelToSave || activeModel,
         showFullThinking,
         systemSettings,
@@ -7927,16 +8102,17 @@ function App({ args = [] }) {
         apiTier
       });
     }
-  }, [mode, thinkingLevel, activeModel, showFullThinking, systemSettings, profileData, imageSettings, isInitializing, parsedArgs, apiTier]);
+  }, [mode, thinkingLevel, aiProvider, activeModel, showFullThinking, systemSettings, profileData, imageSettings, isInitializing, parsedArgs, apiTier]);
   const handleSetup = async (val) => {
     const key = val.trim();
-    if (key.length >= 30) {
+    const minLength = aiProvider === "OpenRouter" ? 10 : 30;
+    if (key.length >= minLength) {
       await saveAPIKey(key);
       setApiKey(key);
       initAI(key);
-      setMessages((prev) => [...prev, { role: "system", text: "\u2705 API Key saved successfully! Initialization complete.", isMeta: true }]);
+      setMessages((prev) => [...prev, { role: "system", text: `\u2705 ${aiProvider} API Key saved successfully! Initialization complete.`, isMeta: true }]);
     } else {
-      setMessages((prev) => [...prev, { role: "system", text: `\u274C INVALID KEY: Gemini API keys must be at least 30 characters.`, isMeta: true }]);
+      setMessages((prev) => [...prev, { role: "system", text: `\u274C INVALID KEY: ${aiProvider} API keys must be at least ${minLength} characters.`, isMeta: true }]);
       setTempKey("");
     }
   };
@@ -8037,7 +8213,81 @@ function App({ args = [] }) {
     {
       cmd: "/model",
       desc: "Switch Model for Agent",
-      subs: apiTier === "Free" ? [
+      subs: aiProvider === "OpenRouter" ? apiTier === "Free" ? [
+        {
+          cmd: "google/gemma-4-31b-it:free",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "moonshotai/kimi-k2.6:free",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "qwen/qwen3-coder:free",
+          desc: ""
+        },
+        {
+          cmd: "z-ai/glm-4.5-air:free",
+          desc: ""
+        }
+      ] : [
+        {
+          cmd: "google/gemini-3.5-flash",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "qwen/qwen3.7-plus",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "minimax/minimax-m3",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "anthropic/claude-sonnet-4.5",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "anthropic/claude-opus-4.6",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "anthropic/claude-opus-4.8",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "deepseek/deepseek-v4-pro",
+          desc: ""
+        },
+        {
+          cmd: "deepseek/deepseek-v4-flash",
+          desc: ""
+        },
+        {
+          cmd: "xiaomi/mimo-v2.5-pro",
+          desc: ""
+        },
+        {
+          cmd: "z-ai/glm-5",
+          desc: ""
+        },
+        {
+          cmd: "openai/gpt-5.2-codex",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "openai/gpt-5.2-pro",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "openai/gpt-5.5-pro",
+          desc: "Multimodal"
+        },
+        {
+          cmd: "moonshotai/kimi-k2.6",
+          desc: "Multimodal"
+        }
+      ] : apiTier === "Free" ? [
         {
           cmd: "gemma-4-31b-it",
           desc: "Standard Default"
@@ -8388,7 +8638,7 @@ ${hintText}`, color: "magenta" }];
         case "/model": {
           if (parts[1]) {
             const mod = parts.slice(1).join(" ");
-            if (mod === "gemma-4-31b-it" && apiTier !== "Free") {
+            if (mod === "gemma-4-31b-it" && apiTier !== "Free" && aiProvider === "Google") {
               setMessages((prev) => {
                 setCompletedIndex(prev.length + 1);
                 return [...prev, {
@@ -8697,6 +8947,9 @@ ${timestamp}` };
               text
             });
           });
+          const modelCmd = COMMANDS.find((c) => c.cmd === "/model");
+          const currentModelObj = modelCmd?.subs?.find((s) => s.cmd === activeModel);
+          const isMultiModal = currentModelObj?.desc?.toLowerCase().includes("multimodal");
           const stream = getAIStream(
             activeModel,
             cleanHistoryForAI,
@@ -8708,6 +8961,9 @@ ${timestamp}` };
               janitorModel,
               sessionStats,
               chatId,
+              isMultiModal,
+              aiProvider,
+              apiKey,
               cols: terminalSize.columns - 6,
               rows: 30,
               onExecStart: (cmd) => {
@@ -8877,7 +9133,7 @@ Selection: ${val}`,
               setIsProcessing(false);
               hasFiredJanitor = true;
               runJanitorTask(
-                { profile: profileData, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats },
+                { profile: profileData, thinkingLevel, mode, janitorModel, chatId, systemSettings, sessionStats, aiProvider, apiKey },
                 packet.data.agentText,
                 packet.data.fullAgentTextRaw,
                 packet.data.history,
@@ -9677,7 +9933,19 @@ 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, 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 (If billing is enabled set Tier to paid in /settings \u2192 other \u2192 API Tier)."), /* @__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" }, setupStep === 0 ? /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(Text13, null, "Select your Preferred Provider:"), /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(
+    CommandMenu,
+    {
+      items: [
+        { label: "Google (Daily Free Quota)", value: "Google" },
+        { label: "OpenRouter (Daily Free Quota) [EXPERIMENTAL & UNSTABLE]", value: "OpenRouter" }
+      ],
+      onSelect: (item) => {
+        setAiProvider(item.value);
+        setSetupStep(1);
+      }
+    }
+  ))) : /* @__PURE__ */ React13.createElement(React13.Fragment, null, /* @__PURE__ */ React13.createElement(Text13, null, "Please enter your ", aiProvider, " API Key to initialize the agent (If billing is enabled set Tier to paid in /settings \u2192 other \u2192 API Tier)."), /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "\u{1F4A0} "), /* @__PURE__ */ React13.createElement(
     TextInput4,
     {
       value: tempKey,
@@ -9685,7 +9953,7 @@ Selection: ${val}`,
       onSubmit: handleSetup,
       mask: "*"
     }
-  ))), /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "gray", dimColor: true, italic: true }, "(Press Enter to confirm and initialize)"))) : renderActiveView(), confirmExit && /* @__PURE__ */ React13.createElement(Box13, { borderStyle: "round", borderColor: "red", paddingX: 2, marginY: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(Text13, { color: "red", bold: true }, "\u{1F534} EXIT CONFIRMATION: "), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, "Press "), /* @__PURE__ */ React13.createElement(Text13, { color: "red", bold: true }, "CTRL + C"), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, " again to exit (", exitCountdown, "s). Press "), /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "ESC"), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, " to cancel.")), /* @__PURE__ */ React13.createElement(Box13, { flexShrink: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(
+  )), /* @__PURE__ */ React13.createElement(Box13, { marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "gray", italic: true }, "(Press ESC to go back to provider selection)")))), /* @__PURE__ */ React13.createElement(Box13, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React13.createElement(Text13, { color: "gray", dimColor: true, italic: true }, setupStep === 0 ? "(Use arrows to select and Enter to confirm)" : "(Press Enter to confirm and initialize)"))) : renderActiveView(), confirmExit && /* @__PURE__ */ React13.createElement(Box13, { borderStyle: "round", borderColor: "red", paddingX: 2, marginY: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(Text13, { color: "red", bold: true }, "\u{1F534} EXIT CONFIRMATION: "), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, "Press "), /* @__PURE__ */ React13.createElement(Text13, { color: "red", bold: true }, "CTRL + C"), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, " again to exit (", exitCountdown, "s). Press "), /* @__PURE__ */ React13.createElement(Text13, { color: "cyan", bold: true }, "ESC"), /* @__PURE__ */ React13.createElement(Text13, { color: "white" }, " to cancel.")), /* @__PURE__ */ React13.createElement(Box13, { flexShrink: 0, width: "100%" }, /* @__PURE__ */ React13.createElement(
     StatusBar_default,
     {
       mode,
@@ -9733,7 +10001,7 @@ Selection: ${val}`,
             paddingX: 1
           },
           /* @__PURE__ */ React13.createElement(Box13, { width: 3 }, /* @__PURE__ */ React13.createElement(Text13, { color: isActive ? "cyan" : "gray", bold: isActive }, isActive ? " \u276F" : "  ")),
-          /* @__PURE__ */ React13.createElement(Box13, { width: 32 }, /* @__PURE__ */ React13.createElement(
+          /* @__PURE__ */ React13.createElement(Box13, { width: 55 }, /* @__PURE__ */ React13.createElement(
             Text13,
             {
               color: isGemmaDisabled ? "gray" : isActive ? "yellow" : "white",

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "fluxflow-cli",
-	"version": "1.19.5",
-	"date": "2026-06-04",
+	"version": "1.20.0",
+	"date": "2026-06-05",
 	"description": "A high-fidelity agentic terminal assistant for the Flux Era.",
 	"keywords": [
 		"ai",