@peopl-health/nexus 3.1.6 → 3.2.1

package/lib/core/NexusMessaging.js

@@ -695,7 +695,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 +709,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 +729,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)) {

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/helpers/messageHelper.js

@@ -59,11 +59,17 @@ async function getLastMessages(code) {
   }
 }
 
-async function getLastNMessages(code, n) {
+// Create a variable to use as a chackpoint
+async function getLastNMessages(code, n, before=null) {
   try {
-    const lastMessages = await Message.find({ numero: code })
+    const query = { numero: code };
+
+    if (before) query.createdAt = { $lte: before };
+
+    const lastMessages = await Message.find(query)
       .sort({ createdAt: -1 })
-      .limit(n);
+      .limit(n)
+      .lean();
 
     if (!lastMessages || lastMessages.length === 0) {
       logger.info(`[getLastNMessages] No messages found for code: ${code ? `${code.substring(0, 3)}***${code.slice(-4)}` : 'unknown'}, limit: ${n}`);

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,
@@ -201,7 +202,7 @@ class OpenAIResponsesProvider {
       logger.info('[OpenAIResponsesProvider] Context built', {
         conversationId,
         assistantId,
-        lastContext: context[-1] || null
+        context
       });
 
       const filter = thread.code ? { code: thread.code, active: true } : null;
@@ -292,7 +293,7 @@ class OpenAIResponsesProvider {
 
       const promptConfig = { id: assistantId };
       if (promptVariables) promptConfig.variables = promptVariables;
-      if (promptVersion) promptConfig.version = promptVersion;
+      if (promptVersion) promptConfig.version = String(promptVersion);
       logger.info('[OpenAIResponsesProvider] Prompt config', { promptConfig });
 
       const makeAPICall = (inputData) => retryWithBackoff(() => 

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) {
@@ -158,7 +159,9 @@ const replyAssistantCore = async (code, message_ = null, thread_ = null, runOpti
     const finalThread = thread;
 
     const messagesStart = Date.now();
-    const lastMessage = await getLastNMessages(code, 1);
+    const beforeCheckpoint = message_?.createdAt ? 
+      (message_.createdAt.$date ? new Date(message_.createdAt.$date) : message_.createdAt) : null;
+    const lastMessage = await getLastNMessages(code, 1, beforeCheckpoint);
     timings.get_messages_ms = Date.now() - messagesStart;
     
     if (!lastMessage || lastMessage.length === 0 || lastMessage[0].from_me) {

package/package.json

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

package/MIGRATION_GUIDE.md

@@ -1,80 +0,0 @@
-# Migration Guide
-
-This guide summarizes changes introduced in the current Nexus library refresh to help you migrate quickly with minimal breakage.
-
-## TL;DR
-- Twilio remains first‑class; Baileys is supported for messaging but not for templates/flows (returns clear errors).
-- Message sends accept both `to` (preferred) and legacy `code` (normalized internally).
-- Templates and flows are supported through Twilio Content API; provider is auto‑injected into template controllers on `Nexus.initialize()` when Twilio is active.
-- New event bus + middleware model; existing handlers continue to work.
-- Storage adapter registry; use built‑in `mongo`/`noop` or plug your own adapter or instance.
-- Interactive/flows now have a provider‑agnostic API with Twilio mapping and event‑driven routing.
-- Assistant registry with optional override for `getAssistantById`.
-
-## Messaging API
-- BREAKING (soft): Prefer `to` over `code` in `sendMessage`. Legacy `code` is still accepted and normalized internally.
-
-Before:
-```js
-await nexus.sendMessage({ code: 'whatsapp:+521555...', message: 'Hi' });
-```
-After (preferred):
-```js
-await nexus.sendMessage({ code: '+521555...', message: 'Hi' });
-```
-
-## Templates & Flows (Twilio)
-- Twilio provider now implements content operations: `listTemplates`, `getTemplate`, `createTemplate`, `deleteTemplate`, `submitForApproval`, `checkApprovalStatus`.
-- On `Nexus.initialize()` with Twilio, the provider is auto‑injected into template controllers — default routes under `/api/template` work immediately.
-- Baileys: content/template operations are not supported; a clear error is thrown if called.
-
-## Interactive & Flows (Provider‑agnostic)
-- New helper APIs:
-  - `registerFlow(id, spec)`, `sendInteractive(nexus, { to, id | spec, variables })`.
-  - Twilio: spec is converted to Content API payload and sent; if `spec.contentSid` is provided, it is used directly.
-  - Baileys: currently unsupported.
-- Event‑driven routing:
-  - `registerInteractiveHandler(match, handler)` and `attachInteractiveRouter(nexus)`; handlers are called when interactive messages are received.
-
-## Middleware & Events
-- New event bus on `NexusMessaging`: subscribe to `*:received` and `*:handled` (message, media, interactive, command, keyword, flow).
-- New middleware: `nexus.getMessaging().use(type?, async (msg, nexus, next) => { ... })`.
-- Existing `setHandlers` and `onMessage`/`onInteractive`/etc. continue to work.
-
-## Storage
-- Storage is now pluggable via a registry:
-  - Built‑ins: `mongo` (default), `noop`.
-  - Register your adapter: `registerStorage('src', MyStorageClass)` then `storage: 'src'`.
-  - Or pass an instance: `storage: new MyStorageClass()`.
-- If the adapter has `connect()`, Nexus calls it automatically.
-- Controllers that rely on your Mongo models can continue to do so — no change required.
-
-## Assistants
-- Register assistant classes at init:
-```js
-await nexus.initialize({
-  provider: 'twilio',
-  llm: 'openai', llmConfig: { apiKey: process.env.OPENAI_API_KEY },
-  assistants: {
-    registry: { SUPPORT: SupportAssistantClass, SALES: SalesAssistantClass },
-    getAssistantById: (id, thread) => null // optional override
-  }
-});
-```
-- An internal override for `getAssistantById` is supported; if provided, it is tried first, then fallback to registry.
-
-## Utilities & Fixes
-- Utils index corrected to export existing files: `{ DefaultLLMProvider, MessageParser, logger }`.
-- Default OpenAI import fixed for CommonJS: `const OpenAI = require('openai');`.
-- Message model helpers unified; `LegacyMessage` references replaced with `Message` and a new exported `insertMessage`.
-- Types `declare module` now matches package name: `@peopl-health/nexus`.
-
-## Routes
-- Built‑in route bundles remain available and importable via `setupDefaultRoutes(app)` or per‑group via `routes` + `createRouter()`.
-
-## Testing
-- If your environment restricts forking, run Jest in‑band: `jest --runInBand`.
-
-## Notes
-- Twilio approvals data shape varies by account/region. The provider looks up `content.links` and falls back to the documented REST path; data is normalized where possible.
-- Baileys: templates/flows remain unsupported; messaging and media send/receive are supported.