neoagent 1.4.8 → 1.4.10

package/package.json

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

package/server/services/ai/engine.js

@@ -243,7 +243,9 @@ class AgentEngine {
     this.emit(userId, 'run:start', { runId, title: runTitle, model, triggerType, triggerSource });
 
     const systemPrompt = await this.buildSystemPrompt(userId, { ...(options.context || {}), userMessage });
-    const builtInTools = this.getAvailableTools(app);
+    // Pass short descriptions so the model always knows every available tool.
+    // compactToolDefinition caps tool desc at 120 chars, param desc at 70 chars.
+    const builtInTools = this.getAvailableTools(app, { includeDescriptions: true });
     const mcpManager = app?.locals?.mcpManager || app?.locals?.mcpClient || this.mcpManager;
     const mcpTools = mcpManager ? mcpManager.getAllTools(userId) : [];
     const tools = selectToolsForTask(userMessage, builtInTools, mcpTools, options);
@@ -468,17 +470,21 @@ class AgentEngine {
 
       const runMeta = this.activeRuns.get(runId);
       const messagingSent = runMeta?.messagingSent || false;
-      const lastToolName = runMeta?.lastToolName;
-      const lastToolTarget = runMeta?.lastToolTarget;
       this.activeRuns.delete(runId);
       this.emit(userId, 'run:complete', { runId, content: lastContent, totalTokens, iterations: iteration, triggerSource });
 
-      const lastActionWasSendToChat = lastToolName === 'send_message' && lastToolTarget === options.chatId;
-      if (triggerSource === 'messaging' && options.source && options.chatId && (!lastActionWasSendToChat || forcedFinalResponse)) {
-        if (lastContent && lastContent.trim() && lastContent.trim() !== '[NO RESPONSE]') {
+      // Fallback: if this was a messaging-triggered run and the AI never called
+      // send_message itself, auto-send its final text as a reply.
+      // We check messagingSent (not just the last tool) so a send_message followed
+      // by any other tool (memory_save, think, etc.) does NOT fire a duplicate.
+      if (triggerSource === 'messaging' && options.source && options.chatId && !messagingSent) {
+        // Strip [NO RESPONSE] markers the AI may have embedded anywhere in the text,
+        // then only send if real content remains.
+        const cleanedContent = (lastContent || '').replace(/\[NO RESPONSE\]/gi, '').trim();
+        if (cleanedContent && cleanedContent !== '[NO RESPONSE]') {
           const manager = this.messagingManager;
           if (manager) {
-            const chunks = lastContent.split(/\n\s*\n/).filter((c) => c.trim().length > 0);
+            const chunks = cleanedContent.split(/\n\s*\n/).filter((c) => c.trim().length > 0);
             (async () => {
               for (let i = 0; i < chunks.length; i++) {
                 if (i > 0) {

package/server/services/ai/toolSelector.js

@@ -1,145 +1,39 @@
-const ALWAYS_ON_TOOLS = ['notify_user'];
-
-const PACKS = {
-  code: ['execute_command', 'read_file', 'list_directory', 'search_files'],
-  web: ['web_search', 'http_request', 'browser_navigate', 'browser_extract', 'browser_click', 'browser_type', 'browser_screenshot'],
-  messaging: ['send_message', 'make_call'],
-  memory: ['memory_recall', 'session_search', 'memory_save', 'memory_update_core', 'memory_read', 'memory_write'],
-  scheduling: ['create_scheduled_task', 'schedule_run', 'list_scheduled_tasks', 'update_scheduled_task', 'delete_scheduled_task'],
-  protocols: ['manage_protocols'],
-  skills: ['create_skill', 'list_skills', 'update_skill', 'delete_skill'],
-  images: ['generate_image', 'analyze_image'],
-  tables: ['generate_table', 'generate_graph'],
-  subagents: ['spawn_subagent'],
-  mcpAdmin: ['mcp_add_server', 'mcp_list_servers', 'mcp_remove_server'],
-  health: ['read_health_data']
-};
-
-function containsAny(text, patterns) {
-  return patterns.some((pattern) => pattern.test(text));
-}
-
-function detectRequestedPacks(task = '', options = {}) {
-  const text = String(task || '').toLowerCase();
-  const packs = new Set();
-
-  if (containsAny(text, [
-    /\b(run|execute|command|shell|terminal|bash|zsh|npm|node|python|script|repo|code|bug|fix|patch|test|build|file|folder|directory|grep|search files?)\b/,
-    /\b(read|open|inspect)\s+(the\s+)?(file|repo|code)\b/
-  ])) {
-    packs.add('code');
-  }
-
-  if (containsAny(text, [
-    /\b(web|website|url|page|browser|click|navigate|scrape|search|google|lookup|http|fetch|api request|screenshot)\b/,
-    /\bopen\b.*\bsite\b/
-  ])) {
-    packs.add('web');
-  }
-
-  if (containsAny(text, [
-    /\b(message|reply|respond|text|whatsapp|telegram|discord|dm|email|call|phone|notify|send to)\b/,
-    /\[no response\]/,
-    /\bsend_message\b/,
-    /\bmake_call\b/
-  ])) {
-    packs.add('messaging');
-  }
-
-  if (containsAny(text, [
-    /\bmemory\b/,
-    /\bremember\b/,
-    /\brecall\b/,
-    /\bprevious chat\b/,
-    /\blast time\b/,
-    /\bpast conversation\b/,
-    /\bpreference\b/,
-    /\bprofile\b/,
-    /\bsoul\b/
-  ])) {
-    packs.add('memory');
-  }
-
-  if (containsAny(text, [
-    /\bschedule\b/,
-    /\bcron\b/,
-    /\bremind\b/,
-    /\brecurring\b/,
-    /\bweekly\b/,
-    /\bdaily\b/,
-    /\bone-time\b/,
-    /\btask\b.*\blater\b/
-  ])) {
-    packs.add('scheduling');
-  }
-
-  if (containsAny(text, [/\bprotocol\b/, /\bplaybook\b/])) {
-    packs.add('protocols');
-  }
-
-  if (containsAny(text, [/\bskill\b/, /\binstall skill\b/, /\bcreate skill\b/])) {
-    packs.add('skills');
-  }
-
-  if (containsAny(text, [/\bimage\b/, /\bpicture\b/, /\bphoto\b/, /\bgraph\b/, /\bchart\b/, /\btable\b/, /\bqr\b/, /\bocr\b/])) {
-    packs.add('images');
-  }
-
-  if (containsAny(text, [/\btable\b/, /\bspreadsheet\b/, /\bgraph\b/, /\bchart\b/])) {
-    packs.add('tables');
-  }
-
-  if (containsAny(text, [/\bsub-?agent\b/, /\bdelegate\b/, /\bparallel\b/, /\bbackground worker\b/])) {
-    packs.add('subagents');
-  }
-
-  if (containsAny(text, [/\bmcp\b/, /\bmodel context protocol\b/, /\bserver tool\b/])) {
-    packs.add('mcpAdmin');
-  }
-
-  if (options.mediaAttachments?.length) {
-    packs.add('images');
-  }
-
-  if (containsAny(text, [/\bhealth\b/, /\bfitness\b/, /\bsteps\b/, /\bsleep\b/, /\bheart rate\b/, /\bworkout\b/, /\bblood\b/, /\bsamsung health\b/, /\bhealth connect\b/])) {
-    packs.add('health');
-  }
-
-  return packs;
-}
-
-function maybeSelectMcpTools(text, mcpTools = []) {
-  const normalized = String(text || '').toLowerCase();
-  if (!normalized || !mcpTools.length) return [];
-
+'use strict';
+
+/**
+ * Tool selection strategy:
+ *
+ * Built-ins: always passed in full — descriptions are capped short by
+ * compactToolDefinition({ includeDescriptions: true }) in tools.js, so the
+ * overhead is a fixed ~100 tokens/tool and the model always knows every tool
+ * that exists.
+ *
+ * MCP tools: user-defined and potentially numerous. Include all when the set
+ * is small; keyword-filter when the registry grows large.
+ */
+
+const MCP_ALWAYS_INCLUDE_THRESHOLD = 20;
+
+function selectMcpTools(task, mcpTools = []) {
+  if (!mcpTools.length) return [];
+  if (mcpTools.length <= MCP_ALWAYS_INCLUDE_THRESHOLD) return mcpTools;
+
+  // Large MCP registry: match by tool name, original name, or server id so we
+  // still surface the right tools without dumping hundreds of schemas.
+  const normalized = String(task || '').toLowerCase();
   const explicitMcp = /\bmcp\b|\bmodel context protocol\b/.test(normalized);
+
   return mcpTools.filter((tool) => {
+    if (explicitMcp) return true;
     const name = String(tool.name || '').toLowerCase();
     const original = String(tool.originalName || '').toLowerCase();
     const server = String(tool.serverId || '').toLowerCase();
-    return explicitMcp || normalized.includes(name) || normalized.includes(original) || (server && normalized.includes(server));
+    return normalized.includes(name) || normalized.includes(original) || (server && normalized.includes(server));
   });
 }
 
-function selectToolsForTask(task, builtInTools = [], mcpTools = [], options = {}) {
-  const packs = detectRequestedPacks(task, options);
-  const allowNames = new Set(ALWAYS_ON_TOOLS);
-
-  for (const pack of packs) {
-    for (const toolName of PACKS[pack] || []) {
-      allowNames.add(toolName);
-    }
-  }
-
-  const selectedBuiltIns = builtInTools.filter((tool) => allowNames.has(tool.name));
-  const selectedMcp = maybeSelectMcpTools(task, mcpTools);
-
-  return [...selectedBuiltIns, ...selectedMcp];
+function selectToolsForTask(task, builtInTools = [], mcpTools = [], _options = {}) {
+  return [...builtInTools, ...selectMcpTools(task, mcpTools)];
 }
 
-module.exports = {
-  ALWAYS_ON_TOOLS,
-  PACKS,
-  detectRequestedPacks,
-  selectToolsForTask
-};
+module.exports = { selectToolsForTask, selectMcpTools };

package/server/services/ai/tools.js

@@ -588,7 +588,7 @@ function getAvailableTools(app, options = {}) {
             parameters: {
                 type: 'object',
                 properties: {
-                    metric_type: { type: 'string', description: 'The specific metric to query, e.g. "Steps", "HeartRate", "SleepSession". Optional.' },
+                    metric_type: { type: 'string', description: 'The specific metric to query, e.g. "steps", "heart_rate", "sleep_session", "exercise_session", "weight". Use the summary (no metric_type) first to see what\'s available. Optional.' },
                     limit: { type: 'number', description: 'Maximum number of recent records to return if metric_type is specified (default 50, max 200).' }
                 }
             }

package/server/services/health/ingestion.js

@@ -169,6 +169,15 @@ function getHealthSyncStatus(userId) {
   };
 }
 
+function normalizeMetricType(raw) {
+  // Accept any casing/spacing: "HeartRate" → "heart_rate", "Steps" → "steps", etc.
+  return String(raw || '')
+    .trim()
+    .replace(/([a-z])([A-Z])/g, '$1_$2')  // camelCase/PascalCase → snake_case
+    .replace(/[\s-]+/g, '_')               // spaces/dashes → underscore
+    .toLowerCase();
+}
+
 function readHealthData(userId, metricType, limit = 50) {
   if (!metricType) {
     const metrics = db.prepare(`
@@ -181,6 +190,8 @@ function readHealthData(userId, metricType, limit = 50) {
     return { metrics };
   }
 
+  const normalizedType = normalizeMetricType(metricType);
+
   const samples = db.prepare(`
     SELECT
       start_time, end_time, recorded_at,
@@ -191,10 +202,10 @@ function readHealthData(userId, metricType, limit = 50) {
     WHERE user_id = ? AND metric_type = ?
     ORDER BY COALESCE(end_time, recorded_at, start_time) DESC
     LIMIT ?
-  `).all(userId, metricType, limit);
+  `).all(userId, normalizedType, limit);
 
   return {
-    metricType,
+    metricType: normalizedType,
     samples: samples.map(s => ({
       ...s,
       payload: s.payload_json ? JSON.parse(s.payload_json) : null,

package/server/services/manager.js

@@ -107,8 +107,8 @@ async function startServices(app, io) {
                     : '';
 
                 const prompt = isVoiceCall
-                    ? `You are on a live phone call. The caller (${msg.senderName || msg.sender}) said:\n<caller_speech>\n${msg.content}\n</caller_speech>\n\nRespond via send_message with platform="telnyx" and to="${msg.chatId}". Note: once you successfully send your voice response, end the tool loop and output exactly [NO RESPONSE] as your final text.`
-                    : `You received a ${msg.platform} message from ${msg.senderName || msg.sender} (chat: ${msg.chatId}):\n<external_message>\n${msg.content}\n</external_message>${mediaNote}${discordContext}${sttNote}\n\nReply via send_message with platform="${msg.platform}" and to="${msg.chatId}". Note: once you successfully send your reply, end the tool loop and output exactly [NO RESPONSE] as your final text to prevent double-notifications.`;
+                    ? `You are on a live phone call. The caller (${msg.senderName || msg.sender}) said:\n<caller_speech>\n${msg.content}\n</caller_speech>\n\nRespond via send_message with platform="telnyx" and to="${msg.chatId}".`
+                    : `You received a ${msg.platform} message from ${msg.senderName || msg.sender} (chat: ${msg.chatId}):\n<external_message>\n${msg.content}\n</external_message>${mediaNote}${discordContext}${sttNote}\n\nReply via send_message with platform="${msg.platform}" and to="${msg.chatId}".`;
 
                 let convRow = db.prepare(
                     'SELECT id FROM conversations WHERE user_id = ? AND platform = ? AND platform_chat_id = ?'