neoagent 2.4.2-beta.2 → 2.4.2-beta.4

package/server/routes/account.js

@@ -116,10 +116,19 @@ router.get('/usage', (req, res) => {
     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;
+
+    const globalLimit4h = process.env.NEOAGENT_RATE_LIMIT_4H ? parseInt(process.env.NEOAGENT_RATE_LIMIT_4H, 10) : null;
+    const globalLimitWeekly = process.env.NEOAGENT_RATE_LIMIT_WEEKLY ? parseInt(process.env.NEOAGENT_RATE_LIMIT_WEEKLY, 10) : null;
+
+    const custom4h = userLimits?.rate_limit_4h ?? null;
+    const customWeekly = userLimits?.rate_limit_weekly ?? null;
+
     res.json({
       limits: {
-        fourHour: userLimits?.rate_limit_4h || null,
-        weekly: userLimits?.rate_limit_weekly || null,
+        fourHour: custom4h ?? globalLimit4h,
+        weekly: customWeekly ?? globalLimitWeekly,
+        fourHourIsCustom: custom4h !== null,
+        weeklyIsCustom: customWeekly !== null,
       },
       usage: {
         fourHour: h4Tokens,

package/server/routes/admin.js

@@ -618,6 +618,27 @@ router.put('/api/providers', requireAdminAuth, express.json(), (req, res) => {
   res.json({ ok: true });
 });
 
+// --- Global default rate limits ---
+
+router.get('/api/config/rate-limits', requireAdminAuth, (req, res) => {
+  res.json({
+    rate_limit_4h: process.env.NEOAGENT_RATE_LIMIT_4H ? parseInt(process.env.NEOAGENT_RATE_LIMIT_4H, 10) : null,
+    rate_limit_weekly: process.env.NEOAGENT_RATE_LIMIT_WEEKLY ? parseInt(process.env.NEOAGENT_RATE_LIMIT_WEEKLY, 10) : null,
+  });
+});
+
+router.put('/api/config/rate-limits', requireAdminAuth, express.json(), (req, res) => {
+  const { rate_limit_4h, rate_limit_weekly } = req.body || {};
+  const parse = (v) => (v !== null && v !== undefined && v !== '' ? parseInt(v, 10) : null);
+  const v4h = parse(rate_limit_4h);
+  const vWeekly = parse(rate_limit_weekly);
+  upsertEnvValue(ENV_FILE, 'NEOAGENT_RATE_LIMIT_4H', v4h !== null ? String(v4h) : '');
+  upsertEnvValue(ENV_FILE, 'NEOAGENT_RATE_LIMIT_WEEKLY', vWeekly !== null ? String(vWeekly) : '');
+  process.env.NEOAGENT_RATE_LIMIT_4H = v4h !== null ? String(v4h) : '';
+  process.env.NEOAGENT_RATE_LIMIT_WEEKLY = vWeekly !== null ? String(vWeekly) : '';
+  res.json({ ok: true });
+});
+
 // --- Models ---
 
 router.get('/api/models', requireAdminAuth, async (req, res) => {
@@ -641,6 +662,18 @@ router.put('/api/models/enabled', requireAdminAuth, express.json(), (req, res) =
   res.json({ ok: true });
 });
 
+router.get('/api/users/:id/rate-limits', requireAdminAuth, (req, res) => {
+  const db = require('../db/database');
+  const { id } = req.params;
+  try {
+    const row = db.prepare('SELECT rate_limit_4h, rate_limit_weekly FROM users WHERE id = ?').get(id);
+    if (!row) return res.status(404).json({ error: 'User not found' });
+    res.json({ limits: row });
+  } catch (err) {
+    res.status(500).json({ error: String(err.message || err) });
+  }
+});
+
 router.put('/api/users/:id/rate-limits', requireAdminAuth, express.json(), (req, res) => {
   const db = require('../db/database');
   const { id } = req.params;

package/server/services/ai/engine.js

@@ -1215,18 +1215,20 @@ class AgentEngine {
     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}).`);
-        }
+    const globalLimit4h = process.env.NEOAGENT_RATE_LIMIT_4H ? parseInt(process.env.NEOAGENT_RATE_LIMIT_4H, 10) : null;
+    const globalLimitWeekly = process.env.NEOAGENT_RATE_LIMIT_WEEKLY ? parseInt(process.env.NEOAGENT_RATE_LIMIT_WEEKLY, 10) : null;
+    const effective4h = userLimits?.rate_limit_4h ?? globalLimit4h;
+    const effectiveWeekly = userLimits?.rate_limit_weekly ?? globalLimitWeekly;
+    if (effective4h) {
+      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 >= effective4h) {
+        throw new Error(`Rate limit exceeded: You have used ${h4Tokens} tokens in the last 4 hours (limit: ${effective4h}).`);
       }
-      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}).`);
-        }
+    }
+    if (effectiveWeekly) {
+      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 >= effectiveWeekly) {
+        throw new Error(`Rate limit exceeded: You have used ${weeklyTokens} tokens in the last 7 days (limit: ${effectiveWeekly}).`);
       }
     }
 

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)) {
@@ -446,9 +446,15 @@ async function getSupportedModels(userId, agentId = null) {
             available = false;
         }
 
+        const bareId = model.id.includes('/') ? model.id.slice(model.id.indexOf('/') + 1) : null;
+        const inputCostPerM = model.provider === 'ollama'
+            ? 0
+            : (openrouterPricingCache.get(model.id) ?? (bareId ? openrouterPricingCache.get(bareId) : undefined) ?? null);
+
         return {
             ...model,
             priceTier,
+            inputCostPerM,
             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;