neoagent 1.1.0 → 1.1.2

package/server/routes/settings.js

@@ -4,6 +4,7 @@ const path = require('path');
 const router = express.Router();
 const db = require('../db/database');
 const { requireAuth } = require('../middleware/auth');
+const { normalizeWhatsAppWhitelist } = require('../utils/whatsapp');
 
 router.use(requireAuth);
 
@@ -55,6 +56,19 @@ router.get('/', (req, res) => {
 router.put('/', (req, res) => {
   const userId = req.session.userId;
   const upsert = db.prepare('INSERT INTO user_settings (user_id, key, value) VALUES (?, ?, ?) ON CONFLICT(user_id, key) DO UPDATE SET value = excluded.value');
+  const normalizedBody = { ...req.body };
+
+  if ('platform_whitelist_whatsapp' in normalizedBody) {
+    let whitelist = normalizedBody.platform_whitelist_whatsapp;
+    if (typeof whitelist === 'string') {
+      try {
+        whitelist = JSON.parse(whitelist);
+      } catch {
+        whitelist = [];
+      }
+    }
+    normalizedBody.platform_whitelist_whatsapp = JSON.stringify(normalizeWhatsAppWhitelist(whitelist));
+  }
 
   const tx = db.transaction((entries) => {
     for (const [key, value] of entries) {
@@ -63,17 +77,66 @@ router.put('/', (req, res) => {
     }
   });
 
-  tx(Object.entries(req.body));
+  tx(Object.entries(normalizedBody));
 
   // Apply headless toggle immediately without restarting
-  if ('headless_browser' in req.body) {
+  if ('headless_browser' in normalizedBody) {
     const bc = req.app.locals.browserController;
-    if (bc) bc.setHeadless(req.body.headless_browser).catch(() => { });
+    if (bc) bc.setHeadless(normalizedBody.headless_browser).catch(() => { });
   }
 
   res.json({ success: true });
 });
 
+// Token usage summary for settings UI
+router.get('/token-usage/summary', (req, res) => {
+  const userId = req.session.userId;
+  const totals = db.prepare(`
+    SELECT
+      COALESCE(SUM(total_tokens), 0) AS totalTokens,
+      COUNT(*) AS totalRuns,
+      COALESCE(AVG(CASE WHEN total_tokens > 0 THEN total_tokens END), 0) AS avgTokensPerRun
+    FROM agent_runs
+    WHERE user_id = ?
+  `).get(userId);
+
+  const recentRows = db.prepare(`
+    SELECT
+      date(created_at) AS day,
+      COALESCE(SUM(total_tokens), 0) AS tokens,
+      COUNT(*) AS runs
+    FROM agent_runs
+    WHERE user_id = ? AND created_at >= datetime('now', '-6 days')
+    GROUP BY date(created_at)
+    ORDER BY day ASC
+  `).all(userId);
+
+  const byDay = new Map(recentRows.map(r => [r.day, { tokens: Number(r.tokens || 0), runs: Number(r.runs || 0) }]));
+  const last7Days = [];
+  for (let offset = 6; offset >= 0; offset--) {
+    const day = db.prepare(`SELECT date('now', ?) AS day`).get(`-${offset} days`).day;
+    const dayRow = byDay.get(day) || { tokens: 0, runs: 0 };
+    last7Days.push({ date: day, tokens: dayRow.tokens, runs: dayRow.runs });
+  }
+
+  const last7Totals = last7Days.reduce((acc, d) => {
+    acc.tokens += d.tokens;
+    acc.runs += d.runs;
+    return acc;
+  }, { tokens: 0, runs: 0 });
+
+  res.json({
+    totals: {
+      totalTokens: Number(totals?.totalTokens || 0),
+      totalRuns: Number(totals?.totalRuns || 0),
+      avgTokensPerRun: Math.round(Number(totals?.avgTokensPerRun || 0)),
+      last7DaysTokens: last7Totals.tokens,
+      last7DaysRuns: last7Totals.runs
+    },
+    last7Days
+  });
+});
+
 // Get single setting
 router.get('/:key', (req, res) => {
   const row = db.prepare('SELECT value FROM user_settings WHERE user_id = ? AND key = ?').get(req.session.userId, req.params.key);
@@ -90,7 +153,18 @@ router.get('/:key', (req, res) => {
 
 // Set single setting
 router.put('/:key', (req, res) => {
-  const v = typeof req.body.value === 'string' ? req.body.value : JSON.stringify(req.body.value);
+  let value = req.body.value;
+  if (req.params.key === 'platform_whitelist_whatsapp') {
+    if (typeof value === 'string') {
+      try {
+        value = JSON.parse(value);
+      } catch {
+        value = [];
+      }
+    }
+    value = normalizeWhatsAppWhitelist(value);
+  }
+  const v = typeof value === 'string' ? value : JSON.stringify(value);
   db.prepare('INSERT INTO user_settings (user_id, key, value) VALUES (?, ?, ?) ON CONFLICT(user_id, key) DO UPDATE SET value = excluded.value')
     .run(req.session.userId, req.params.key, v);
   res.json({ success: true });

package/server/routes/telnyx.js

@@ -0,0 +1,35 @@
+'use strict';
+
+const crypto = require('crypto');
+
+/**
+ * Sets up Telnyx voice webhook route
+ * @param {import('express').Application} app 
+ */
+function setupTelnyxWebhook(app) {
+    const tokenMiddleware = (req, res, next) => {
+        const expected = process.env.TELNYX_WEBHOOK_TOKEN;
+        if (expected) {
+            const provided = req.query.token || '';
+            const a = Buffer.from(provided.padEnd(expected.length));
+            const b = Buffer.from(expected);
+            if (a.length !== b.length || !crypto.timingSafeEqual(a, b)) {
+                console.warn('[Telnyx webhook] Rejected request with invalid or missing token');
+                return res.status(403).send('Forbidden');
+            }
+        }
+        next();
+    };
+
+    app.post('/api/telnyx/webhook', tokenMiddleware, async (req, res) => {
+        res.status(200).send('OK');
+        const manager = app.locals.messagingManager;
+        if (manager) {
+            await manager.handleTelnyxWebhook(req.body).catch(err =>
+                console.error('[Telnyx webhook]', err.message)
+            );
+        }
+    });
+}
+
+module.exports = { setupTelnyxWebhook };

package/server/services/ai/compaction.js

@@ -2,9 +2,10 @@ async function compact(messages, provider, model) {
   const systemMsg = messages.find(m => m.role === 'system');
   const nonSystem = messages.filter(m => m.role !== 'system');
 
-  if (nonSystem.length < 6) return messages;
+  // Only compact once history is clearly old enough to avoid touching recent context.
+  if (nonSystem.length < 12) return messages;
 
-  const keepRecent = 6;
+  const keepRecent = 10;
   const toCompact = nonSystem.slice(0, -keepRecent);
   const recent = nonSystem.slice(-keepRecent);