neoagent 2.4.2-beta.1 → 2.4.2-beta.3

package/server/routes/account.js

@@ -110,6 +110,27 @@ router.get('/', (req, res) => {
   }
 });
 
+router.get('/usage', (req, res) => {
+  try {
+    const userId = req.session.userId;
+    const userLimits = db.prepare('SELECT rate_limit_4h, rate_limit_weekly FROM users WHERE id = ?').get(userId);
+    const h4Tokens = db.prepare("SELECT COALESCE(SUM(total_tokens), 0) as t FROM agent_runs WHERE user_id = ? AND created_at > datetime('now', '-4 hours')").get(userId).t;
+    const weeklyTokens = db.prepare("SELECT COALESCE(SUM(total_tokens), 0) as t FROM agent_runs WHERE user_id = ? AND created_at > datetime('now', '-7 days')").get(userId).t;
+    res.json({
+      limits: {
+        fourHour: userLimits?.rate_limit_4h || null,
+        weekly: userLimits?.rate_limit_weekly || null,
+      },
+      usage: {
+        fourHour: h4Tokens,
+        weekly: weeklyTokens,
+      }
+    });
+  } catch (err) {
+    sendRouteError(res, err);
+  }
+});
+
 router.put('/display-name', accountLimiter, (req, res) => {
   try {
     const displayName = normalizeDisplayName(req.body?.displayName);

package/server/routes/admin.js

@@ -469,7 +469,7 @@ router.get('/api/users', requireAdminAuth, (req, res) => {
   try {
     const sql = `
       SELECT u.id, u.username, u.display_name, u.email, u.email_verified_at,
-             u.created_at, u.last_login,
+             u.created_at, u.last_login, u.rate_limit_4h, u.rate_limit_weekly,
              COALESCE(r.run_count,    0) AS run_count,
              COALESCE(a.storage_bytes,0) AS storage_bytes
       FROM users u
@@ -618,6 +618,45 @@ router.put('/api/providers', requireAdminAuth, express.json(), (req, res) => {
   res.json({ ok: true });
 });
 
+// --- Models ---
+
+router.get('/api/models', requireAdminAuth, async (req, res) => {
+  const { getSupportedModels } = require('../services/ai/models');
+  try {
+    const models = await getSupportedModels(null, null);
+    const enabledModelsStr = process.env.NEOAGENT_ENABLED_MODELS || '';
+    const enabledModelsList = enabledModelsStr ? enabledModelsStr.split(',').map(s => s.trim()).filter(s => s.length > 0) : [];
+    res.json({ models, enabledModels: enabledModelsList });
+  } catch (err) {
+    res.status(500).json({ error: String(err.message || err) });
+  }
+});
+
+router.put('/api/models/enabled', requireAdminAuth, express.json(), (req, res) => {
+  const { enabledModels } = req.body || {};
+  if (!Array.isArray(enabledModels)) return res.status(400).json({ error: 'enabledModels must be an array' });
+  const value = enabledModels.join(',');
+  upsertEnvValue(ENV_FILE, 'NEOAGENT_ENABLED_MODELS', value);
+  process.env.NEOAGENT_ENABLED_MODELS = value;
+  res.json({ ok: true });
+});
+
+router.put('/api/users/:id/rate-limits', requireAdminAuth, express.json(), (req, res) => {
+  const db = require('../db/database');
+  const { id } = req.params;
+  const { rate_limit_4h, rate_limit_weekly } = req.body || {};
+  try {
+    db.prepare('UPDATE users SET rate_limit_4h = ?, rate_limit_weekly = ? WHERE id = ?').run(
+      rate_limit_4h ?? null,
+      rate_limit_weekly ?? null,
+      id
+    );
+    res.json({ ok: true });
+  } catch (err) {
+    res.status(500).json({ error: String(err.message || err) });
+  }
+});
+
 // --- Static files ---
 
 router.use(express.static(ADMIN_DIR));

package/server/services/ai/engine.js

@@ -1214,6 +1214,22 @@ class AgentEngine {
     ensureDefaultAiSettings(userId, agentId);
     const aiSettings = getAiSettings(userId, agentId);
 
+    const userLimits = db.prepare('SELECT rate_limit_4h, rate_limit_weekly FROM users WHERE id = ?').get(userId);
+    if (userLimits) {
+      if (userLimits.rate_limit_4h) {
+        const h4Tokens = db.prepare("SELECT COALESCE(SUM(total_tokens), 0) as t FROM agent_runs WHERE user_id = ? AND created_at > datetime('now', '-4 hours')").get(userId).t;
+        if (h4Tokens >= userLimits.rate_limit_4h) {
+          throw new Error(`Rate limit exceeded: You have used ${h4Tokens} tokens in the last 4 hours (limit: ${userLimits.rate_limit_4h}).`);
+        }
+      }
+      if (userLimits.rate_limit_weekly) {
+        const weeklyTokens = db.prepare("SELECT COALESCE(SUM(total_tokens), 0) as t FROM agent_runs WHERE user_id = ? AND created_at > datetime('now', '-7 days')").get(userId).t;
+        if (weeklyTokens >= userLimits.rate_limit_weekly) {
+          throw new Error(`Rate limit exceeded: You have used ${weeklyTokens} tokens in the last 7 days (limit: ${userLimits.rate_limit_weekly}).`);
+        }
+      }
+    }
+
     const runId = options.runId || uuidv4();
     const conversationId = options.conversationId;
     const app = options.app || this.app;

package/server/services/ai/models.js

@@ -402,7 +402,7 @@ async function getSupportedModels(userId, agentId = null) {
 
     // Ollama: dynamic list from local server
     const ollama = providerById.get('ollama');
-    if (ollama?.enabled) {
+    if (ollama?.available) {
         const dynamicModels = await refreshDynamicModels(ollama.baseUrl);
         for (const model of dynamicModels) {
             if (!staticIds.has(model.id)) {
@@ -430,6 +430,9 @@ async function getSupportedModels(userId, agentId = null) {
         }
     }
 
+    const globalEnabledStr = process.env.NEOAGENT_ENABLED_MODELS || '';
+    const globalEnabledSet = globalEnabledStr ? new Set(globalEnabledStr.split(',').map(s => s.trim()).filter(Boolean)) : null;
+
     return all.map((model) => {
         const provider = providerById.get(model.provider);
         // Ollama models are always local/free; all others look up the OpenRouter
@@ -437,10 +440,16 @@ async function getSupportedModels(userId, agentId = null) {
         const priceTier = model.provider === 'ollama'
             ? 'free'
             : (model.priceTier ?? classifyPriceTier(model.id));
+        
+        let available = provider?.available !== false;
+        if (globalEnabledSet && !globalEnabledSet.has(model.id)) {
+            available = false;
+        }
+
         return {
             ...model,
             priceTier,
-            available: provider?.available !== false,
+            available,
             providerStatus: provider?.status || 'unknown',
             providerStatusLabel: provider?.statusLabel || 'Unknown'
         };

package/server/services/ai/providers/ollama.js

@@ -10,7 +10,10 @@ class OllamaProvider extends BaseProvider {
 
   async listModels() {
     try {
-      const res = await fetch(`${this.baseUrl}/api/tags`);
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), 5000);
+      const res = await fetch(`${this.baseUrl}/api/tags`, { signal: controller.signal });
+      clearTimeout(timer);
       const data = await res.json();
       this.models = (data.models || []).map(m => m.name);
       return this.models;