neoagent 2.4.1-beta.36 → 2.4.1-beta.37

package/server/routes/agents.js

@@ -186,7 +186,7 @@ router.post('/:id/abort', (req, res) => {
     const run = db.prepare('SELECT id FROM agent_runs WHERE id = ? AND user_id = ?').get(req.params.id, req.session.userId);
     if (!run) return res.status(404).json({ error: 'Run not found' });
     const engine = req.app.locals.agentEngine;
-    engine.abort(req.params.id);
+    engine.abort(req.params.id, { userId: req.session.userId });
     res.json({ success: true });
   } catch (err) {
     res.status(500).json({ error: sanitizeError(err) });

package/server/routes/auth.js

@@ -129,7 +129,9 @@ function readAuthenticatedUser(req) {
   if (!user) {
     try {
       req.session.destroy(() => {});
-    } catch (_) {}
+    } catch (destroyError) {
+      console.warn('Auth stale-session cleanup failed:', destroyError.message);
+    }
     return null;
   }
   return user;

package/server/routes/screenHistory.js

@@ -2,21 +2,24 @@
 
 const express = require('express');
 const db = require('../db/database');
+const { buildFtsQuery } = require('../db/ftsQuery');
+const { requireAuth } = require('../middleware/auth');
 const { getErrorMessage } = require('../services/bootstrap_helpers');
 
 const router = express.Router();
 
+router.use(requireAuth);
+
 router.get('/search', (req, res) => {
   const { q, limit = 50, offset = 0 } = req.query;
-
-  if (!req.user || !req.user.id) {
-    return res.status(401).json({ error: 'Unauthorized' });
-  }
+  const userId = req.session.userId;
 
   try {
     let results = [];
-    if (q) {
-      // Full text search
+    const ftsQuery = q ? buildFtsQuery(q) : null;
+    if (ftsQuery) {
+      // Full text search. buildFtsQuery sanitizes user input so FTS5 operator
+      // characters (hyphens, AND/OR/NOT) don't throw and 500 the request.
       results = db.prepare(`
         SELECT s.id, s.timestamp, s.app_name, s.text_content
         FROM screen_history_fts fts
@@ -24,7 +27,10 @@ router.get('/search', (req, res) => {
         WHERE screen_history_fts MATCH ? AND s.user_id = ?
         ORDER BY s.timestamp DESC
         LIMIT ? OFFSET ?
-      `).all(q, req.user.id, Number(limit), Number(offset));
+      `).all(ftsQuery, userId, Number(limit), Number(offset));
+    } else if (q) {
+      // Query had no usable search tokens — return no matches rather than error.
+      results = [];
     } else {
       // Recent history
       results = db.prepare(`
@@ -33,7 +39,7 @@ router.get('/search', (req, res) => {
         WHERE user_id = ?
         ORDER BY timestamp DESC
         LIMIT ? OFFSET ?
-      `).all(req.user.id, Number(limit), Number(offset));
+      `).all(userId, Number(limit), Number(offset));
     }
 
     res.json({ results });

package/server/routes/triggers.js

@@ -13,10 +13,10 @@ router.post('/geofence', async (req, res) => {
   const { label, latitude, longitude, radius_meters, action } = req.body;
 
   try {
-    const userRow = db.prepare('SELECT id FROM users WHERE id = ?').get(req.user.id);
+    const userRow = db.prepare('SELECT id FROM users WHERE id = ?').get(req.session.userId);
     if (!userRow) return res.status(401).json({ error: 'Unauthorized' });
 
-    console.log(`[Triggers] Geofence entered: ${label} by user ${req.user.id}`);
+    console.log(`[Triggers] Geofence entered: ${label} by user ${req.session.userId}`);
 
     res.json({ success: true, message: 'Geofence trigger processed' });
   } catch (err) {
@@ -29,14 +29,14 @@ router.post('/geofence', async (req, res) => {
   Promise.resolve().then(() => {
     const agentEngine = req.app.locals.agentEngine;
     if (!agentEngine) return;
-    const defaultAgentId = db.prepare('SELECT id FROM agents WHERE user_id = ? ORDER BY is_default DESC LIMIT 1').get(req.user.id)?.id;
+    const defaultAgentId = db.prepare('SELECT id FROM agents WHERE user_id = ? ORDER BY is_default DESC LIMIT 1').get(req.session.userId)?.id;
     if (!defaultAgentId) return;
     const prompt = [
       `A geofence event was triggered.`,
       `Location label: ${label || 'unknown'}`,
       action ? `Suggested action: ${action}` : 'Check if there are any active reminders or tasks related to this location.',
     ].join('\n');
-    return agentEngine.run(req.user.id, prompt, {
+    return agentEngine.run(req.session.userId, prompt, {
       agentId: defaultAgentId,
       triggerSource: 'tasks',
       context: { source: 'geofence', label, latitude, longitude, radius_meters },

package/server/services/ai/completion.js

@@ -0,0 +1,44 @@
+'use strict';
+
+// Decides whether the agent may accept a `task_complete` signal, balancing the
+// model's self-reported confidence against the confidence the run requires.
+
+function normalizeCompletionConfidence(value) {
+  const normalized = String(value || '').trim().toLowerCase();
+  if (normalized === 'high' || normalized === 'medium' || normalized === 'low') return normalized;
+  return 'medium';
+}
+
+function completionConfidenceRank(value) {
+  const normalized = normalizeCompletionConfidence(value);
+  if (normalized === 'high') return 3;
+  if (normalized === 'medium') return 2;
+  return 1;
+}
+
+function shouldAcceptTaskComplete({ confidence, requiredConfidence, iteration, maxIterations }) {
+  const required = normalizeCompletionConfidence(requiredConfidence || 'medium');
+  const actual = normalizeCompletionConfidence(confidence || 'medium');
+  if (completionConfidenceRank(actual) >= completionConfidenceRank(required)) {
+    return { accept: true, reason: '' };
+  }
+
+  const iterationsRemaining = Math.max(0, Number(maxIterations || 0) - Number(iteration || 0));
+  if (iterationsRemaining <= 1) {
+    return {
+      accept: true,
+      reason: `Accepted ${actual}-confidence completion at the iteration limit; final verifier will calibrate the answer.`,
+    };
+  }
+
+  return {
+    accept: false,
+    reason: `Completion confidence "${actual}" is below required "${required}". Continue with verification, recovery, or a narrower truthful result before completing.`,
+  };
+}
+
+module.exports = {
+  normalizeCompletionConfidence,
+  completionConfidenceRank,
+  shouldAcceptTaskComplete,
+};