@peopl-health/nexus 2.1.6 → 2.2.1

package/lib/adapters/TwilioProvider.js

@@ -121,7 +121,8 @@ class TwilioProvider extends MessageProvider {
             messageId: result.sid,
             provider: 'twilio',
             timestamp: new Date(),
-            fromMe: true
+            fromMe: true,
+            processed: true
           });
           console.log('[TwilioProvider] Message persisted successfully', { messageId: result.sid });
         } catch (storageError) {

package/lib/assistants/BaseAssistant.js

@@ -1,6 +1,7 @@
 const llmConfig = require('../config/llmConfig');
 const { Thread } = require('../models/threadModel');
-const { getLastNMessages } = require('../helpers/assistantHelper');
+const { Message } = require('../models/messageModel');
+const { formatMessage } = require('../helpers/assistantHelper');
 const { createProvider } = require('../providers/createProvider');
 
 const DEFAULT_MAX_HISTORICAL_MESSAGES = parseInt(process.env.MAX_HISTORICAL_MESSAGES || '50', 10);
@@ -165,11 +166,6 @@ class BaseAssistant {
     this._ensureClient();
     this.status = 'active';
 
-    const whatsappId = context?.whatsapp_id || code;
-    if (whatsappId) {
-      this.lastMessages = await getLastNMessages(whatsappId, DEFAULT_MAX_HISTORICAL_MESSAGES);
-    }
-
     const provider = createProvider({ variant: process.env.VARIANT || 'assistants' });
     if (!provider || typeof provider.createConversation !== 'function') {
       throw new Error('Provider not configured. Cannot create conversation.');
@@ -189,12 +185,39 @@ class BaseAssistant {
     return this.thread;
   }
 
-  async buildInitialMessages({ code }) {
-    if (!this.lastMessages) return [];
-    return [{
-      role: 'assistant',
-      content: `Últimos mensajes para ${code}: \n${this.lastMessages}`
-    }];
+  async buildInitialMessages({ code, context = {} }) {
+    const whatsappId = context?.whatsapp_id || code;
+    if (!whatsappId) {
+      return [];
+    }
+
+    try {
+      const lastMessages = await Message.find({ numero: whatsappId })
+        .sort({ createdAt: -1 })
+        .limit(DEFAULT_MAX_HISTORICAL_MESSAGES);
+
+      if (!lastMessages || lastMessages.length === 0) {
+        return [];
+      }
+
+      const messagesInOrder = lastMessages.reverse();
+
+      // Messages with from_me: true are assistant messages, from_me: false are user messages
+      const formattedMessages = messagesInOrder
+        .filter(message => message && message.timestamp && message.body && message.body.trim() !== '')
+        .map(message => {
+          const formattedText = formatMessage(message);
+          return formattedText ? { role: message.from_me ? 'assistant' : 'user', content: formattedText } : null;
+        })
+        .filter(message => message !== null); // Remove any null entries
+
+      console.log(`[buildInitialMessages] Built ${formattedMessages.length} initial messages for ${code}`);
+      
+      return formattedMessages;
+    } catch (error) {
+      console.error('[buildInitialMessages] Error fetching messages:', error);
+      return [];
+    }
   }
 
   async close() {

package/lib/controllers/bugReportController.js

@@ -6,7 +6,7 @@ async function logBugReportToAirtable(reporter, whatsapp_id, description, severi
   try {
     let conversation = null;
     if (messageIds && messageIds.length > 0) {
-      const messageObjects = await Message.find({ _id: { $in: messageIds } }).sort({ timestamp: 1 });
+      const messageObjects = await Message.find({ _id: { $in: messageIds } }).sort({ createdAt: 1 });
       conversation = messageObjects.map(msg => {
         const timestamp = new Date(msg.timestamp).toISOString().slice(0, 16).replace('T', ' ');
         const role = msg.from_me ? 'Assistant' : 'Patient';

package/lib/controllers/conversationController.js

@@ -409,14 +409,14 @@ const getConversationsByNameController = async (req, res) => {
   try {
     const conversations = await Message.aggregate([
       { $match: { from_me: false, is_group: false } },
-      { $sort: { timestamp: -1 } },
+      { $sort: { createdAt: -1 } },
       { $group: {
         _id: '$numero',
         name: { $first: '$nombre_whatsapp' },
         latestMessage: { $first: '$$ROOT' },
         messageCount: { $sum: 1 }
       }},
-      { $sort: { 'latestMessage.timestamp': -1 } }
+      { $sort: { 'latestMessage.createdAt': -1 } }
     ]);
         
     res.status(200).json({

package/lib/core/NexusMessaging.js

@@ -1,5 +1,5 @@
 const { airtable, getBase } = require('../config/airtableConfig');
-const { replyAssistant } = require('../services/assistantService');
+const { addMsgAssistant, replyAssistant } = require('../services/assistantService');
 const { createProvider } = require('../adapters/registry');
 const runtimeConfig = require('../config/runtimeConfig');
 const { hasPreprocessingHandler, invokePreprocessingHandler } = require('../services/preprocessingHooks');
@@ -291,10 +291,22 @@ class NexusMessaging {
         messageId: result.messageId,
         provider: result.provider,
         timestamp: new Date(),
-        fromMe: true
+        fromMe: true,
+        processed: true
       });
     }
 
+    // Add to thread context for manual sends
+    if (messageData.origin !== 'assistant' && messageData.code && 
+      (messageData.body || messageData.message)) {
+      await addMsgAssistant(
+        messageData.code,
+        [messageData.body || messageData.message],
+        'assistant',
+        false
+      );
+    }
+
     return result;
   }
 

package/lib/helpers/assistantHelper.js

@@ -48,7 +48,7 @@ async function getLastMessages(code) {
       query.is_group = false;
     }
 
-    const lastMessages = await Message.find(query).sort({ timestamp: -1 });
+    const lastMessages = await Message.find(query).sort({ createdAt: -1 });
     console.log('[getLastMessages] lastMessages', lastMessages.map(msg => msg.body).join('\n\n'));
 
     if (lastMessages.length === 0) return [];
@@ -73,7 +73,7 @@ async function getLastMessages(code) {
 async function getLastNMessages(code, n) {
   try {
     const lastMessages = await Message.find({ numero: code })
-      .sort({ timestamp: -1 })
+      .sort({ createdAt: -1 })
       .limit(n);
 
     // Format each message and concatenate them with skip lines
@@ -172,7 +172,7 @@ async function processIndividualMessage(code, reply, provider, thread) {
   try {
     const formattedMessage = formatMessage(reply);
     console.log('[processIndividualMessage] formattedMessage:', formattedMessage);
-    const isNotAssistant = !reply.from_me;
+    const isPatient = reply.origin === 'patient';
     let messagesChat = [];
     let url = null;
 
@@ -247,13 +247,18 @@ async function processIndividualMessage(code, reply, provider, thread) {
     console.log('[processIndividualMessage] messagesChat', messagesChat);
 
     const threadId = thread.getConversationId();
-    if (isNotAssistant) {
+    if (reply.origin === 'whatsapp_platform') {
+      await provider.addMessage({
+        threadId,
+        role: 'assistant',
+        content: messagesChat
+      });
+    } else if (reply.origin === 'patient') {
       await provider.addMessage({
         threadId,
         role: 'user',
         content: messagesChat
       });
-      console.log(`[processIndividualMessage] User message added to thread ${threadId}`);
     }
 
     await Message.updateOne(
@@ -261,7 +266,7 @@ async function processIndividualMessage(code, reply, provider, thread) {
       { $set: { assistant_id: thread.getAssistantId(), thread_id: threadId } }
     );
 
-    return {isNotAssistant, url};
+    return {isPatient, url};
   } catch (err) {
     console.log(`Error inside process message ${err}`);
   } finally {

package/lib/helpers/baileysHelper.js

@@ -110,15 +110,15 @@ async function isRecentMessage(chatId) {
 
   const recentMessage = await Message.find({
     $or: [{ group_id: chatId }, { numero: chatId }],
-    timestamp: { $gte: fiveMinutesAgo.toISOString() }
-  }).sort({ timestamp: -1 }).limit(1);
+    createdAt: { $gte: fiveMinutesAgo }
+  }).sort({ createdAt: -1 }).limit(1);
 
   return !!recentMessage;
 }
 
 async function getLastMessages(chatId, n) {
   const messages = await Message.find({ group_id: chatId })
-    .sort({ timestamp: -1 })
+    .sort({ createdAt: -1 })
     .limit(n)
     .select('timestamp numero nombre_whatsapp body');
 

package/lib/helpers/twilioHelper.js

@@ -70,8 +70,8 @@ async function isRecentMessage(chatId) {
 
   const recentMessage = await Message.find({
     $or: [{ group_id: chatId }, { numero: chatId }],
-    timestamp: { $gte: fiveMinutesAgo.toISOString() }
-  }).sort({ timestamp: -1 }).limit(1);
+    createdAt: { $gte: fiveMinutesAgo }
+  }).sort({ createdAt: -1 }).limit(1);
 
   return !!recentMessage;
 }
@@ -79,7 +79,7 @@ async function isRecentMessage(chatId) {
 
 async function getLastMessages(chatId, n) {
   const messages = await Message.find({ numero: chatId })
-    .sort({ timestamp: -1 })
+    .sort({ createdAt: -1 })
     .limit(n)
     .select('timestamp numero nombre_whatsapp body');
 

package/lib/models/messageModel.js

@@ -57,6 +57,7 @@ const messageSchema = new mongoose.Schema({
 }, { timestamps: true });
 
 messageSchema.index({ message_id: 1, timestamp: 1 }, { unique: true });
+messageSchema.index({ numero: 1, createdAt: -1 });
 
 messageSchema.pre('save', function (next) {
   if (this.timestamp) {
@@ -157,7 +158,10 @@ function getMessageValues(message, content, reply, is_media) {
 
 async function getContactDisplayName(contactNumber) {
   try {
-    const latestMessage = await Message.findOne({ numero: contactNumber })
+    const latestMessage = await Message.findOne({ 
+      numero: contactNumber,
+      from_me: false
+    })
       .sort({ createdAt: -1 })
       .select('nombre_whatsapp');
 

package/lib/services/assistantService.js

@@ -230,7 +230,7 @@ const createAssistant = async (code, assistant_id, messages=[], force=false) =>
   return thread;
 };
 
-const addMsgAssistant = async (code, inMessages, reply = false) => {
+const addMsgAssistant = async (code, inMessages, role = 'user', reply = false) => {
   try {
     const thread = await Thread.findOne({ code: code });
     console.log(thread);
@@ -241,7 +241,7 @@ const addMsgAssistant = async (code, inMessages, reply = false) => {
       console.log(message);
       await provider.addMessage({
         threadId: thread.getConversationId(),
-        role: 'assistant',
+        role: role,
         content: message
       });
     }
@@ -269,7 +269,7 @@ const addMsgAssistant = async (code, inMessages, reply = false) => {
   }
 };
 
-const addInsAssistant = async (code, instruction) => {
+const addInsAssistant = async (code, instruction, role = 'user') => {
   try {
     const thread = await Thread.findOne({ code: code });
     console.log(thread);
@@ -286,7 +286,7 @@ const addInsAssistant = async (code, instruction) => {
         runConfig: {
           additionalInstructions: instruction,
           additionalMessages: [
-            { role: 'user', content: instruction }
+            { role: role, content: instruction }
           ]
         }
       }));
@@ -328,7 +328,7 @@ const getThread = async (code, message = null) => {
       if (run.status === 'cancelled' || run.status === 'expired' || run.status === 'completed') {
         await Thread.updateOne({ code: code }, { $set: { run_id: null } });
       }
-      thread = await Thread.findOne({ code: code, active: true });
+      thread = await Thread.findOne({ code: code });
       await delay(5000);
     }
 
@@ -353,7 +353,7 @@ const replyAssistant = async function (code, message_ = null, thread_ = null, ru
   try {
     let thread = thread_ || await getThread(code);
     console.log('THREAD STOPPED', code, thread?.active);
-    if (!thread || !thread.active || thread.stopped) return null;
+    if (!thread) return null;
 
     const patientReply = await getLastMessages(code);
     if (!patientReply) {
@@ -375,9 +375,9 @@ const replyAssistant = async function (code, message_ = null, thread_ = null, ru
     let patientMsg = false;
     let urls = [];
     for (const reply of patientReply) {
-      const { isNotAssistant, url } = await processIndividualMessage(code, reply, provider, thread);
-      console.log(`isNotAssistant ${isNotAssistant} ${url}`);
-      patientMsg = patientMsg || isNotAssistant;
+      const { isPatient, url } = await processIndividualMessage(code, reply, provider, thread);
+      console.log(`isPatient ${isPatient} ${url}`);
+      patientMsg = patientMsg || isPatient;
       if (url) urls.push({ 'url': url });
     }
        
@@ -395,7 +395,7 @@ const replyAssistant = async function (code, message_ = null, thread_ = null, ru
       }
     }
 
-    if (!patientMsg) return null;
+    if (!patientMsg || thread.stopped) return null;
 
     const assistant = getAssistantById(thread.getAssistantId(), thread);
     assistant.setReplies(patientReply);

package/lib/storage/MongoStorage.js

@@ -45,6 +45,7 @@ class MongoStorage {
       const enrichedMessage = await this._enrichTwilioMedia(messageData);
       console.log('[MongoStorage] Enriched message', enrichedMessage);
       const values = this.buildMessageValues(enrichedMessage);
+      console.log('[MongoStorage] Message values', values);
       const { insertMessage } = require('../models/messageModel');
       await insertMessage(values);
       console.log('[MongoStorage] Message stored');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peopl-health/nexus",
-  "version": "2.1.6",
+  "version": "2.2.1",
   "description": "Core messaging and assistant library for WhatsApp communication platforms",
   "keywords": [
     "whatsapp",