fluxflow-cli 1.20.0 → 1.21.1

package/README.md

@@ -27,7 +27,10 @@ npm install -g fluxflow-cli
 fluxflow-cli
 ```
 
-*The agent will prompt you for your Gemini API Key on the first run and store it securely in an XOR-encrypted vault.* Free API Key recomemded to use Gemma 4 (Default Model).
+*The agent will prompt you for your API Key on the first run and store it securely in an encrypted vault.* Choose from multiple supported AI providers:
+- **Google GenAI** (Gemini & Gemma models)
+- **DeepSeek** (Native DeepSeek API)
+- **OpenRouter** (Access to hundreds of models; *Experimental*)
 
 ---
 

package/dist/fluxflow.js

@@ -1176,7 +1176,7 @@ var init_main_tools = __esm({
 Access to internal tools. MUST use the exact syntax on a new line: [tool:functions.ToolName(args)]
 MANDATORY TOOL POLICY:
 - **MAX 3 TOOL CALLS PER TURN. Next Turn, verify results, plan next**
-${mode === "Flux" ? "- USE multiple search & replace on patch tool if editing same file/path with many edits\n" : ""}- Use contextually BEST tool, no brute force, no spamming
+${mode === "Flux" ? "- USE multiple search & replace on patch tool if editing same file/path with many edits \u2190 **MANDATORY where possible**\n" : ""}- Use contextually BEST tool, no brute force, no spamming
 ${mode === "Flux" ? "- **File Tools >> Code in chat**\n" : ""}
 - COMMUNICATION TOOLS -
 1. [tool:functions.Ask(question="...", optionA="option::description", ...MAX 4)]. Ambiguity Resolution. Mandatory Triggers: Path Divergence, Security, Risk Mitigation. ask >> finish. Suggest best options; don't ask for preferences
@@ -1706,7 +1706,8 @@ function SettingsMenu({
   setInputConfig,
   saveSettings: saveSettings2,
   quotas,
-  setMessages
+  setMessages,
+  aiProvider
 }) {
   const [activeColumn, setActiveColumn] = useState3("categories");
   const [selectedCategoryIndex, setSelectedCategoryIndex] = useState3(0);
@@ -1740,6 +1741,7 @@ function SettingsMenu({
         ];
       case "other":
         return [
+          { label: "Current Provider", value: "aiProvider", status: aiProvider },
           { label: "API Tier", value: "apiTier", status: apiTier }
         ];
       default:
@@ -1857,6 +1859,8 @@ function SettingsMenu({
       setEditValue(systemSettings.autoDisallowCommands || "");
     } else if (item.value === "apiTier") {
       setActiveView("apiTier");
+    } else if (item.value === "aiProvider") {
+      setActiveView("selectProvider");
     } else if (item.value === "autoDelete") {
       const options = ["1d", "7d", "30d"];
       const currentIndex = options.indexOf(systemSettings.autoDeleteHistory || "30d");
@@ -1948,7 +1952,7 @@ function SettingsMenu({
           },
           isSelected ? "\u276F " : "  ",
           item.label
-        ), !isCommandListItem && /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "gray", dimColor: true }, dots), /* @__PURE__ */ React6.createElement(Text6, { color: getStatusColor(item), bold: true }, "[ ", item.status, " ]"))), isCommandListItem && !isEditingThis && item.status !== "None" && /* @__PURE__ */ React6.createElement(Box6, { paddingX: 4, marginBottom: 1 }, /* @__PURE__ */ React6.createElement(Text6, { color: "gray", dimColor: true }, "\u21B3 ", item.status)), isEditingThis && /* @__PURE__ */ React6.createElement(Box6, { flexDirection: "column", marginLeft: 4, marginBottom: 1 }, /* @__PURE__ */ React6.createElement(Box6, { paddingX: 1, borderStyle: "single", borderColor: "cyan", flexDirection: "row" }, /* @__PURE__ */ React6.createElement(Text6, { color: "cyan", bold: true }, "> ", " "), /* @__PURE__ */ React6.createElement(
+        ), !isCommandListItem && /* @__PURE__ */ React6.createElement(React6.Fragment, null, /* @__PURE__ */ React6.createElement(Text6, { color: "gray", dimColor: true }, dots), /* @__PURE__ */ React6.createElement(Text6, { color: getStatusColor(item), bold: true }, item.value === "aiProvider" ? item.status : `[ ${item.status} ]`))), isCommandListItem && !isEditingThis && item.status !== "None" && /* @__PURE__ */ React6.createElement(Box6, { paddingX: 4, marginBottom: 1 }, /* @__PURE__ */ React6.createElement(Text6, { color: "gray", dimColor: true }, "\u21B3 ", item.status)), isEditingThis && /* @__PURE__ */ React6.createElement(Box6, { flexDirection: "column", marginLeft: 4, marginBottom: 1 }, /* @__PURE__ */ React6.createElement(Box6, { paddingX: 1, borderStyle: "single", borderColor: "cyan", flexDirection: "row" }, /* @__PURE__ */ React6.createElement(Text6, { color: "cyan", bold: true }, "> ", " "), /* @__PURE__ */ React6.createElement(
           TextInput,
           {
             value: editValue,
@@ -2281,18 +2285,20 @@ var init_paths = __esm({
 var secrets_exports = {};
 __export(secrets_exports, {
   getAPIKey: () => getAPIKey,
+  getProviderAPIKey: () => getProviderAPIKey,
   getSearchSecrets: () => getSearchSecrets,
   getSecret: () => getSecret,
   removeAPIKey: () => removeAPIKey,
   removeSecret: () => removeSecret,
   saveAPIKey: () => saveAPIKey,
+  saveProviderAPIKey: () => saveProviderAPIKey,
   saveSearchId: () => saveSearchId,
   saveSearchKey: () => saveSearchKey,
   saveSecret: () => saveSecret
 });
 import fs3 from "fs-extra";
 import path3 from "path";
-var SECRET_FILE, getAPIKey, getSecret, saveSecret, getSearchSecrets, saveAPIKey, saveSearchKey, saveSearchId, removeSecret, removeAPIKey;
+var SECRET_FILE, getAPIKey, getProviderAPIKey, saveProviderAPIKey, getSecret, saveSecret, getSearchSecrets, saveAPIKey, saveSearchKey, saveSearchId, removeSecret, removeAPIKey;
 var init_secrets = __esm({
   "src/utils/secrets.js"() {
     init_crypto();
@@ -2306,6 +2312,26 @@ var init_secrets = __esm({
       }
       return null;
     };
+    getProviderAPIKey = async (provider) => {
+      try {
+        const secrets = readEncryptedJson(SECRET_FILE, {});
+        if (provider === "Google") return secrets.GOOGLE_API_KEY || secrets.API_KEY || null;
+        if (provider === "DeepSeek") return secrets.DEEPSEEK_API_KEY || null;
+        if (provider === "OpenRouter") return secrets.OPENROUTER_API_KEY || null;
+      } catch (e) {
+      }
+      return null;
+    };
+    saveProviderAPIKey = async (provider, key) => {
+      if (provider === "Google") {
+        await saveSecret("GOOGLE_API_KEY", key);
+        await saveSecret("API_KEY", key);
+      } else if (provider === "DeepSeek") {
+        await saveSecret("DEEPSEEK_API_KEY", key);
+      } else if (provider === "OpenRouter") {
+        await saveSecret("OPENROUTER_API_KEY", key);
+      }
+    };
     getSecret = async (key) => {
       try {
         const secrets = readEncryptedJson(SECRET_FILE, {});
@@ -2465,7 +2491,7 @@ Identity: Flux Flow (by Kushal Roy Chowdhury). Conversational, Sassy${mode === "
 Mode: ${mode}${thinkingLevel !== "Fast" ? " (Thinking Mode)" : ""}. ${mode === "Flux" ? "Logical, Highly Detailed, Task-Driven. Prioritizes scalable file/folder structures, modular architecture, clean code abstractions, step-by-step execution. Industry standard latest coding practices/libraries, clean code, Double Check Imports, Client-Server Sync" : "Concise"}
 
 -- AGENT LOOP RULES (PRIORITY: HIGH) --
-- **MANDATORY: MUST END WITH [turn: continue] to CONTINUE loop OR [turn: finish] to END loop**
+- **MANDATORY: MUST END WITH [turn: continue] to CONTINUE loop OR [turn: finish] to END loop** \u2190 IMPORTANT EVERY RESPONSE
 - Tool Called? No post tool chat until [turn: continue]
 - NEVER USE [turn: continue] [turn:finish] together
 
@@ -2480,7 +2506,7 @@ 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, isMultiModal, aiProvider)}
+${TOOL_PROTOCOL(mode, osDetected, aiProvider.toLowerCase() === "deepseek" ? false : isMultiModal, aiProvider)}
 ${projectContextBlock}
 -- MEMORY RULES --
 - Memory: ${isMemoryEnabled ? "Subtly Personalize. Auto Saves" : "OFF. Decline Remembering Memories"}
@@ -4923,7 +4949,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, fetchWithBackoff, getOpenRouterStream, signalTermination, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, consolidatePastMemories, getAIStream;
+var client, TERMINATION_SIGNAL, stripAnsi2, fetchWithBackoff, getDeepSeekStream, getOpenRouterStream, signalTermination, TOOL_LABELS2, getToolDetail, runJanitorTask, getActiveToolContext, getContextSafeText, contextSafeReplace, getSanitizedText, detectToolCalls, initAI, generateSimpleContent, consolidatePastMemories, getAIStream;
 var init_ai = __esm({
   async "src/utils/ai.js"() {
     await init_prompts();
@@ -4954,6 +4980,136 @@ var init_ai = __esm({
       }
       return fetch(url, options);
     };
+    getDeepSeekStream = 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 {
+          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 requestPayload = {
+        model,
+        messages,
+        stream: true,
+        stream_options: { include_usage: true },
+        temperature: mode === "Flux" ? 1 : 1.4
+      };
+      if (thinkingLevel !== "Fast") {
+        const reasoningEffortMap = {
+          "Low": "high",
+          "Medium": "high",
+          "High": "high",
+          "xHigh": "max"
+        };
+        requestPayload.reasoning_effort = reasoningEffortMap[thinkingLevel] || "high";
+        requestPayload.extra_body = { thinking: { type: "enabled" } };
+      } else {
+        requestPayload.extra_body = { thinking: { type: "disabled" } };
+      }
+      const response = await fetchWithBackoff("https://api.deepseek.com/chat/completions", {
+        method: "POST",
+        headers: {
+          "Authorization": `Bearer ${apiKey}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify(requestPayload)
+      });
+      if (!response.ok) {
+        const errData = await response.json().catch(() => ({}));
+        throw new Error(`DeepSeek Error (${response.status}): ${errData.error?.message || response.statusText}`);
+      }
+      const reader = response.body.getReader();
+      const decoder = new TextDecoder();
+      let buffer = "";
+      let pendingParts = [];
+      let latestUsageMetadata = null;
+      let lastFlushTime = Date.now();
+      let hasNewData = false;
+      while (true) {
+        const { done, value } = await reader.read();
+        if (done) {
+          if (hasNewData && (pendingParts.length > 0 || latestUsageMetadata)) {
+            yield {
+              candidates: pendingParts.length > 0 ? [{ content: { parts: pendingParts } }] : [],
+              usageMetadata: latestUsageMetadata
+            };
+          }
+          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;
+            if (usage) {
+              latestUsageMetadata = {
+                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
+              };
+              hasNewData = true;
+            }
+            if (delta) {
+              const thought = delta.reasoning_content || null;
+              if (thought) {
+                pendingParts.push({ text: thought, thought: true });
+                hasNewData = true;
+              }
+              if (delta.content) {
+                pendingParts.push({ text: delta.content });
+                hasNewData = true;
+              }
+            }
+          } catch (e) {
+          }
+        }
+        if (Date.now() - lastFlushTime >= 100 && hasNewData) {
+          yield {
+            candidates: pendingParts.length > 0 ? [{ content: { parts: [...pendingParts] } }] : [],
+            usageMetadata: latestUsageMetadata
+          };
+          pendingParts = [];
+          lastFlushTime = Date.now();
+          hasNewData = false;
+        }
+      }
+    };
     getOpenRouterStream = async function* (apiKey, model, contents, systemInstruction, thinkingLevel, mode, isMultiModal) {
       const messages = [];
       if (systemInstruction) {
@@ -5030,9 +5186,21 @@ var init_ai = __esm({
       const reader = response.body.getReader();
       const decoder = new TextDecoder();
       let buffer = "";
+      let pendingParts = [];
+      let latestUsageMetadata = null;
+      let lastFlushTime = Date.now();
+      let hasNewData = false;
       while (true) {
         const { done, value } = await reader.read();
-        if (done) break;
+        if (done) {
+          if (hasNewData && (pendingParts.length > 0 || latestUsageMetadata)) {
+            yield {
+              candidates: pendingParts.length > 0 ? [{ content: { parts: pendingParts } }] : [],
+              usageMetadata: latestUsageMetadata
+            };
+          }
+          break;
+        }
         buffer += decoder.decode(value, { stream: true });
         const lines = buffer.split("\n");
         buffer = lines.pop();
@@ -5044,36 +5212,39 @@ var init_ai = __esm({
             const json = JSON.parse(cleanLine.substring(6));
             const delta = json.choices?.[0]?.delta;
             const usage = json.usage;
-            let usageMetadata = null;
             if (usage) {
-              usageMetadata = {
+              latestUsageMetadata = {
                 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
               };
+              hasNewData = true;
             }
             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
-                };
+              if (thought) {
+                pendingParts.push({ text: thought, thought: true });
+                hasNewData = true;
+              }
+              if (delta.content) {
+                pendingParts.push({ text: delta.content });
+                hasNewData = true;
               }
-            } else if (usageMetadata) {
-              yield {
-                candidates: [],
-                usageMetadata
-              };
             }
           } catch (e) {
           }
         }
+        if (Date.now() - lastFlushTime >= 100 && hasNewData) {
+          yield {
+            candidates: pendingParts.length > 0 ? [{ content: { parts: [...pendingParts] } }] : [],
+            usageMetadata: latestUsageMetadata
+          };
+          pendingParts = [];
+          lastFlushTime = Date.now();
+          hasNewData = false;
+        }
       }
     };
     signalTermination = () => {
@@ -5181,6 +5352,20 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
                 const iterator2 = stream[Symbol.asyncIterator]();
                 const firstResult2 = await iterator2.next();
                 return { iterator: iterator2, firstResult: firstResult2 };
+              } else if (aiProvider === "DeepSeek") {
+                const stream = getDeepSeekStream(
+                  apiKey,
+                  "deepseek-chat",
+                  janitorContents,
+                  janitorPrompt,
+                  "Fast",
+                  // Janitor always minimal
+                  mode,
+                  false
+                );
+                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",
@@ -5524,8 +5709,41 @@ ${originalTextProcessed.length > USER_CONTEXT_LENGTH ? "... (truncated) ...\n\n"
       client = new GoogleGenAI({ apiKey });
       return client;
     };
+    generateSimpleContent = async (settings, model, contents, systemInstruction, thinkingLevel = "Fast") => {
+      const { aiProvider = "Google", apiKey, mode } = settings;
+      let fullText = "";
+      let usageMetadata = null;
+      let stream;
+      if (aiProvider === "OpenRouter") {
+        stream = getOpenRouterStream(apiKey, model, contents, systemInstruction, thinkingLevel, mode, false);
+      } else if (aiProvider === "DeepSeek") {
+        stream = getDeepSeekStream(apiKey, model, contents, systemInstruction, thinkingLevel, mode, false);
+      } else {
+        const genStream = await client.models.generateContentStream({
+          model,
+          contents,
+          config: {
+            systemInstruction,
+            maxOutputTokens: 2048,
+            temperature: 0.3,
+            thinkingConfig: { includeThoughts: false, thinkingLevel: ThinkingLevel.MINIMAL }
+          }
+        });
+        stream = genStream;
+      }
+      for await (const chunk of stream) {
+        if (chunk.candidates?.[0]?.content?.parts) {
+          for (const part of chunk.candidates[0].content.parts) {
+            if (part.text && !part.thought) fullText += part.text;
+          }
+        }
+        if (chunk.usageMetadata) usageMetadata = chunk.usageMetadata;
+      }
+      return { text: fullText, usageMetadata };
+    };
     consolidatePastMemories = async (currentChatId, settings) => {
       try {
+        const { aiProvider = "Google" } = settings;
         const tempStorage = readEncryptedJson(TEMP_MEM_FILE, {});
         const totalMemoriesCount = Object.values(tempStorage).flat().length;
         if (totalMemoriesCount <= 2) return;
@@ -5573,23 +5791,13 @@ ${newMemoryListStr}
         let attempts = 0;
         const maxAttempts = 3;
         let success = false;
+        let targetModel = "gemini-3.1-flash-lite";
+        if (aiProvider === "OpenRouter") targetModel = "google/gemma-4-26b-a4b-it:free";
+        if (aiProvider === "DeepSeek") targetModel = "deepseek-v4-flash";
         while (attempts < maxAttempts && !success) {
           attempts++;
           try {
-            const response = await client.models.generateContent({
-              model: "gemini-3.1-flash-lite",
-              contents: prompt,
-              config: {
-                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.LOW }
-              }
-            });
+            const response = await generateSimpleContent(settings, targetModel, prompt, null, "Fast");
             const responseText = response.text || "";
             const janitorToolCalls = detectToolCalls(responseText);
             if (janitorToolCalls.length === 0) {
@@ -5601,6 +5809,9 @@ ${newMemoryListStr}
                 await dispatchTool(toolName, janitorToolCall.args, { chatId: currentChatId });
               }
             }
+            if (response.usageMetadata) {
+              await addToUsage("tokens", response.usageMetadata.totalTokenCount || 0);
+            }
             success = true;
           } catch (err) {
             if (attempts >= maxAttempts) {
@@ -5653,66 +5864,22 @@ Provide a new consolidated summary of the entire session.` : `Here is the conver
 ${flattenedText2}
 
 Provide a consolidated summary of the entire session.`;
+            let targetModel = "gemini-3.1-flash-lite";
+            if (aiProvider === "OpenRouter") targetModel = "google/gemma-4-26b-a4b-it:free";
+            if (aiProvider === "DeepSeek") targetModel = "deepseek-v4-flash";
             try {
-              const response = await client.models.generateContent({
-                model: "gemini-3.1-flash-lite",
-                contents: prompt,
-                config: {
-                  systemInstruction,
-                  maxOutputTokens: 4096,
-                  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.MEDIUM }
-                }
-              });
+              const response = await generateSimpleContent(settings, targetModel, prompt, systemInstruction, "Fast");
               return response.text || "";
             } catch (err) {
-              try {
-                const response = await client.models.generateContent({
-                  model: "gemini-2.5-flash",
-                  contents: prompt,
-                  config: {
-                    systemInstruction,
-                    maxOutputTokens: 4096,
-                    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, thinkingBudget: 8192 }
-                  }
-                });
-                return response.text || "";
-              } catch (e) {
+              if (aiProvider === "Google") {
                 try {
-                  const response = await client.models.generateContent({
-                    model: "gemini-2.5-flash-lite",
-                    contents: prompt,
-                    config: {
-                      systemInstruction,
-                      maxOutputTokens: 4096,
-                      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, thinkingBudget: 8192 }
-                    }
-                  });
-                  return response.text || "";
-                } catch (e2) {
+                  const fallback = await generateSimpleContent(settings, "gemini-2.5-flash", prompt, systemInstruction, "Fast");
+                  return fallback.text || "";
+                } catch (e) {
                   return "";
                 }
               }
+              return "";
             }
           };
           const flattenedText = flattenContext(modifiedHistory);
@@ -6113,11 +6280,14 @@ ${thinkingLevel != "Fast" && aiProvider === "Google" ? `${modelName.toLowerCase(
                 throw new Error("Error: Quota Exausted for Agent");
               }
               targetModel = modelName;
+              if (aiProvider === "DeepSeek" && thinkingLevel === "Fast") {
+                targetModel = "deepseek-chat";
+              }
               if (retryCount === MAX_RETRIES - 1) {
-                targetModel = "gemini-3-flash-preview";
+                targetModel = aiProvider === "DeepSeek" ? "deepseek-v4-flash" : "gemini-3-flash-preview";
                 yield { type: "model_update", content: "Trying with fallback model" };
               } else if (retryCount === MAX_RETRIES) {
-                targetModel = "gemini-3.5-flash";
+                targetModel = aiProvider === "DeepSeek" ? "deepseek-v4-pro" : "gemini-3.5-flash";
                 yield { type: "model_update", content: "Trying with fallback model" };
               } else if (retryCount > 12 && retryCount < MAX_RETRIES - 2 && settings.apiKey !== "custom") {
                 targetModel = "gemma-4-31b-it";
@@ -6154,6 +6324,16 @@ ${thinkingLevel != "Fast" && aiProvider === "Google" ? `${modelName.toLowerCase(
                   mode,
                   isMultiModal
                 );
+              } else if (aiProvider === "DeepSeek") {
+                stream = getDeepSeekStream(
+                  settings.apiKey,
+                  targetModel,
+                  activeContents,
+                  currentSystemInstruction,
+                  thinkingLevel,
+                  mode,
+                  isMultiModal
+                );
               } else {
                 stream = await client.models.generateContentStream({
                   model: targetModel || "gemma-4-31b-it",
@@ -6216,6 +6396,8 @@ ${thinkingLevel != "Fast" && aiProvider === "Google" ? `${modelName.toLowerCase(
               yield { type: "status", content: "Working..." };
               dedupeBuffer = "";
               isDedupeActive = accumulatedContext.length > 0;
+              let pendingGoogleText = "";
+              let lastGoogleFlushTime = Date.now();
               for await (const chunk of stream) {
                 if (TERMINATION_SIGNAL) {
                   yield { type: "status", content: "Termination Signal Received." };
@@ -6268,7 +6450,11 @@ ${thinkingLevel != "Fast" && aiProvider === "Google" ? `${modelName.toLowerCase(
                         const dedupeClean = hasOpenThink ? cleanText.replace(/^\s*(?:<(think|thought)>|\[(think|thought)\])\s*/gi, "") : cleanText.replace(/^\s*(?:<(think|thought)>|\[(think|thought)\])[\s\S]*?(?:<\/(think|thought)>|\[\/(think|thought)\])\s*/gi, "").replace(/^\s*(?:<(think|thought)>|\[(think|thought)\])\s*/gi, "");
                         if (dedupeClean) {
                           turnText += dedupeClean;
-                          yield { type: "text", content: dedupeClean };
+                          if (aiProvider === "Google") {
+                            pendingGoogleText += dedupeClean;
+                          } else {
+                            yield { type: "text", content: dedupeClean };
+                          }
                         }
                       }
                       isDedupeActive = false;
@@ -6277,7 +6463,11 @@ ${thinkingLevel != "Fast" && aiProvider === "Google" ? `${modelName.toLowerCase(
                     continue;
                   } else {
                     turnText += chunkText;
-                    yield { type: "text", content: chunkText };
+                    if (aiProvider === "Google") {
+                      pendingGoogleText += chunkText;
+                    } else {
+                      yield { type: "text", content: chunkText };
+                    }
                   }
                   const signalSafeText3 = getSanitizedText(turnText);
                   const toolContext = getActiveToolContext(turnText);
@@ -6758,6 +6948,11 @@ ${boxBottom}` };
                     if (normToolName === "memory" && result.includes("SUCCESS")) yield { type: "memory_updated" };
                     toolCallPointer++;
                   }
+                  if (aiProvider === "Google" && pendingGoogleText && Date.now() - lastGoogleFlushTime >= 100) {
+                    yield { type: "text", content: pendingGoogleText };
+                    pendingGoogleText = "";
+                    lastGoogleFlushTime = Date.now();
+                  }
                 }
                 if (chunk.usageMetadata) {
                   lastUsage = chunk.usageMetadata;
@@ -6772,7 +6967,11 @@ ${boxBottom}` };
                   dedupeBuffer += "</think>";
                 } else {
                   turnText += "</think>";
-                  yield { type: "text", content: "</think>" };
+                  if (aiProvider === "Google") {
+                    pendingGoogleText += "</think>";
+                  } else {
+                    yield { type: "text", content: "</think>" };
+                  }
                 }
               }
               if (isDedupeActive && dedupeBuffer.length > 0) {
@@ -6790,12 +6989,20 @@ ${boxBottom}` };
                   const dedupeClean = hasOpenThink ? cleanText.replace(/^\s*(?:<(think|thought)>|\[(think|thought)\])\s*/gi, "") : cleanText.replace(/^\s*(?:<(think|thought)>|\[(think|thought)\])[\s\S]*?(?:<\/(think|thought)>|\[\/(think|thought)\])\s*/gi, "").replace(/^\s*(?:<(think|thought)>|\[(think|thought)\])\s*/gi, "");
                   if (dedupeClean) {
                     turnText += dedupeClean;
-                    yield { type: "text", content: dedupeClean };
+                    if (aiProvider === "Google") {
+                      pendingGoogleText += dedupeClean;
+                    } else {
+                      yield { type: "text", content: dedupeClean };
+                    }
                   }
                 }
                 isDedupeActive = false;
                 dedupeBuffer = "";
               }
+              if (aiProvider === "Google" && pendingGoogleText) {
+                yield { type: "text", content: pendingGoogleText };
+                pendingGoogleText = "";
+              }
               if (TERMINATION_SIGNAL) break;
               const signalSafeText2 = (turnText || "").trim();
               const hasFinish2 = /\[\s*(turn\s*:)?\s*finish\s*\]/i.test(signalSafeText2.toLowerCase());
@@ -6947,7 +7154,7 @@ Error Log can be found in ${path16.join(LOGS_DIR, "agent", "error.log")}`);
           const shouldContinue = toolCallPointer > 0;
           yield { type: "status", content: "Working..." };
           const cleanedTurnText = contextSafeReplace(turnText, /\[\s*(turn\s*:)?\s*(continue|finish)\s*\]/gi, "").trim();
-          let isActuallyFinished = hasFinish && !shouldContinue || !shouldContinue && !hasContinue;
+          let isActuallyFinished = hasFinish || !shouldContinue;
           if (isActuallyFinished) {
             const fullAgentTextRaw = fullAgentResponseChunks.join("\n");
             const cleanedFullResponse = fullAgentTextRaw.replace(/(?:<think>|\[think\])[\s\S]*?(?:<\/think>|\[\/think\])/g, "").trim();
@@ -7663,44 +7870,63 @@ function App({ args = [] }) {
   const [tick, setTick] = useState10(0);
   const isFirstRender = useRef3(true);
   const isSecondRender = useRef3(true);
+  const isThirdRender = useRef3(true);
   useEffect7(() => {
+    if (!apiKey) return;
     if (isFirstRender.current) {
       isFirstRender.current = false;
       setTimeout(() => {
         isSecondRender.current = false;
+        setTimeout(() => {
+          isThirdRender.current = false;
+        }, 1e3);
       }, 2e3);
       return;
     }
     if (isSecondRender.current) {
       return;
     }
+    if (isThirdRender.current) {
+      return;
+    }
     const s = emojiSpace(2);
+    let defaultModel = "";
+    let modelDisplayName = "";
     if (apiTier === "Free") {
-      setActiveModel("gemma-4-31b-it");
-      saveSettings({ apiTier: "Free", activeModel: "gemma-4-31b-it" });
-      setMessages((prev) => {
-        setCompletedIndex(prev.length + 1);
-        return [...prev, {
-          id: "tier-switch-" + Date.now(),
-          role: "system",
-          text: `\u26A0\uFE0F${s}**[TIER LIMIT]** Auto-switched to Gemma (Free default).`,
-          isMeta: true
-        }];
-      });
+      if (aiProvider === "Google") {
+        defaultModel = "gemma-4-31b-it";
+        modelDisplayName = "Gemma 4 (Free default)";
+      } else if (aiProvider === "DeepSeek") {
+        defaultModel = "deepseek-v4-flash";
+        modelDisplayName = "DeepSeek Flash (Free default)";
+      } else {
+        defaultModel = "google/gemma-4-31b-it:free";
+        modelDisplayName = "Gemma 4 (Free default)";
+      }
     } else {
-      setActiveModel("gemini-3-flash-preview");
-      saveSettings({ apiTier: "Paid", activeModel: "gemini-3-flash-preview" });
-      setMessages((prev) => {
-        setCompletedIndex(prev.length + 1);
-        return [...prev, {
-          id: "tier-switch-" + Date.now(),
-          role: "system",
-          text: `\u26A0\uFE0F${s}**[TIER LIMIT]** Auto-switched to Gemini 3 Flash.`,
-          isMeta: true
-        }];
-      });
+      if (aiProvider === "Google") {
+        defaultModel = "gemini-3-flash-preview";
+        modelDisplayName = "Gemini 3 Flash";
+      } else if (aiProvider === "DeepSeek") {
+        defaultModel = "deepseek-v4-flash";
+        modelDisplayName = "DeepSeek Flash";
+      } else {
+        defaultModel = "deepseek/deepseek-v4-flash";
+        modelDisplayName = "DeepSeek Flash";
+      }
     }
-  }, [apiTier]);
+    setActiveModel(defaultModel);
+    saveSettings({ apiTier, activeModel: defaultModel });
+    setMessages((prev) => {
+      setCompletedIndex(prev.length + 1);
+      return [...prev, {
+        id: "tier-switch-" + Date.now(),
+        role: "system",
+        text: `\u26A0\uFE0F${s}**[TIER LIMIT]** Auto-switched to ${modelDisplayName}.`,
+        isMeta: true
+      }];
+    });
+  }, [apiTier, aiProvider, apiKey]);
   const terminalEnv = useMemo2(() => {
     const isIDE = process.env.TERM_PROGRAM === "vscode" || !!process.env.VSC_TERMINAL_URL || !!process.env.INTELLIJ_TERMINAL_COMMAND_BLOCKS;
     return {
@@ -8026,7 +8252,8 @@ function App({ args = [] }) {
       setSystemSettings(freshSettings);
       setProfileData(saved.profileData);
       setImageSettings(saved.imageSettings || { keyType: "Default", quality: "Low-High", apiKey: "" });
-      const key = await getAPIKey();
+      const startupProvider = saved.aiProvider || "Google";
+      const key = await getProviderAPIKey(startupProvider);
       if (key) {
         setApiKey(key);
         initAI(key);
@@ -8105,12 +8332,21 @@ function App({ args = [] }) {
   }, [mode, thinkingLevel, aiProvider, activeModel, showFullThinking, systemSettings, profileData, imageSettings, isInitializing, parsedArgs, apiTier]);
   const handleSetup = async (val) => {
     const key = val.trim();
-    const minLength = aiProvider === "OpenRouter" ? 10 : 30;
+    let minLength = 30;
+    if (aiProvider === "OpenRouter") minLength = 10;
+    if (aiProvider === "DeepSeek") minLength = 20;
     if (key.length >= minLength) {
-      await saveAPIKey(key);
+      await saveProviderAPIKey(aiProvider, key);
       setApiKey(key);
       initAI(key);
-      setMessages((prev) => [...prev, { role: "system", text: `\u2705 ${aiProvider} API Key saved successfully! Initialization complete.`, isMeta: true }]);
+      let defaultModel = "gemma-4-31b-it";
+      if (aiProvider === "OpenRouter") {
+        defaultModel = "google/gemma-4-31b-it:free";
+      } else if (aiProvider === "DeepSeek") {
+        defaultModel = "deepseek-v4-flash";
+      }
+      setActiveModel(defaultModel);
+      setMessages((prev) => [...prev, { role: "system", text: `\u2705 ${aiProvider} API Key saved successfully! Model set to ${defaultModel}. Initialization complete.`, isMeta: true }]);
     } else {
       setMessages((prev) => [...prev, { role: "system", text: `\u274C INVALID KEY: ${aiProvider} API keys must be at least ${minLength} characters.`, isMeta: true }]);
       setTempKey("");
@@ -8202,12 +8438,28 @@ function App({ args = [] }) {
     {
       cmd: "/thinking",
       desc: "Set AI reasoning depth",
-      subs: [
-        { cmd: "Fast", desc: "No Reasoning        (Fastest)" },
-        { cmd: "Low", desc: "Quick Reasoning     (Answers Quickly)" },
-        { cmd: "Medium", desc: "Balanced Reasoning  (Decent Depth)" },
-        { cmd: "High", desc: "Deep Reasoning      (Complex Problems)" },
-        { cmd: "xHigh", desc: "Extended Reasoning  (Advanced Logic & Code)" }
+      subs: aiProvider === "DeepSeek" ? [
+        { cmd: "Fast", desc: "Fastest" },
+        { cmd: "Standard", desc: "Standard Reasoning" },
+        { cmd: "xHigh", desc: "Extended Reasoning" }
+      ] : aiProvider === "OpenRouter" ? [
+        { cmd: "Fast", desc: "Fastest" },
+        { cmd: "Low", desc: "Quick Reasoning" },
+        { cmd: "Medium", desc: "Balanced Reasoning" },
+        { cmd: "High", desc: "Deep Reasoning" },
+        { cmd: "xHigh", desc: "Extended Reasoning" }
+      ] : activeModel && activeModel.toLowerCase().startsWith("gemini-3") ? [
+        { cmd: "Fast", desc: "Fastest" },
+        { cmd: "Low", desc: "Quick Reasoning" },
+        { cmd: "Medium", desc: "Balanced Reasoning" },
+        { cmd: "High", desc: "Deep Reasoning" }
+      ] : [
+        // Google General / Gemma
+        { cmd: "Fast", desc: "Fastest" },
+        { cmd: "Low", desc: "Quick Reasoning" },
+        { cmd: "Medium", desc: "Balanced Reasoning" },
+        { cmd: "High", desc: "Deep Reasoning" },
+        { cmd: "xHigh", desc: "Extended Reasoning" }
       ]
     },
     {
@@ -8287,6 +8539,15 @@ function App({ args = [] }) {
           cmd: "moonshotai/kimi-k2.6",
           desc: "Multimodal"
         }
+      ] : aiProvider === "DeepSeek" ? [
+        {
+          cmd: "deepseek-v4-flash",
+          desc: "Fast & Efficient"
+        },
+        {
+          cmd: "deepseek-v4-pro",
+          desc: "High-Intelligence Reasoning"
+        }
       ] : apiTier === "Free" ? [
         {
           cmd: "gemma-4-31b-it",
@@ -9455,7 +9716,61 @@ Selection: ${val}`,
             setInputConfig,
             saveSettings,
             quotas,
-            setMessages
+            setMessages,
+            aiProvider
+          }
+        );
+      case "selectProvider":
+        return /* @__PURE__ */ React13.createElement(
+          CommandMenu,
+          {
+            title: "SELECT AI PROVIDER",
+            items: [
+              { label: "Google (Free/Paid)", value: "Google" },
+              { label: "DeepSeek (Paid)", value: "DeepSeek" },
+              { label: "OpenRouter (Free/Paid) [EXPERIMENTAL]", value: "OpenRouter" },
+              { label: "Back", value: "settings" }
+            ],
+            onSelect: async (item) => {
+              if (item.value === "settings" || item.value === "Back") {
+                setActiveView("settings");
+                return;
+              }
+              const selectedProvider = item.value;
+              const key = await getProviderAPIKey(selectedProvider);
+              if (key) {
+                setAiProvider(selectedProvider);
+                setApiKey(key);
+                initAI(key);
+                let defaultModel = "gemma-4-31b-it";
+                if (selectedProvider === "OpenRouter") {
+                  defaultModel = "google/gemma-4-31b-it:free";
+                } else if (selectedProvider === "DeepSeek") {
+                  defaultModel = "deepseek-v4-flash";
+                }
+                setActiveModel(defaultModel);
+                saveSettings({ aiProvider: selectedProvider, activeModel: defaultModel, apiTier, quotas });
+                setMessages((prev) => [
+                  ...prev,
+                  {
+                    role: "system",
+                    text: `\u2705 Switched to ${selectedProvider}! Key loaded from Vault. Model set to ${defaultModel}.`,
+                    isMeta: true
+                  }
+                ]);
+                setActiveView("settings");
+              } else {
+                setInputConfig({
+                  label: `Enter ${selectedProvider} API Key:`,
+                  key: "providerKey",
+                  provider: selectedProvider,
+                  value: "",
+                  returnView: "settings"
+                });
+                setActiveView("input");
+              }
+            },
+            onClose: () => setActiveView("settings")
           }
         );
       case "apiTier":
@@ -9497,7 +9812,7 @@ Selection: ${val}`,
           {
             value: inputConfig?.value || "",
             onChange: (val) => setInputConfig((prev) => ({ ...prev, value: val })),
-            onSubmit: (val) => {
+            onSubmit: async (val) => {
               const { key, subKey, next } = inputConfig;
               let newQuotas = { ...quotas };
               let newSettings = {};
@@ -9539,6 +9854,26 @@ Selection: ${val}`,
                     return [...prev, { id: Date.now(), role: "system", text: `\u274C [IMAGE KEY ERROR] API key must start with sk_. Key strategy reset to Default.`, isMeta: true }];
                   });
                 }
+              } else if (key === "providerKey") {
+                const keyInput = val.trim();
+                const prov = inputConfig.provider;
+                await saveProviderAPIKey(prov, keyInput);
+                setAiProvider(prov);
+                setApiKey(keyInput);
+                initAI(keyInput);
+                let defaultModel = "gemma-4-31b-it";
+                if (prov === "OpenRouter") {
+                  defaultModel = "google/gemma-4-31b-it:free";
+                } else if (prov === "DeepSeek") {
+                  defaultModel = "deepseek-v4-flash";
+                }
+                setActiveModel(defaultModel);
+                newSettings.aiProvider = prov;
+                newSettings.activeModel = defaultModel;
+                setMessages((prev) => {
+                  setCompletedIndex(prev.length + 1);
+                  return [...prev, { id: Date.now(), role: "system", text: `\u2705 ${prov} API Key saved successfully! Model set to ${defaultModel}.`, isMeta: true }];
+                });
               }
               if (next) {
                 setInputConfig(next(key === "quotas" ? newQuotas : val));
@@ -9937,8 +10272,9 @@ Selection: ${val}`,
     CommandMenu,
     {
       items: [
-        { label: "Google (Daily Free Quota)", value: "Google" },
-        { label: "OpenRouter (Daily Free Quota) [EXPERIMENTAL & UNSTABLE]", value: "OpenRouter" }
+        { label: "Google (Free/Paid)", value: "Google" },
+        { label: "DeepSeek (Paid)", value: "DeepSeek" },
+        { label: "OpenRouter (Free/Paid) [EXPERIMENTAL]", value: "OpenRouter" }
       ],
       onSelect: (item) => {
         setAiProvider(item.value);

package/package.json

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