levix-bot 2.2.1 → 2.3.0

package/src/routes/dashboard.api.esm.js

@@ -48,7 +48,10 @@ const settings = require("../config/settings.cjs");
 const memory = require("../utils/memory.cjs");
 const secrets = require("../config/secrets.cjs");
 const { DATA_DIR } = require("../config/paths.cjs");
-const { PERSONA_FILE } = require("../services/aiAgent.cjs");
+const {
+  PERSONA_FILE,
+  activeProviderKeySetting,
+} = require("../services/aiAgent.cjs");
 const { deleteScheduledJob, retryScheduledJob } = require("../../scheduler.cjs");
 const { describeScheduledJob } = require("../utils/recurrence.cjs");
 
@@ -140,7 +143,9 @@ router.get("/stats", (req, res) => {
 
         prefix: runtimeConfig.getPrefix(),
         commandCount: getCommandCatalog().length,
-        aiConfigured: !!settings.get("gemini_api_key"),
+        // The active provider's key — "AI key: Not set" must mean what the
+        // bot will actually use, not whatever gemini_api_key happens to hold.
+        aiConfigured: !!settings.get(activeProviderKeySetting()),
 
         uptime: process.uptime(),
         memory: process.memoryUsage(),

package/src/services/aiAgent.cjs

@@ -22,6 +22,10 @@ const aiIdentity = require("../config/ai-identity.cjs");
 const settings = require("../config/settings.cjs");
 const memory = require("../utils/memory.cjs");
 const { toolDeclarations, describeCall, runTool } = require("./aiTools.cjs");
+const {
+  runProviderAgent,
+  activeProviderKeySetting,
+} = require("./aiProviders.cjs");
 
 // Model, key, tool budget and history length all come from config/settings.cjs
 // (what the dashboard saved, else the default) and are read per call, so changing
@@ -36,13 +40,18 @@ const { toolDeclarations, describeCall, runTool } = require("./aiTools.cjs");
 // client whose model and per-request configuration are passed at call time —
 // which suits Levix, because the model and the tool set are settings that may
 // change between one message and the next.
-let clientCache = { key: null, client: null };
+let clientCache = { key: null, baseUrl: null, client: null };
 
 function geminiClient() {
   const key = settings.get("gemini_api_key");
   if (!key) return null;
-  if (clientCache.key !== key) {
-    clientCache = { key, client: new GoogleGenAI({ apiKey: key }) };
+  const baseUrl = String(settings.get("gemini_base_url")).replace(/\/+$/, "");
+  if (clientCache.key !== key || clientCache.baseUrl !== baseUrl) {
+    clientCache = {
+      key,
+      baseUrl,
+      client: new GoogleGenAI({ apiKey: key, httpOptions: { baseUrl } }),
+    };
   }
   return clientCache.client;
 }
@@ -225,7 +234,9 @@ function withTimeout(promise, ms, label) {
 }
 
 function isAgentEnabled() {
-  return Boolean(geminiClient()) && settings.get("ai_agent");
+  // The key that matters is the active provider's: a panel switch from gemini
+  // to openai must not keep the agent gated on (or running on) a Gemini key.
+  return Boolean(settings.get(activeProviderKeySetting())) && settings.get("ai_agent");
 }
 
 // ===========================================================================
@@ -247,7 +258,7 @@ function isAgentEnabled() {
 
 const GOOGLE_SEARCH_TOOL = Object.freeze({ googleSearch: {} });
 
-/** Gemini-only. Nothing here is offered to Groq or any other provider. */
+/** Gemini-only. The openai and anthropic providers are never offered it. */
 function googleSearchEnabled() {
   return settings.get("ai_google_search") === true;
 }
@@ -368,6 +379,10 @@ function formatSources(sources) {
 /**
  * Run one agent turn.
  *
+ * Dispatches on the `ai_provider` setting: gemini runs the native loop below
+ * (built-in Google Search, Files uploads); openai and anthropic run the same
+ * loop over their own wire formats in aiProviders.cjs.
+ *
  * @param {object}   options
  * @param {Array}    options.parts    - the Gemini parts for this message
  * @param {Array}    [options.history]- prior conversation
@@ -384,6 +399,20 @@ async function runAgent({
   useTools = true,
   maxSteps = null,
 } = {}) {
+  const provider = settings.get("ai_provider");
+  if (provider !== "gemini") {
+    const result = await runProviderAgent(provider, {
+      parts,
+      history: trimHistory(history),
+      systemInstruction: buildSystemInstruction(context),
+      status,
+      context,
+      useTools,
+      maxSteps,
+    });
+    return { ...result, history: trimHistory(result.history) };
+  }
+
   const genAI = geminiClient();
   if (!genAI) throw new Error("GEMINI_API_KEY غير معرف");
 
@@ -540,6 +569,7 @@ module.exports = {
   buildSystemInstruction,
   loadPersona,
   isAgentEnabled,
+  activeProviderKeySetting,
   isFileReferenceError,
   sanitizeHistoryForFiles,
   trimHistory,