@peopl-health/nexus 5.68.0-dev.12084 → 5.68.0-dev.12126

package/lib/clinical/services/clinicalAirtableService.js

@@ -49,7 +49,6 @@ const REMINDER_TYPE_TO_AIRTABLE = {
 const PENDING_ROW_FILTER = 'IF({is_active}, "true", "false") = "true", IF({is_sent}, "true", "false") = "false"';
 const ROUTINE_OUTREACH_FILTER = 'OR({type} = "seguimiento", LEFT({schedule_id}, 9) = "recovery_")';
 const RECOVERY_FILTER = 'LEFT({schedule_id}, 9) = "recovery_"';
-// The fire trigger opens 5 min either side of reminder_date; a row still pending after that was not sent.
 const FIRE_TRIGGER_GRACE_MS = 10 * 60 * 1000;
 
 // intake.source only offers self|doctor; team_relay carries "según médico" authority.
@@ -435,8 +434,6 @@ async function hasPendingReminderForPatient({ code, withinMinutes }) {
   return Array.isArray(rows) && rows.length > 0;
 }
 
-// A row whose fire time passed unsent was skipped and is never re-triggered, and one past its expiry
-// can never fire; neither is a plan the agent or the create guard should see.
 async function readPendingFollowUpsForPatient({ code, now = new Date() }) {
   if (!code) return [];
   const rows = await airtableService.getRecordByFilter(
@@ -460,23 +457,25 @@ function isAtOrBefore(when, now) {
   return Number.isFinite(at) && at <= new Date(now).getTime();
 }
 
-/*
- * Another check-in about to reach this patient: a net's patient check-in or another routine
- * follow-up due within `withinMinutes`. The lower bound is the trigger's own 5-minute lead, so two
- * rows firing together see each other; an unsent row older than that, or expired, was missed and
- * is not coming. Patient-requested reminders are left out; they are what she asked for.
- */
-async function hasCheckInNear({ code, withinMinutes, excludeReminderId }) {
+async function hasCheckInNear({ code, withinMinutes, excludeReminderId, fireAt = null }) {
   const window = Number(withinMinutes);
   if (!code || !Number.isFinite(window) || window <= 0) return false;
+  const pending = `AND(${PENDING_ROW_FILTER}, DATETIME_DIFF({reminder_date}, NOW(), 'minutes') >= -5, DATETIME_DIFF({reminder_date}, NOW(), 'minutes') <= ${window}, OR({expires_at} = BLANK(), IS_AFTER({expires_at}, NOW())))`;
+  const sent = `AND({is_sent}, DATETIME_DIFF(NOW(), {sent_at}, 'minutes') <= ${window})`;
   const rows = await airtableService.getRecordByFilter(
     Monitoreo_ID,
     'reminder',
-    `AND(${fieldEquals('whatsapp_id', code)}, ${PENDING_ROW_FILTER}, OR(RIGHT({schedule_id}, 8) = "-patient", ${ROUTINE_OUTREACH_FILTER}), NOT(${fieldEquals('schedule_id', excludeReminderId)}), DATETIME_DIFF({reminder_date}, NOW(), 'minutes') >= -5, DATETIME_DIFF({reminder_date}, NOW(), 'minutes') <= ${window}, OR({expires_at} = BLANK(), IS_AFTER({expires_at}, NOW())))`,
+    `AND(${fieldEquals('whatsapp_id', code)}, OR(RIGHT({schedule_id}, 8) = "-patient", ${ROUTINE_OUTREACH_FILTER}), NOT(${fieldEquals('schedule_id', excludeReminderId)}), OR(${pending}, ${sent}))`,
     null,
-    ['schedule_id'],
+    ['schedule_id', 'reminder_date', 'is_sent'],
   );
-  return Array.isArray(rows) && rows.length > 0;
+  const ownAt = new Date(fireAt).getTime() || 0;
+  return (rows || []).some((row) => {
+    const id = String(row.schedule_id || '');
+    if (row.is_sent || id.endsWith('-patient')) return true;
+    const at = new Date(row.reminder_date).getTime() || 0;
+    return at < ownAt || (at === ownAt && id < excludeReminderId);
+  });
 }
 
 async function readPendingReminderForPatient({ code, reminderId }) {
@@ -499,7 +498,6 @@ async function readPendingReminderForPatient({ code, reminderId }) {
   } : null;
 }
 
-// Patient activity retires only turn-loss recovery rows; a seguimiento stays for the agent to keep, update or cancel.
 async function cancelPendingFollowUps({ code, trace = null, reason = 'patient_replied', recoveryOnly = false }) {
   return standDownRow({
     code,

package/lib/clinical/services/pausedSafetyNetService.js

@@ -20,7 +20,7 @@ const { normalizePayload: normalize, registerInteractiveRoute, unregisterInterac
 const { getMessages } = require('../../services/messageService');
 
 const { WriteClaimStore } = require('./writeClaimStore');
-const { OPS_ALERTS, recordPausedThreadMessage, recordUnresolvedRequest } = require('./clinicalAirtableService');
+const { OPS_ALERTS, cancelPendingFollowUps, recordPausedThreadMessage, recordUnresolvedRequest } = require('./clinicalAirtableService');
 const { anyoneRepliedSince, humanRepliedSince, openPledge, stopSafetyNetSweep } = require('./safetyNetPledgeService');
 
 const getMessaging = () => require('../../core/NexusMessaging');
@@ -219,6 +219,10 @@ async function applyChoice(code, choice) {
   const queued = await fileUrgentRequest(code, choice);
   if (!queued) return { queued, pledge: null };
 
+  await cancelPendingFollowUps({ code, reason: 'safety_net_request' }).catch((error) =>
+    logger.error('[PausedSafetyNet] Pending follow-ups were not stood down', { code, error: error.message })
+  );
+
   try {
     return { queued, pledge: await openPledge({ code }) };
   } catch (error) {

package/lib/core/NexusMessaging.js

@@ -608,7 +608,6 @@ class NexusMessaging {
         if (chatId) {
           // This is the common ingress for text, media, buttons, lists, and flows. Retire turn-loss
           // recovery here, before specialized handlers split off, so all patient activity counts.
-          // A seguimiento survives: the next turn shows it to the agent, who keeps, updates or cancels it.
           await cancelPendingFollowUps({ code: chatId, recoveryOnly: true }).catch(error =>
             logger.error('[processIncomingMessage] Follow-up stand-down failed', { code: chatId, error: error.message })
           );
@@ -1088,11 +1087,7 @@ class NexusMessaging {
         return result;
       }
 
-      // An open net alone does not hold a seguimiento: the two ask different things. Hold only when
-      // another check-in is about to reach the patient. Same-day activity does not hold an agent
-      // seguimiento: the agent saw it on every turn since and kept it. The fire trigger does not come
-      // back for a skipped row, so a skip retires it with its reason instead of leaving it armed.
-      const holdReason = await hasCheckInNear({ code, withinMinutes: FOLLOW_UP_SPACING_MIN, excludeReminderId: reminderId })
+      const holdReason = await hasCheckInNear({ code, withinMinutes: FOLLOW_UP_SPACING_MIN, excludeReminderId: reminderId, fireAt: plan.fireAt })
         ? 'check_in_near'
         : await followUpCollisionReason(code, reminderId, startedAt);
       if (holdReason) {

package/lib/models/escalationReviewModel.js

@@ -194,6 +194,7 @@ const escalationReviewSchema = new mongoose.Schema({
   followUpDecision: { type: Number, default: null },
   draftDueAt: { type: Date, default: null },
   draftAttempts: { type: Number, default: 0 },
+  draftFailedAt: { type: Date, default: null },
   doctorAlerts: { type: [doctorAlertSchema], default: [] },
   doctorAlertDueAt: { type: Date, default: null },
   doctorAlertKind: { type: String, enum: ['initial', 'realert', null], default: null },

package/lib/services/escalationReviewService.js

@@ -1118,7 +1118,7 @@ async function generateBotDraft({ id, lease = null } = {}) {
   };
   const saved = await getEscalationReview().findOneAndUpdate(
     { _id: review._id, status: { $in: DOCUMENTING_STATUSES }, draftDueAt: lease, drafts: { $size: (review.drafts ?? []).length } },
-    { $push: { drafts: entry }, $set: { status: 'draft_ready', draftDueAt: null }, $unset: { identityBlock: '' } },
+    { $push: { drafts: entry }, $set: { status: 'draft_ready', draftDueAt: null, draftFailedAt: null }, $unset: { identityBlock: '' } },
     { new: true },
   ).lean();
   if (saved) await audit(saved, DRAFT_OPERATOR, null, { action: 'draft_saved', draftNumber: saved.drafts.length });
@@ -1811,6 +1811,7 @@ async function syncEscalationReviewCase({ id, syncedBy, requestId = null } = {})
 
 module.exports = {
   BOOKKEEPING,
+  DOCUMENTING_STATUSES,
   PRE_DECISION_STATUSES,
   _resetEscalationReviewIndexes,
   addCallLog,

package/lib/services/reviewDraftSweepService.js

@@ -3,7 +3,7 @@ const { createIntervalSweeper } = require('../utils/intervalSweeper');
 const { withTimeout } = require('../utils/timeoutUtils');
 const { getEscalationReview } = require('../models/escalationReviewModel');
 
-const { BOOKKEEPING, generateBotDraft } = require('./escalationReviewService');
+const { BOOKKEEPING, DOCUMENTING_STATUSES, generateBotDraft } = require('./escalationReviewService');
 
 const SWEEP_LIMIT = 1;
 const DEFAULT_SWEEP_INTERVAL_MS = 30 * 1000;
@@ -34,6 +34,14 @@ async function draftReview(EscalationReview, { _id, draftDueAt, draftAttempts =
       escalationReviewId: String(_id), attempts: draftAttempts + 1,
     });
   }
+  if (retry && !willRetry) {
+    const marked = await EscalationReview.updateOne(
+      { _id, draftDueAt: lease, closedAt: null, status: { $in: DOCUMENTING_STATUSES } },
+      { $set: { draftDueAt: null, draftFailedAt: new Date() } },
+      BOOKKEEPING,
+    );
+    if (marked.matchedCount) return false;
+  }
   await EscalationReview.updateOne(
     { _id, draftDueAt: lease },
     willRetry

package/package.json

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