@peopl-health/nexus 3.2.0 → 3.2.2

package/lib/core/NexusMessaging.js

@@ -46,11 +46,12 @@ class NexusMessaging {
     this.activeRequests = new Map(); // Track active AI requests per chat
     this.abandonedRuns = new Set(); // Track runs that should be ignored
     this.batchingConfig = {
-      enabled: config.messageBatching?.enabled ?? true, // Enabled by default with check-after
-      abortOnNewMessage: config.messageBatching?.abortOnNewMessage ?? true, // Abort ongoing AI calls when new messages arrive
-      immediateRestart: config.messageBatching?.immediateRestart ?? true, // Start new processing immediately without waiting
-      batchWindowMs: config.messageBatching?.batchWindowMs ?? 2000, // Wait up to 2s for message bursts
-      maxBatchWait: config.messageBatching?.maxBatchWait ?? 5000 // Maximum time to wait for batching
+      enabled: config.messageBatching?.enabled ?? true,
+      abortOnNewMessage: config.messageBatching?.abortOnNewMessage ?? true,
+      immediateRestart: config.messageBatching?.immediateRestart ?? true,
+      batchWindowMs: config.messageBatching?.batchWindowMs ?? 2000,
+      maxBatchWait: config.messageBatching?.maxBatchWait ?? 5000,
+      typingIndicator: config.messageBatching?.typingIndicator ?? false
     };
   }
 
@@ -695,7 +696,9 @@ class NexusMessaging {
   async _processWithLock(chatId, existingTypingInterval = null) {
     this.processingLocks.set(chatId, true);
     let typingInterval = existingTypingInterval;
-    let runId = null;
+    
+    const runId = `run_${Date.now()}_${Math.random().toString(36).substring(7)}`;
+    this.activeRequests.set(chatId, runId);
 
     try {
       if (!typingInterval) {
@@ -707,6 +710,12 @@ class NexusMessaging {
       let lastCount = messageCount;
       
       while (Date.now() - startTime < this.batchingConfig.batchWindowMs) {
+        if (this.abandonedRuns.has(runId)) {
+          logger.info(`[Batching] Run ${runId} abandoned during batching for ${chatId}`);
+          this.abandonedRuns.delete(runId);
+          return;
+        }
+        
         await new Promise(resolve => setTimeout(resolve, 500));
         const newCount = await this._getUnprocessedMessageCount(chatId);
         
@@ -721,11 +730,14 @@ class NexusMessaging {
         }
       }
       
+      if (this.abandonedRuns.has(runId)) {
+        logger.info(`[CheckAfter] Run ${runId} abandoned before AI call for ${chatId}`);
+        this.abandonedRuns.delete(runId);
+        return;
+      }
+      
       logger.info(`[CheckAfter] Processing ${lastCount} messages for ${chatId} after batching`);
 
-      runId = `run_${Date.now()}_${Math.random().toString(36).substring(7)}`;
-      this.activeRequests.set(chatId, runId);
-
       const result = await this._processMessages(chatId, () => replyAssistant(chatId, null, null, { runId }));
       
       if (this.abandonedRuns.has(runId)) {
@@ -814,7 +826,7 @@ class NexusMessaging {
    * Start typing indicator refresh interval
    */
   async _startTypingRefresh(chatId) {
-    if (!this.provider || typeof this.provider.sendTypingIndicator !== 'function') {
+    if (!this.batchingConfig.typingIndicator || !this.provider || typeof this.provider.sendTypingIndicator !== 'function') {
       return null;
     }
 

package/lib/helpers/assistantHelper.js

@@ -16,6 +16,7 @@ function getCurRow(baseID, code) {
 const runAssistantAndWait = async ({
   thread,
   assistant,
+  message = null,
   runConfig = {}
 }) => {
   if (!thread || !thread.getConversationId()) {
@@ -34,6 +35,7 @@ const runAssistantAndWait = async ({
     async (currentThread = thread) => {
       return await provider.executeRun({
         thread: currentThread,
+        message,
         assistant,
         tools,
         config,
@@ -58,7 +60,7 @@ const runAssistantWithRetries = async (thread, assistant, runConfig, patientRepl
       'thread.id': thread.getConversationId(),
       'assistant.id': thread.getAssistantId() 
     })
-  )({ thread, assistant, runConfig });
+  )({ thread, assistant, runConfig, message: patientReply });
   
   const predictionTimeMs = Date.now() - startTime;
   

package/lib/memory/DefaultMemoryManager.js

@@ -11,26 +11,26 @@ class DefaultMemoryManager extends MemoryManager {
     this.maxHistoricalMessages = parseInt(process.env.MAX_HISTORICAL_MESSAGES || '50', 10);
   }
 
-  async buildContext({ thread, config = {} }) {
+  async buildContext({ thread, message = null, config = {} }) {
     this._logActivity('Building context', { threadCode: thread.code });
 
     try {
-      const allMessages = await getLastNMessages(thread.code, this.maxHistoricalMessages);
-      const additionalMessages = config.additionalMessages || [];
+      const beforeCheckpoint = message ? message.createdAt : null;
+      const allMessages = await getLastNMessages(thread.code, this.maxHistoricalMessages, beforeCheckpoint);
       
       if (!allMessages?.length) {
-        return additionalMessages;
+        return [];
       }
 
       const messageContext = allMessages.reverse().flatMap(msg => {
         const formattedContents = formatMessage(msg);
         return formattedContents.map(content => ({
-          role: msg.origin === 'patient' ? 'user' : 'assistant',
+          role: msg.origin === 'instruction' ? 'developer' : msg.origin === 'patient' ? 'user' : 'assistant',
           content: content || msg.body || msg.content || ''
         }));
       }).filter(msg => msg.content);
 
-      return [...additionalMessages, ...messageContext];
+      return messageContext;
     } catch (error) {
       logger.error('[DefaultMemoryManager] Context building failed', {
         threadCode: thread.code,

package/lib/providers/OpenAIResponsesProvider.js

@@ -173,7 +173,7 @@ class OpenAIResponsesProvider {
   /**
    * Main entry point for running assistant
    */
-  async executeRun({ thread, assistant, tools = [], config = {} }) {
+  async executeRun({ thread, assistant, message = null, tools = [], config = {} }) {
     const { conversationId, assistantId } = this._normalizeThread(thread);
     const promptVersion = thread?.version || null;
     
@@ -187,6 +187,7 @@ class OpenAIResponsesProvider {
       // Delegate context building to conversation manager
       const context = await this.conversationManager.buildContext({
         thread,
+        message,
         config: {
           ...config,
           threadId: conversationId,

package/lib/services/assistantServiceCore.js

@@ -112,14 +112,8 @@ const addInstructionCore = async (code, instruction, role = 'system') => {
 
   try {
     const assistant = getAssistantById(thread.getAssistantId(), thread);
-    const runResult = await runAssistantWithRetries(thread, assistant, {
-      additionalInstructions: instruction,
-      additionalMessages: [
-        { role: role, content: instruction }
-      ]
-    });
 
-    // Save instruction message to database for frontend visibility
+    // Save instruction message to database
     try {
       const message_id = `instruction_${Date.now()}_${Math.random().toString(36).substring(7)}`;
       await insertMessage({
@@ -137,6 +131,13 @@ const addInstructionCore = async (code, instruction, role = 'system') => {
       logger.error('[addInstructionCore] Error saving instruction message', { err });
     }
 
+    const runResult = await runAssistantWithRetries(thread, assistant, {
+      additionalInstructions: instruction,
+      additionalMessages: [
+        { role: role, content: instruction }
+      ]
+    });
+
     logger.info('[addInstructionCore] Run response', { output: runResult?.output });
     return runResult?.output || null;
   } catch (error) {

package/package.json

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