neoagent 1.5.1 → 1.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "neoagent",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "Proactive personal AI agent with no limits",
   "license": "MIT",
   "main": "server/index.js",

package/server/routes/settings.js

@@ -29,9 +29,10 @@ function readUpdateStatus() {
 }
 
 // Get supported models metadata
-router.get('/meta/models', (req, res) => {
-  const { SUPPORTED_MODELS } = require('../services/ai/models');
-  res.json({ models: SUPPORTED_MODELS });
+router.get('/meta/models', async (req, res) => {
+  const { getSupportedModels } = require('../services/ai/models');
+  const models = await getSupportedModels();
+  res.json({ models });
 });
 
 // Get all settings

package/server/services/ai/engine.js

@@ -18,8 +18,9 @@ function generateTitle(task) {
   return cleaned.slice(0, 90);
 }
 
-function getProviderForUser(userId, task = '', isSubagent = false, modelOverride = null) {
-  const { SUPPORTED_MODELS, createProviderInstance } = require('./models');
+async function getProviderForUser(userId, task = '', isSubagent = false, modelOverride = null) {
+  const { getSupportedModels, createProviderInstance } = require('./models');
+  const models = await getSupportedModels();
 
   let enabledIds = [];
   let defaultChatModel = 'auto';
@@ -49,16 +50,16 @@ function getProviderForUser(userId, task = '', isSubagent = false, modelOverride
   }
 
   if (!Array.isArray(enabledIds) || enabledIds.length === 0) {
-    enabledIds = SUPPORTED_MODELS.map((m) => m.id);
+    enabledIds = models.map((m) => m.id);
   }
 
-  const availableModels = SUPPORTED_MODELS.filter((m) => enabledIds.includes(m.id));
-  const fallbackModel = availableModels.length > 0 ? availableModels[0] : SUPPORTED_MODELS[0];
+  const availableModels = models.filter((m) => enabledIds.includes(m.id));
+  const fallbackModel = availableModels.length > 0 ? availableModels[0] : models[0];
   let selectedModelDef = fallbackModel;
   const userSelectedDefault = isSubagent ? defaultSubagentModel : defaultChatModel;
 
   if (modelOverride && typeof modelOverride === 'string') {
-    const requested = SUPPORTED_MODELS.find((m) => m.id === modelOverride.trim());
+    const requested = models.find((m) => m.id === modelOverride.trim());
     if (requested && enabledIds.includes(requested.id)) {
       selectedModelDef = requested;
       return {
@@ -70,10 +71,10 @@ function getProviderForUser(userId, task = '', isSubagent = false, modelOverride
   }
 
   if (userSelectedDefault && userSelectedDefault !== 'auto') {
-    selectedModelDef = SUPPORTED_MODELS.find((m) => m.id === userSelectedDefault) || fallbackModel;
+    selectedModelDef = models.find((m) => m.id === userSelectedDefault) || fallbackModel;
   } else {
     const taskStr = String(task || '').toLowerCase();
-    
+
     // Basic detection
     let isPlanning = /\b(plan|think|analy[sz]e|complex|step by step)\b/.test(taskStr);
     let isCoding = false;
@@ -83,7 +84,7 @@ function getProviderForUser(userId, task = '', isSubagent = false, modelOverride
       isPlanning = isPlanning || /\b(reason|strategy|logical|math|complex)\b/.test(taskStr);
       isCoding = /\b(code|program|script|debug|refactor|function|implementation|logic)\b/.test(taskStr);
     }
-    
+
     if (isPlanning) {
       selectedModelDef = availableModels.find((m) => m.purpose === 'planning') || fallbackModel;
     } else if (isCoding) {
@@ -240,7 +241,7 @@ class AgentEngine {
     const triggerType = options.triggerType || 'user';
     ensureDefaultAiSettings(userId);
     const aiSettings = getAiSettings(userId);
-    const { provider, model, providerName } = getProviderForUser(userId, userMessage, triggerType === 'subagent', _modelOverride);
+    const { provider, model, providerName } = await getProviderForUser(userId, userMessage, triggerType === 'subagent', _modelOverride);
 
     const runId = options.runId || uuidv4();
     const conversationId = options.conversationId;
@@ -345,19 +346,19 @@ class AgentEngine {
             console.error(`[Engine] Model call failed (${model}):`, err.message);
             if (retryForFallback && aiSettings.fallback_model_id && aiSettings.fallback_model_id !== model) {
               console.log(`[Engine] Attempting fallback to: ${aiSettings.fallback_model_id}`);
-              const fallback = getProviderForUser(userId, userMessage, triggerType === 'subagent', aiSettings.fallback_model_id);
+              const fallback = await getProviderForUser(userId, userMessage, triggerType === 'subagent', aiSettings.fallback_model_id);
               // Update local state for the retry
               const nextProvider = fallback.provider;
               const nextModel = fallback.model;
               const nextProviderName = fallback.providerName;
-              
+
               // Recursive call once
               const retryOptions = { ...callOptions, model: nextModel, reasoningEffort: this.getReasoningEffort(nextProviderName, options) };
-              
+
               if (options.stream !== false) {
                 const gen = nextProvider.stream(messages, tools, retryOptions);
                 for await (const chunk of gen) {
-                   if (chunk.type === 'content') {
+                  if (chunk.type === 'content') {
                     streamContent += chunk.content;
                     this.emit(userId, 'run:stream', { runId, content: streamContent, iteration });
                   }

package/server/services/ai/models.js

@@ -3,7 +3,7 @@ const { OpenAIProvider } = require('./providers/openai');
 const { GoogleProvider } = require('./providers/google');
 const { OllamaProvider } = require('./providers/ollama');
 
-const SUPPORTED_MODELS = [
+const STATIC_MODELS = [
     {
         id: 'grok-4-1-fast-reasoning',
         label: 'Grok 4.1 (Personality / Default)',
@@ -54,6 +54,46 @@ const SUPPORTED_MODELS = [
     }
 ];
 
+let dynamicModels = [];
+let lastRefresh = 0;
+const REFRESH_INTERVAL = 30000; // 30 seconds
+
+async function getSupportedModels() {
+    const now = Date.now();
+    if (now - lastRefresh > REFRESH_INTERVAL) {
+        await refreshDynamicModels();
+    }
+
+    const all = [...STATIC_MODELS];
+    const staticIds = new Set(STATIC_MODELS.map(m => m.id));
+
+    for (const dm of dynamicModels) {
+        if (!staticIds.has(dm.id)) {
+            all.push(dm);
+        }
+    }
+
+    return all;
+}
+
+async function refreshDynamicModels() {
+    try {
+        const ollama = new OllamaProvider({ baseUrl: process.env.OLLAMA_URL });
+        const models = await ollama.listModels();
+
+        dynamicModels = models.map(name => ({
+            id: name,
+            label: `${name} (Ollama / Local)`,
+            provider: 'ollama',
+            purpose: 'general'
+        }));
+
+        lastRefresh = Date.now();
+    } catch (err) {
+        console.warn('[Models] Failed to refresh Ollama models:', err.message);
+    }
+}
+
 function createProviderInstance(providerStr) {
     if (providerStr === 'grok') {
         return new GrokProvider({ apiKey: process.env.XAI_API_KEY });
@@ -68,6 +108,7 @@ function createProviderInstance(providerStr) {
 }
 
 module.exports = {
-    SUPPORTED_MODELS,
+    SUPPORTED_MODELS: STATIC_MODELS, // Backward compatibility
+    getSupportedModels,
     createProviderInstance
 };

package/server/services/ai/tools.js

@@ -4,44 +4,44 @@ const db = require('../../db/database');
 const { DATA_DIR } = require('../../../runtime/paths');
 
 function compactText(text, maxChars = 120) {
-  const str = String(text || '').replace(/\s+/g, ' ').trim();
-  if (str.length <= maxChars) return str;
-  const trimmed = str.slice(0, maxChars);
-  const sentenceBreak = Math.max(trimmed.lastIndexOf('. '), trimmed.lastIndexOf('; '), trimmed.lastIndexOf(', '));
-  if (sentenceBreak > 40) return trimmed.slice(0, sentenceBreak + 1).trim();
-  return `${trimmed.trim()}...`;
+    const str = String(text || '').replace(/\s+/g, ' ').trim();
+    if (str.length <= maxChars) return str;
+    const trimmed = str.slice(0, maxChars);
+    const sentenceBreak = Math.max(trimmed.lastIndexOf('. '), trimmed.lastIndexOf('; '), trimmed.lastIndexOf(', '));
+    if (sentenceBreak > 40) return trimmed.slice(0, sentenceBreak + 1).trim();
+    return `${trimmed.trim()}...`;
 }
 
 function compactToolDefinition(tool, options = {}) {
-  const compact = {
-    name: tool.name,
-    parameters: {
-      ...(tool.parameters || { type: 'object', properties: {} }),
-      properties: {}
+    const compact = {
+        name: tool.name,
+        parameters: {
+            ...(tool.parameters || { type: 'object', properties: {} }),
+            properties: {}
+        }
+    };
+
+    if (options.includeDescriptions) {
+        compact.description = compactText(tool.description, 120);
     }
-  };
-
-  if (options.includeDescriptions) {
-    compact.description = compactText(tool.description, 120);
-  }
-
-  if (tool.parameters?.properties) {
-    const properties = {};
-    for (const [key, value] of Object.entries(tool.parameters.properties)) {
-      properties[key] = { ...value };
-      if (options.includeDescriptions && value.description) {
-        properties[key].description = compactText(value.description, 70);
-      } else {
-        delete properties[key].description;
-      }
+
+    if (tool.parameters?.properties) {
+        const properties = {};
+        for (const [key, value] of Object.entries(tool.parameters.properties)) {
+            properties[key] = { ...value };
+            if (options.includeDescriptions && value.description) {
+                properties[key].description = compactText(value.description, 70);
+            } else {
+                delete properties[key].description;
+            }
+        }
+        compact.parameters = {
+            ...compact.parameters,
+            properties
+        };
     }
-    compact.parameters = {
-      ...compact.parameters,
-      properties
-    };
-  }
 
-  return compact;
+    return compact;
 }
 
 /**
@@ -1199,7 +1199,7 @@ async function executeTool(toolName, args, context, engine) {
                 const mimeMap = { '.png': 'image/png', '.gif': 'image/gif', '.webp': 'image/webp', '.jpg': 'image/jpeg', '.jpeg': 'image/jpeg' };
                 const mime = mimeMap[ext] || 'image/jpeg';
                 const { getProviderForUser } = require('./engine');
-                const { provider: visionProvider, model: visionModel } = getProviderForUser(userId);
+                const { provider: visionProvider, model: visionModel } = await getProviderForUser(userId);
                 const visionResponse = await visionProvider.chat(
                     [{
                         role: 'user', content: [

package/server/services/memory/manager.js

@@ -11,13 +11,10 @@ const {
 } = require('./embeddings');
 const { AGENT_DATA_DIR } = require('../../../runtime/paths');
 
-/**
- * Derive the active AI provider name from user settings so the right
- * embedding model is selected automatically (e.g. Gemini when using Google).
- */
-function getActiveProvider(userId) {
+async function getActiveProvider(userId) {
   try {
-    const { SUPPORTED_MODELS } = require('../ai/models');
+    const { getSupportedModels } = require('../ai/models');
+    const models = await getSupportedModels();
     const rows = db.prepare('SELECT key, value FROM user_settings WHERE user_id = ? AND key IN (?, ?)')
       .all(userId || 1, 'default_chat_model', 'enabled_models');
 
@@ -36,7 +33,7 @@ function getActiveProvider(userId) {
       : (Array.isArray(enabledIds) && enabledIds.length > 0 ? enabledIds[0] : null);
 
     if (modelId) {
-      const def = SUPPORTED_MODELS.find(m => m.id === modelId);
+      const def = models.find(m => m.id === modelId);
       if (def) return def.provider;
     }
   } catch { }
@@ -118,7 +115,7 @@ class MemoryManager {
     category = CATEGORIES.includes(category) ? category : 'episodic';
     importance = Math.max(1, Math.min(10, Number(importance) || 5));
 
-    const embedding = await getEmbedding(content, getActiveProvider(userId));
+    const embedding = await getEmbedding(content, await getActiveProvider(userId));
 
     // Dedup check: compare against existing non-archived memories for this user
     const existing = db.prepare(
@@ -171,7 +168,7 @@ class MemoryManager {
 
     if (!all.length) return [];
 
-    const queryVec = await getEmbedding(query, getActiveProvider(userId));
+    const queryVec = await getEmbedding(query, await getActiveProvider(userId));
 
     const scored = all.map(mem => {
       let score = 0;
@@ -235,7 +232,7 @@ class MemoryManager {
 
     let newEmbed = mem.embedding;
     if (content && content !== mem.content) {
-      const vec = await getEmbedding(newContent, getActiveProvider(null));
+      const vec = await getEmbedding(newContent, await getActiveProvider(null));
       newEmbed = vec ? serializeEmbedding(vec) : mem.embedding;
     }
 

package/server/services/websocket.js

@@ -81,7 +81,7 @@ function setupWebSocket(io, services) {
             .run(userId, result.runId, 'assistant', result.content, JSON.stringify({ tokens: result.totalTokens }));
         }
 
-        const { provider, model } = getProviderForUser(userId, task, false, options?.model || null);
+        const { provider, model } = await getProviderForUser(userId, task, false, options?.model || null);
         refreshWebChatSummary(userId, provider, model, aiSettings.chat_history_window).catch((summaryErr) => {
           console.error('[WS] Web summary refresh failed:', summaryErr.message);
         });