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

package/lib/clinical/services/clinicalAirtableService.js

@@ -461,22 +461,33 @@ function isAtOrBefore(when, now) {
 }
 
 /*
- * 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.
+ * Another check-in close to this one: a net's patient check-in or another routine follow-up that
+ * was sent in the last `withinMinutes`, or is still pending and due within them. The pending 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;
+  // A sent row or a net check-in always wins. Between two pending routine rows the earlier one,
+  // then the lower id, wins, so two jobs firing together on separate instances never both stand down.
+  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 }) {

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,11 @@ async function applyChoice(code, choice) {
   const queued = await fileUrgentRequest(code, choice);
   if (!queued) return { queued, pledge: null };
 
+  // The team now owns this patient's next contact; no turn ran to reassess a pending seguimiento.
+  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

@@ -1092,7 +1092,7 @@ class NexusMessaging {
       // 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/package.json

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