@peopl-health/nexus 3.9.2 → 3.9.5

package/lib/controllers/conversationController.js

@@ -35,7 +35,7 @@ const getConversationController = async (req, res) => {
       });
     }
 
-    const { conversations, total, nameMap, unreadMap } = await fetchConversationData(filter, skip, limit);
+    const { conversations, total, nameMap } = await fetchConversationData(filter, skip, limit);
 
     if (!conversations?.length) {
       return res.status(200).json({
@@ -45,7 +45,7 @@ const getConversationController = async (req, res) => {
       });
     }
 
-    const processedConversations = await processConversations(conversations, nameMap, unreadMap);
+    const processedConversations = await processConversations(conversations, nameMap);
     const totalPages = Math.ceil(total / limit);
 
     res.status(200).json({
@@ -240,7 +240,7 @@ const searchConversationsController = async (req, res) => {
     const phoneNumbers = conversations.map(conv => conv._id).filter(Boolean);
     let airtableNameMap = {};
     let airtablePatientIdMap = {};
-    
+
     if (phoneNumbers.length > 0) {
       try {
         const BATCH_SIZE = 50;
@@ -276,10 +276,14 @@ const searchConversationsController = async (req, res) => {
     }
 
     let threadNameMap = {};
+    let threadUnreadMap = {};
     let messageNameMap = {};
     if (phoneNumbers.length > 0) {
-      const threads = await Thread.find({ code: { $in: phoneNumbers } }).select('code nombre').lean();
-      threads.forEach(t => { if (t.code && t.nombre) threadNameMap[t.code] = t.nombre; });
+      const threads = await Thread.find({ code: { $in: phoneNumbers } }).select('code nombre unreadCount').lean();
+      threads.forEach(t => {
+        if (t.code && t.nombre) threadNameMap[t.code] = t.nombre;
+        if (t.code) threadUnreadMap[t.code] = t.unreadCount || 0;
+      });
 
       const lastPatientMessages = await Message.aggregate([
         { $match: { numero: { $in: phoneNumbers }, from_me: false, nombre_whatsapp: { $exists: true, $nin: [null, ''] } } },
@@ -298,7 +302,7 @@ const searchConversationsController = async (req, res) => {
           lastMessage: '',
           lastMessageTime: new Date(),
           messageCount: 0,
-          unreadCount: 0,
+          unreadCount: threadUnreadMap[conv?._id] || 0,
           isLastMessageMedia: false,
           lastMessageType: null,
           lastMessageFromMe: false
@@ -331,7 +335,7 @@ const searchConversationsController = async (req, res) => {
         lastMessage: conv?.latestMessage?.body || '',
         lastMessageTime: conv?.latestMessage?.createdAt || conv?.latestMessage?.timestamp || new Date(),
         messageCount: conv.messageCount || 0,
-        unreadCount: 0,
+        unreadCount: threadUnreadMap[conv._id] || 0,
         isLastMessageMedia: isMedia || false,
         lastMessageType: mediaType || null,
         lastMessageFromMe: conv?.latestMessage?.from_me || false
@@ -516,6 +520,8 @@ const markMessagesAsReadController = async (req, res) => {
     if (modifiedCount > 0) {
       updateRecordByFilter(Monitoreo_ID, 'message_monitor', `{whatsapp_id} = "${phoneNumber}"`, { read: true })
         .catch(err => logger.error('[markMessagesAsRead] Failed to update message_monitor', { phoneNumber, error: err.message }));
+      Thread.findOneAndUpdate({ code: phoneNumber }, { $set: { unreadCount: 0 } })
+        .catch(err => logger.error('[markMessagesAsRead] Failed to reset thread unreadCount', { phoneNumber, error: err.message }));
     }
 
     res.status(200).json({

package/lib/helpers/templateRecoveryHelper.js

@@ -7,7 +7,9 @@ const getMessaging = () => require('../core/NexusMessaging');
 
 async function handle24HourWindowError(message, messageSid) {
   try {
-    if (!message?.body || !message?.numero) return;
+    if (!message?.body || !message?.numero || !message?._id) return;
+
+    const messageDocId = message._id;
 
     if (message?.statusInfo?.recoveryTemplateSid || message?.statusInfo?.recoverySentAt) {
       logger.info('[TemplateRecovery] Recovery already completed or in progress', { messageSid });
@@ -16,7 +18,7 @@ async function handle24HourWindowError(message, messageSid) {
 
     try {
       const claim = await Message.updateOne(
-        { message_id: messageSid, 'statusInfo.recoveryStartedAt': { $exists: false } },
+        { _id: messageDocId, 'statusInfo.recoveryStartedAt': { $exists: false } },
         { $set: { 'statusInfo.recoveryStartedAt': new Date() } }
       );
       if (!claim.modifiedCount && !claim.nModified) {
@@ -28,7 +30,7 @@ async function handle24HourWindowError(message, messageSid) {
       return;
     }
 
-    const { requireProvider, sendMessage } = getMessaging();
+    const { requireProvider } = getMessaging();
     const provider = requireProvider();
     if (typeof provider.createTemplate !== 'function') {
       logger.warn('[TemplateRecovery] Provider does not support createTemplate, skipping', { messageSid });
@@ -44,7 +46,7 @@ async function handle24HourWindowError(message, messageSid) {
     await provider.submitForApproval(twilioContent.sid, approvalName, 'UTILITY');
 
     await Message.updateOne(
-      { message_id: messageSid },
+      { _id: messageDocId },
       { $set: { 'statusInfo.recoveryTemplateSid': twilioContent.sid } }
     );
 
@@ -55,7 +57,7 @@ async function handle24HourWindowError(message, messageSid) {
       logContext: { messageSid },
       onApproved: async (prov) => {
         const claimSend = await Message.updateOne(
-          { message_id: messageSid, 'statusInfo.recoverySentAt': { $exists: false } },
+          { _id: messageDocId, 'statusInfo.recoverySentAt': { $exists: false } },
           { $set: { 'statusInfo.recoverySentAt': new Date() } }
         );
         if (!claimSend?.modifiedCount && !claimSend?.nModified) {
@@ -64,17 +66,32 @@ async function handle24HourWindowError(message, messageSid) {
         }
 
         try {
-          await sendMessage({ code: message.numero, contentSid: twilioContent.sid, variables: {} });
-          logger.info('[TemplateRecovery] Template sent', { messageSid, templateSid: twilioContent.sid });
-          try {
-            await prov.deleteTemplate(twilioContent.sid);
-            logger.info('[TemplateRecovery] Template deleted', { messageSid, templateSid: twilioContent.sid });
-          } catch (deleteErr) {
-            logger.warn('[TemplateRecovery] Failed to delete template after send', { messageSid, templateSid: twilioContent.sid, error: deleteErr.message });
+          const sendResult = await provider.sendMessage({ code: message.numero, contentSid: twilioContent.sid, variables: {} });
+          const newMessageId = sendResult?.messageId;
+          if (!newMessageId) throw new Error('Provider did not return a messageId for the recovery send');
+
+          await Message.updateOne(
+            { _id: messageDocId },
+            { $set: {
+              message_id: newMessageId,
+              content_sid: twilioContent.sid,
+              'statusInfo.previousMessageId': messageSid
+            }}
+          );
+
+          const dupCleanup = await Message.deleteMany({ message_id: newMessageId, _id: { $ne: messageDocId } });
+          if (dupCleanup?.deletedCount) {
+            logger.info('[TemplateRecovery] Removed provider-created duplicate(s)', { newMessageId, deletedCount: dupCleanup.deletedCount });
           }
+
+          logger.info('[TemplateRecovery] Recovered', { previousMessageId: messageSid, newMessageId, templateSid: twilioContent.sid });
+
+          prov.deleteTemplate(twilioContent.sid).catch(deleteErr =>
+            logger.warn('[TemplateRecovery] Failed to delete template after send', { newMessageId, templateSid: twilioContent.sid, error: deleteErr.message })
+          );
         } catch (sendErr) {
           await Message.updateOne(
-            { message_id: messageSid },
+            { _id: messageDocId },
             { $unset: { 'statusInfo.recoverySentAt': '' } }
           );
           logger.error('[TemplateRecovery] Error sending approved template', { messageSid, templateSid: twilioContent.sid, error: sendErr.message });

package/lib/helpers/threadHelper.js

@@ -52,7 +52,7 @@ const setThreadPromptId = async (code, promptId) => {
 const createPlaceholderThread = async (code) => {
   try {
     const existing = await Thread.findOne({ code });
-    if (existing) return existing;
+    if (existing?.stopped !== undefined) return existing;
 
     const nodeEnv = runtimeConfig.get('NODE_ENV');
     const assistantStatus = nodeEnv === 'production' ? 'prod' : nodeEnv === 'development' ? 'dev' : nodeEnv;

package/lib/models/messageModel.js

@@ -179,11 +179,12 @@ async function insertMessage(values) {
       messageData.tools_executed = [];
     }
 
-    await Message.findOneAndUpdate(
+    const result = await Message.findOneAndUpdate(
       { message_id: values.message_id, body: values.body },
       { $setOnInsert: messageData },
-      { upsert: true, new: true, setDefaultsOnInsert: true }
+      { upsert: true, new: true, setDefaultsOnInsert: true, includeResultMetadata: true }
     );
+    const isNew = !result?.lastErrorObject?.updatedExisting;
 
     updateRecordByFilter(Monitoreo_ID, 'message_monitor', `{whatsapp_id} = "${values.numero}"`, {
       ...(values.from_me ? { last_message_bot: values.body } : { last_message_patient: values.body, read: false }),
@@ -191,6 +192,7 @@ async function insertMessage(values) {
     }).catch(err => logger.error('[MongoStorage] Failed to update message_monitor table', { numero: values.numero, error: err.message }));
 
     logger.info('[MongoStorage] Message inserted or updated successfully');
+    return { isNew };
   } catch (err) {
     logger.error('[MongoStorage] Error inserting message', { error: err.message, stack: err.stack });
     throw err;

package/lib/models/threadModel.js

@@ -14,7 +14,8 @@ const threadSchema = new mongoose.Schema({
   review: { type: Boolean, default: false },
   version: { type: Number, default: null },
   preset_id: { type: String, default: null },
-  nextSid: { type: [String], default: [] }
+  nextSid: { type: [String], default: [] },
+  unreadCount: { type: Number, default: 0 }
 }, { timestamps: true });
 
 threadSchema.index({ code: 1, active: 1 });

package/lib/providers/OpenAIResponsesProviderTools.js

@@ -11,10 +11,7 @@ async function executeFunctionCall(assistant, call) {
   let result, success = true;
   try {
     if (hasTool(name)) {
-      const context = {
-        code: assistant?.thread?.code || ''
-      };
-      result = await registryExecuteTool(name, args, context);
+      result = await registryExecuteTool(name, args, assistant?.thread);
     } else {
       result = await assistant.executeTool(name, args);
     }

package/lib/services/conversationService.js

@@ -19,7 +19,10 @@ const BASE_MATCH = { group_id: null };
 const UNREAD_MATCH = { from_me: false, $or: [{ read: false }, { read: { $exists: false } }] };
 const PENDING_REVIEW_MATCH = { $or: [{ review: false }, { review: null }] };
 const THREAD_LOOKUP = { $lookup: { from: 'threads', localField: '_id', foreignField: 'code', as: 'threadInfo' } };
-const REVIEW_FIELD = { $addFields: { review: { $arrayElemAt: ['$threadInfo.review', 0] } } };
+const THREAD_FIELDS = { $addFields: {
+  review: { $arrayElemAt: ['$threadInfo.review', 0] },
+  unreadCount: { $ifNull: [{ $arrayElemAt: ['$threadInfo.unreadCount', 0] }, 0] }
+} };
 
 const toMap = (arr, keyFn, valFn) => arr.reduce((m, item) => {
   const key = keyFn(item);
@@ -33,8 +36,14 @@ const fetchConversationData = async (filter, skip, limit) => {
     triageIds = (triageRecords || []).map(r => r.whatsapp_id).filter(Boolean);
   }
 
+  let unreadCodes = [];
+  if (filter === 'unread') {
+    const unreadThreads = await Thread.find({ unreadCount: { $gt: 0 } }, { code: 1, _id: 0 }).lean();
+    unreadCodes = unreadThreads.map(t => t.code);
+  }
+
   const filterMap = {
-    unread: { ...BASE_MATCH, ...UNREAD_MATCH },
+    unread: { ...BASE_MATCH, numero: { $in: unreadCodes } },
     recent: { ...BASE_MATCH, createdAt: { $gt: new Date(Date.now() - 86400000) } },
     'no-response': BASE_MATCH,
     'pending-review': BASE_MATCH,
@@ -53,7 +62,7 @@ const fetchConversationData = async (filter, skip, limit) => {
     { $match: { _id: { $nin: [null, ''] } } },
     ...(filter === 'no-response' ? [{ $match: { 'latestMessage.from_me': false } }] : []),
     THREAD_LOOKUP,
-    REVIEW_FIELD,
+    THREAD_FIELDS,
     { $project: { threadInfo: 0 } },
     ...(filter === 'pending-review' ? [{ $match: PENDING_REVIEW_MATCH }] : []),
     { $sort: { 'latestMessage.createdAt': -1 } },
@@ -77,7 +86,7 @@ const fetchConversationData = async (filter, skip, limit) => {
         { $match: BASE_MATCH },
         { $group: { _id: '$numero' } },
         THREAD_LOOKUP,
-        REVIEW_FIELD,
+        THREAD_FIELDS,
         { $match: PENDING_REVIEW_MATCH },
         { $count: 'total' }
       ];
@@ -85,19 +94,19 @@ const fetchConversationData = async (filter, skip, limit) => {
     return [{ $match: filterConditions }, { $group: { _id: '$numero' } }, { $count: 'total' }];
   };
 
+  const totalPromise = filter === 'unread'
+    ? Promise.resolve(unreadCodes.length)
+    : Message.aggregate(getTotalPipeline(), { allowDiskUse: true }).then(r => r[0]?.total || 0);
+
   const startTime = Date.now();
-  const [conversations, contactNames, unreadCounts, totalResult] = await Promise.all([
+  const [conversations, contactNames, total] = await Promise.all([
     Message.aggregate(pipeline, { allowDiskUse: true }),
     Message.aggregate([
       { $match: { ...BASE_MATCH, from_me: false } },
       { $sort: { createdAt: -1 } },
       { $group: { _id: '$numero', name: { $first: '$nombre_whatsapp' } } }
     ], { allowDiskUse: true }),
-    Message.aggregate([
-      { $match: { ...BASE_MATCH, ...UNREAD_MATCH } },
-      { $group: { _id: '$numero', unreadCount: { $sum: 1 } } }
-    ], { allowDiskUse: true }),
-    Message.aggregate(getTotalPipeline(), { allowDiskUse: true })
+    totalPromise
   ]);
 
   logger.info('[fetchConversationData] Completed', { duration: Date.now() - startTime, count: conversations.length });
@@ -119,9 +128,7 @@ const fetchConversationData = async (filter, skip, limit) => {
     ...threadNameMap,
     ...airtableNameMap
   };
-  const unreadMap = toMap(unreadCounts, i => i?._id, i => i.unreadCount || 0);
-
-  return { conversations, total: totalResult[0]?.total || 0, nameMap, unreadMap };
+  return { conversations, total, nameMap };
 };
 
 const getMediaType = (media) => {
@@ -132,7 +139,7 @@ const getMediaType = (media) => {
   return type === 'application' ? 'document' : subtype === 'webp' ? 'sticker' : type;
 };
 
-const processConversations = async (conversations, nameMap, unreadMap) => {
+const processConversations = async (conversations, nameMap) => {
   const createConversation = (conv, index) => {
     const msg = conv?.latestMessage;
     const phoneNumber = conv?._id || `error_${index}`;
@@ -142,7 +149,7 @@ const processConversations = async (conversations, nameMap, unreadMap) => {
       lastMessage: msg?.body || '',
       lastMessageTime: msg?.createdAt || msg?.timestamp || new Date(),
       messageCount: conv?.messageCount || 0,
-      unreadCount: unreadMap[phoneNumber] || 0,
+      unreadCount: conv?.unreadCount || 0,
       isLastMessageMedia: !!msg?.media,
       lastMessageType: getMediaType(msg?.media),
       lastMessageFromMe: msg?.from_me || false,

package/lib/storage/MongoStorage.js

@@ -39,9 +39,14 @@ class MongoStorage {
     try {
       const enrichedMessage = await this._enrichTwilioMedia(messageData);
       const values = this.buildMessageValues(enrichedMessage);
-      await insertMessage(values);
+      const { isNew } = await insertMessage(values);
       logger.info('[MongoStorage] Message stored');
 
+      if (isNew && !values.from_me) {
+        Thread.findOneAndUpdate({ code: values.numero }, { $inc: { unreadCount: 1 } }, { upsert: true })
+          .catch(err => logger.warn('[MongoStorage] Failed to increment thread unread_count', { error: err.message }));
+      }
+
       const chatId = messageData.from;
       const messageId = messageData.id || messageData.messageId;
 

package/package.json

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