@peopl-health/nexus 5.11.0-dev.1127 → 5.11.0-dev.1130

package/lib/clinical/services/skillService.js

@@ -11,59 +11,26 @@ const TOOLS_TABLE = 'tools';
 const CACHE_TTL = 5 * 60 * 1000;
 const CACHE_KEY = 'skills';
 const TOOLS_CACHE_KEY = 'toolCatalog';
-const BACKTICK_SPAN_RX = /`([^`\n]+)`/g;
-const LEADING_CALL_RX = /^([A-Za-z][A-Za-z0-9]*)\s*(?:[(.]|$)/;
-const MULTI_WORD_RX = /[a-z][A-Z]/;
 
 const cache = new MapCache({ maxSize: 2, ttl: CACHE_TTL });
 
-async function readToolCatalog() {
-  const cached = cache.get(TOOLS_CACHE_KEY);
-  if (cached) return cached;
-
-  let records;
-  try {
-    records = await getRecordByFilter(Config_ID, TOOLS_TABLE, 'TRUE()');
-  } catch (error) {
-    logger.warn('[skillService] tool catalog unreadable; drift check falls back to the skill body', { error: error.message });
-    return null;
-  }
-  if (!records) {
-    logger.warn('[skillService] tool catalog unreadable; drift check falls back to the skill body', { table: TOOLS_TABLE });
-    return null;
-  }
-
-  const catalog = records.map((row) => row.tool_id).filter(Boolean);
-  cache.set(TOOLS_CACHE_KEY, catalog);
-  return catalog;
-}
-
 async function unavailableToolNames() {
-  const catalog = await readToolCatalog();
-  if (!catalog) return [];
+  let catalog = cache.get(TOOLS_CACHE_KEY);
+  if (!catalog) {
+    const records = await getRecordByFilter(Config_ID, TOOLS_TABLE, 'TRUE()');
+    catalog = (records || []).map((row) => row.tool_id).filter(Boolean);
+    cache.set(TOOLS_CACHE_KEY, catalog);
+  }
   const registered = new Set(getRegisteredToolNames());
   return catalog.filter((id) => !registered.has(id));
 }
 
-function mentionedToolNames(text) {
-  const names = new Set();
-  for (const [, span] of text.matchAll(BACKTICK_SPAN_RX)) {
-    const id = span.match(LEADING_CALL_RX)?.[1];
-    if (id && MULTI_WORD_RX.test(id)) names.add(id);
-  }
-  return names;
-}
-
 async function warnOnRegistryDrift(name, body) {
-  const registeredNames = getRegisteredToolNames();
-  if (registeredNames.length === 0) return;
-  const registered = new Set(registeredNames);
+  if (getRegisteredToolNames().length === 0) return;
   const text = String(body || '');
-
-  const fromCatalog = (await unavailableToolNames()).filter((id) => new RegExp(`\\b${id}\\b`).test(text));
-  const fromBody = [...mentionedToolNames(text)].filter((id) => !registered.has(id));
-  const missing = [...new Set([...fromCatalog, ...fromBody])].sort();
-
+  const missing = (await unavailableToolNames())
+    .filter((id) => new RegExp(`\\b${id}\\b`).test(text))
+    .sort();
   if (missing.length > 0) {
     logger.error('[skillService] Skill body calls tools that are not registered — the model cannot follow this body', {
       skill: name, missing,

package/lib/fhir/constants/extensionSlugs.js

@@ -1,5 +1,3 @@
-const CONTINGENCY_CATEGORY_PREFIX = 'contingency-';
-
 const SYMPTOM_CASE_EXT = {
   STATUS: 'symptom-case-status',
   LEGACY_ABATEMENT: 'legacy-abatement',
@@ -74,17 +72,6 @@ const PALLIATIVE_EXT = {
   FINDING_CLUSTER_NOTE: 'palliative-finding-cluster-note',
 };
 
-const CONTINGENCY_EXT = {
-  STATUS: 'contingency-status',
-  AWAITING_CHARACTERIZATION: 'contingency-awaiting-characterization',
-  WHY_THIS_MATTERS: 'contingency-why-this-matters',
-  CREATION_REASONING: 'contingency-creation-reasoning',
-  RESOLVED_REASON: 'contingency-resolved-reason',
-  STEP_PRIORITY: 'contingency-step-priority',
-  ACTION_REQUESTED: 'contingency-action-requested',
-  FIRES_AFTER_SILENCE_MINUTES: 'fires-after-silence-minutes',
-};
-
 const RISK_EXT = {
   PREDICTION_KIND: 'risk-prediction-kind',
   MINIMUM_SYMPTOM_SET: 'risk-minimum-symptom-set',
@@ -105,7 +92,5 @@ module.exports = {
   ROUTING_EXT,
   CLUSTER_EXT,
   PALLIATIVE_EXT,
-  CONTINGENCY_EXT,
-  CONTINGENCY_CATEGORY_PREFIX,
   RISK_EXT,
 };

package/lib/fhir/helpers/resourceHelper.js

@@ -0,0 +1,28 @@
+const { getDeviceId, getOrganizationId } = require('../config/fhirConfig');
+const { fhirId } = require('./fhirHelper');
+const { identifier, patientReference, reference, codeableConcept, toIso } = require('./elementHelper');
+
+function baseResource(resourceType, id, slug, patientId) {
+  return {
+    resourceType,
+    id: fhirId(id),
+    identifier: [identifier(slug, id)],
+    subject: patientReference(patientId),
+  };
+}
+
+function provenance({ provenanceId, targetRefs, recordedAt, activityText }) {
+  return {
+    resourceType: 'Provenance',
+    id: fhirId(provenanceId),
+    target: targetRefs,
+    recorded: toIso(recordedAt),
+    agent: [{ who: reference('Device', getDeviceId()), onBehalfOf: reference('Organization', getOrganizationId()) }],
+    activity: codeableConcept(activityText),
+  };
+}
+
+module.exports = {
+  baseResource,
+  provenance,
+};

package/lib/fhir/projections/contingencyProjection.js

@@ -1,36 +1,193 @@
-const { CarePlan } = require('../resources/CarePlan');
-const { CommunicationRequest } = require('../resources/CommunicationRequest');
-const { Provenance } = require('../resources/Provenance');
+const { ZodError } = require('zod');
+
+const { getOrganizationId } = require('../config/fhirConfig');
+const { fhirId } = require('../helpers/fhirHelper');
+const { patientReference, reference, codeableConcept, extension, toIso } = require('../helpers/elementHelper');
+const { baseResource, provenance } = require('../helpers/resourceHelper');
+const { extMap, identifierValue, refToId } = require('../helpers/fhirReadHelper');
+const { CONTINGENCY_PLAN_SLUG, CONTINGENCY_STEP_SLUG } = require('../constants/projectionSlugs');
+const { ContingencySafetyNet } = require('../../shared/dtos/ContingencySafetyNet');
+const { logger } = require('../../utils/logger');
 
-const PROJECTOR_NAME = 'contingency';
 const ACTIVITY_TEXT = 'contingency-safety-net';
+const CATEGORY_PREFIX = 'contingency-';
 
-function projectContingency(net) {
-  const { carePlan, teamEscalation, patientReminder } = net;
-  const stepArgs = {
-    planId: carePlan.planId,
-    patientId: carePlan.patientId,
-    createdAt: carePlan.createdAt,
-    parentStatus: carePlan.status,
-  };
+const EXT = {
+  STATUS: 'contingency-status',
+  AWAITING_CHARACTERIZATION: 'contingency-awaiting-characterization',
+  WHY_THIS_MATTERS: 'contingency-why-this-matters',
+  CREATION_REASONING: 'contingency-creation-reasoning',
+  RESOLVED_REASON: 'contingency-resolved-reason',
+  STEP_PRIORITY: 'contingency-step-priority',
+  ACTION_REQUESTED: 'contingency-action-requested',
+  FIRES_AFTER_SILENCE_MINUTES: 'fires-after-silence-minutes',
+};
+
+const STATUS_TO_FHIR = {
+  armed: 'active',
+  fired_reminder: 'active',
+  fired_team: 'active',
+  auto_resolved: 'completed',
+  cancelled: 'revoked',
+};
 
+const PRIORITY_CROSSWALK = {
+  critical: 'stat',
+  high: 'urgent',
+  medium: 'routine',
+  low: 'routine',
+  routine: 'routine',
+  urgent: 'urgent',
+  asap: 'asap',
+  stat: 'stat',
+};
+
+const RESOURCE_TYPES = ['CarePlan', 'CommunicationRequest'];
+
+function toFhir(contingency) {
+  const { carePlan, teamEscalation, patientReminder } = contingency;
   const steps = [teamEscalation];
   if (patientReminder) steps.push(patientReminder);
 
-  const out = [CarePlan.fromContingency({ carePlan })];
+  const resources = [carePlanResource(carePlan)];
+  for (const step of steps) resources.push(stepResource(step, carePlan));
+
+  const targetRefs = [{ reference: `CarePlan/${fhirId(carePlan.planId)}` }];
   for (const step of steps) {
-    out.push(CommunicationRequest.fromContingencyStep({ step, ...stepArgs }));
+    targetRefs.push({ reference: `CommunicationRequest/${fhirId(`${carePlan.planId}-${step.recipient}`)}` });
   }
-  out.push(Provenance.fromContingency({
-    planId: carePlan.planId,
-    recipients: steps.map((step) => step.recipient),
+  resources.push(provenance({
+    provenanceId: `${carePlan.planId}-prov`,
+    targetRefs,
     recordedAt: carePlan.createdAt,
     activityText: ACTIVITY_TEXT,
   }));
+  return resources;
+}
+
+function carePlanResource(carePlan) {
+  const payload = {
+    ...baseResource('CarePlan', carePlan.planId, CONTINGENCY_PLAN_SLUG, carePlan.patientId),
+    status: STATUS_TO_FHIR[carePlan.status],
+    intent: 'plan',
+    created: toIso(carePlan.createdAt),
+    period: carePlanPeriod(carePlan),
+  };
+  if (carePlan.concern) payload.description = carePlan.concern;
+  if (carePlan.relatedCaseId) payload.addresses = [{ reference: reference('Condition', carePlan.relatedCaseId) }];
+  if (carePlan.relatedClusterId) payload.supportingInfo = [reference('ClinicalImpression', carePlan.relatedClusterId)];
+  const ext = carePlanExtensions(carePlan);
+  if (ext.length) payload.extension = ext;
+  return payload;
+}
+
+function carePlanPeriod(carePlan) {
+  const period = { start: toIso(carePlan.createdAt) };
+  if (carePlan.resolvedAt) period.end = toIso(carePlan.resolvedAt);
+  return period;
+}
+
+function carePlanExtensions(carePlan) {
+  const out = [extension(EXT.STATUS, { valueString: carePlan.status })];
+  if (carePlan.awaitingCharacterization) out.push(extension(EXT.AWAITING_CHARACTERIZATION, { valueString: carePlan.awaitingCharacterization }));
+  if (carePlan.whyThisMatters) out.push(extension(EXT.WHY_THIS_MATTERS, { valueString: carePlan.whyThisMatters }));
+  if (carePlan.creationReasoning) out.push(extension(EXT.CREATION_REASONING, { valueString: carePlan.creationReasoning }));
+  if (carePlan.resolvedReason) out.push(extension(EXT.RESOLVED_REASON, { valueString: carePlan.resolvedReason }));
   return out;
 }
 
+function stepResource(step, carePlan) {
+  const stepId = `${carePlan.planId}-${step.recipient}`;
+  const payload = {
+    ...baseResource('CommunicationRequest', stepId, CONTINGENCY_STEP_SLUG, carePlan.patientId),
+    status: STATUS_TO_FHIR[carePlan.status],
+    intent: 'plan',
+    category: [codeableConcept(`${CATEGORY_PREFIX}${step.recipient}`)],
+    recipient: [step.recipient === 'patient'
+      ? patientReference(carePlan.patientId)
+      : { reference: `Organization/${fhirId(getOrganizationId())}` }],
+    payload: [{ contentCodeableConcept: codeableConcept(step.message) }],
+    authoredOn: toIso(carePlan.createdAt),
+    basedOn: [{ reference: `CarePlan/${fhirId(carePlan.planId)}` }],
+  };
+  const priority = step.priority ? PRIORITY_CROSSWALK[step.priority] || 'routine' : null;
+  if (priority) payload.priority = priority;
+  const ext = stepExtensions(step);
+  if (ext.length) payload.extension = ext;
+  return payload;
+}
+
+function stepExtensions(step) {
+  const out = [];
+  if (step.priority) out.push(extension(EXT.STEP_PRIORITY, { valueString: step.priority }));
+  if (step.actionRequested) out.push(extension(EXT.ACTION_REQUESTED, { valueString: step.actionRequested }));
+  if (step.firesAfterSilenceMinutes !== null && step.firesAfterSilenceMinutes !== undefined) {
+    out.push(extension(EXT.FIRES_AFTER_SILENCE_MINUTES, { valueInteger: step.firesAfterSilenceMinutes }));
+  }
+  return out;
+}
+
+function fromFhir(resources, { patientId }) {
+  const requests = resources.filter((r) => r.resourceType === 'CommunicationRequest' && identifierValue(r, CONTINGENCY_STEP_SLUG));
+  return resources
+    .filter((r) => r.resourceType === 'CarePlan' && identifierValue(r, CONTINGENCY_PLAN_SLUG))
+    .map((plan) => reconstruct(plan, requests, patientId))
+    .filter(Boolean);
+}
+
+function reconstruct(plan, requests, patientId) {
+  const planId = identifierValue(plan, CONTINGENCY_PLAN_SLUG);
+  const ext = extMap(plan);
+  const stepFor = (recipient) => {
+    const resource = requests.find((r) => identifierValue(r, CONTINGENCY_STEP_SLUG) === `${planId}-${recipient}`);
+    return resource ? reconstructStep(resource, recipient) : null;
+  };
+  const address = plan.addresses && plan.addresses[0] && plan.addresses[0].reference;
+  const reconstructed = {
+    schemaVersion: '1',
+    carePlan: {
+      planId,
+      patientId,
+      relatedCaseId: refToId(address && address.reference),
+      relatedClusterId: refToId(plan.supportingInfo && plan.supportingInfo[0] && plan.supportingInfo[0].reference),
+      concern: plan.description || '',
+      awaitingCharacterization: ext[EXT.AWAITING_CHARACTERIZATION] || '',
+      whyThisMatters: ext[EXT.WHY_THIS_MATTERS] || '',
+      creationReasoning: ext[EXT.CREATION_REASONING] || '',
+      status: ext[EXT.STATUS] || 'armed',
+      createdAt: plan.created,
+      resolvedAt: (plan.period && plan.period.end) || null,
+      resolvedReason: ext[EXT.RESOLVED_REASON] || null,
+    },
+    teamEscalation: stepFor('care_team'),
+    patientReminder: stepFor('patient'),
+  };
+  try {
+    return new ContingencySafetyNet(reconstructed);
+  } catch (error) {
+    if (error instanceof ZodError) {
+      logger.warn({ planId }, 'skipping malformed contingency CarePlan');
+      return null;
+    }
+    throw error;
+  }
+}
+
+function reconstructStep(resource, recipient) {
+  const ext = extMap(resource);
+  const silence = ext[EXT.FIRES_AFTER_SILENCE_MINUTES];
+  const firstPayload = resource.payload && resource.payload[0];
+  return {
+    recipient,
+    message: (firstPayload && firstPayload.contentCodeableConcept && firstPayload.contentCodeableConcept.text) || null,
+    priority: ext[EXT.STEP_PRIORITY] || resource.priority || null,
+    actionRequested: ext[EXT.ACTION_REQUESTED] || null,
+    firesAfterSilenceMinutes: typeof silence === 'number' ? silence : null,
+  };
+}
+
 module.exports = {
-  projectContingency,
-  PROJECTOR_NAME,
+  toFhir,
+  fromFhir,
+  RESOURCE_TYPES,
 };

package/lib/fhir/projections/registerProjectors.js

@@ -6,7 +6,6 @@ const { projectSymptomCase, PROJECTOR_NAME: SYMPTOM_CASE_PROJECTOR_NAME } = requ
 const { projectPatientRisk, PROJECTOR_NAME: RISK_PROJECTOR_NAME } = require('./riskProjection');
 const { projectSafetyGate, PROJECTOR_NAME: SAFETY_GATE_PROJECTOR_NAME } = require('./safetyGateProjection');
 const { projectRecommendationPlan, PROJECTOR_NAME: RECOMMENDATION_PLAN_PROJECTOR_NAME } = require('./recommendationPlanProjection');
-const { projectContingency, PROJECTOR_NAME: CONTINGENCY_PROJECTOR_NAME } = require('./contingencyProjection');
 const { projectIntervention, PROJECTOR_NAME: INTERVENTION_PROJECTOR_NAME } = require('./interventionProjection');
 const { projectCluster, PROJECTOR_NAME: CLUSTER_PROJECTOR_NAME } = require('./clusterProjection');
 const { projectRoutingDecision, PROJECTOR_NAME: ROUTING_PROJECTOR_NAME } = require('./routingProjection');
@@ -21,7 +20,6 @@ const PROJECTORS = [
   { name: RISK_PROJECTOR_NAME, project: projectPatientRisk },
   { name: SAFETY_GATE_PROJECTOR_NAME, project: projectSafetyGate },
   { name: RECOMMENDATION_PLAN_PROJECTOR_NAME, project: projectRecommendationPlan },
-  { name: CONTINGENCY_PROJECTOR_NAME, project: projectContingency },
   { name: INTERVENTION_PROJECTOR_NAME, project: projectIntervention },
   { name: CLUSTER_PROJECTOR_NAME, project: projectCluster },
   { name: ROUTING_PROJECTOR_NAME, project: projectRoutingDecision },

package/lib/fhir/resources/CarePlan.js

@@ -7,45 +7,14 @@ const {
   extension,
   toIso,
 } = require('../helpers/elementHelper');
-const { CONTINGENCY_PLAN_SLUG, ROUTING_DISPOSITION_SLUG, RECOMMENDATION_PLAN_SLUG, PALLIATIVE_CAREPLAN_SLUG } = require('../constants/projectionSlugs');
-const { CONTINGENCY_EXT, PALLIATIVE_EXT } = require('../constants/extensionSlugs');
-
-const CONTINGENCY_STATUS_TO_FHIR = {
-  armed: 'active',
-  fired_reminder: 'active',
-  fired_team: 'active',
-  auto_resolved: 'completed',
-  cancelled: 'revoked',
-};
+const { ROUTING_DISPOSITION_SLUG, RECOMMENDATION_PLAN_SLUG, PALLIATIVE_CAREPLAN_SLUG } = require('../constants/projectionSlugs');
+const { PALLIATIVE_EXT } = require('../constants/extensionSlugs');
 
 class CarePlan {
   constructor(payload) {
     Object.assign(this, payload);
   }
 
-  static fromContingency({ carePlan }) {
-    const payload = {
-      resourceType: 'CarePlan',
-      id: fhirId(carePlan.planId),
-      identifier: [identifier(CONTINGENCY_PLAN_SLUG, carePlan.planId)],
-      status: CONTINGENCY_STATUS_TO_FHIR[carePlan.status],
-      intent: 'plan',
-      subject: patientReference(carePlan.patientId),
-      created: toIso(carePlan.createdAt),
-      period: contingencyPeriod(carePlan),
-    };
-    if (carePlan.concern) payload.description = carePlan.concern;
-    if (carePlan.relatedCaseId) {
-      payload.addresses = [{ reference: reference('Condition', carePlan.relatedCaseId) }];
-    }
-    if (carePlan.relatedClusterId) {
-      payload.supportingInfo = [reference('ClinicalImpression', carePlan.relatedClusterId)];
-    }
-    const ext = contingencyExtensions(carePlan);
-    if (ext.length) payload.extension = ext;
-    return new CarePlan(payload);
-  }
-
   static fromRecommendationPlan({ plan, taskIds, hasSafetyGate }) {
     const payload = {
       resourceType: 'CarePlan',
@@ -110,30 +79,6 @@ class CarePlan {
   }
 }
 
-function contingencyPeriod(carePlan) {
-  const period = { start: toIso(carePlan.createdAt) };
-  if (carePlan.resolvedAt) period.end = toIso(carePlan.resolvedAt);
-  return period;
-}
-
-function contingencyExtensions(carePlan) {
-  const out = [extension(CONTINGENCY_EXT.STATUS, { valueString: carePlan.status })];
-  if (carePlan.awaitingCharacterization) {
-    out.push(extension(CONTINGENCY_EXT.AWAITING_CHARACTERIZATION, { valueString: carePlan.awaitingCharacterization }));
-  }
-  if (carePlan.whyThisMatters) {
-    out.push(extension(CONTINGENCY_EXT.WHY_THIS_MATTERS, { valueString: carePlan.whyThisMatters }));
-  }
-  if (carePlan.creationReasoning) {
-    out.push(extension(CONTINGENCY_EXT.CREATION_REASONING, { valueString: carePlan.creationReasoning }));
-  }
-  if (carePlan.resolvedReason) {
-    out.push(extension(CONTINGENCY_EXT.RESOLVED_REASON, { valueString: carePlan.resolvedReason }));
-  }
-  return out;
-}
-
 module.exports = {
   CarePlan,
-  CONTINGENCY_STATUS_TO_FHIR,
 };

package/lib/fhir/resources/CommunicationRequest.js

@@ -1,4 +1,3 @@
-const { getOrganizationId } = require('../config/fhirConfig');
 const { fhirId, codeSystemUrl } = require('../helpers/fhirHelper');
 const {
   identifier,
@@ -16,25 +15,11 @@ const {
   REMINDER_SLUG,
   REMINDER_KIND_SLUG,
   COMMUNICATION_CHANNEL_SLUG,
-  CONTINGENCY_STEP_SLUG,
   INTERVENTION_SLUG,
   INTERVENTION_KIND_SLUG,
   ROUTING_DISPOSITION_SLUG,
 } = require('../constants/projectionSlugs');
-const { CONTINGENCY_EXT, CONTINGENCY_CATEGORY_PREFIX } = require('../constants/extensionSlugs');
 const { SEVERITY_TO_PRIORITY } = require('../constants/severityPriority');
-const { CONTINGENCY_STATUS_TO_FHIR } = require('./CarePlan');
-
-const CONTINGENCY_PRIORITY_CROSSWALK = {
-  critical: 'stat',
-  high: 'urgent',
-  medium: 'routine',
-  low: 'routine',
-  routine: 'routine',
-  urgent: 'urgent',
-  asap: 'asap',
-  stat: 'stat',
-};
 const { interventionExtensions } = require('./interventionExtensions');
 
 const NOTIFY_STATUS_TO_CR_STATUS = {
@@ -106,35 +91,6 @@ class CommunicationRequest {
     return new CommunicationRequest(payload);
   }
 
-  static fromContingencyStep({ step, planId, patientId, createdAt, parentStatus }) {
-    const stepId = `${planId}-${step.recipient}`;
-    const payload = {
-      resourceType: 'CommunicationRequest',
-      id: fhirId(stepId),
-      identifier: [identifier(CONTINGENCY_STEP_SLUG, stepId)],
-      status: CONTINGENCY_STATUS_TO_FHIR[parentStatus],
-      intent: 'plan',
-      category: [codeableConcept(`${CONTINGENCY_CATEGORY_PREFIX}${step.recipient}`)],
-      subject: patientReference(patientId),
-      recipient: [step.recipient === 'patient'
-        ? patientReference(patientId)
-        : { reference: `Organization/${fhirId(getOrganizationId())}` }],
-      payload: [{ contentCodeableConcept: codeableConcept(step.message) }],
-      authoredOn: toIso(createdAt),
-      basedOn: [{ reference: `CarePlan/${fhirId(planId)}` }],
-    };
-    const priority = step.priority ? CONTINGENCY_PRIORITY_CROSSWALK[step.priority] || 'routine' : null;
-    if (priority) payload.priority = priority;
-    const ext = [];
-    if (step.priority) ext.push(extension(CONTINGENCY_EXT.STEP_PRIORITY, { valueString: step.priority }));
-    if (step.actionRequested) ext.push(extension(CONTINGENCY_EXT.ACTION_REQUESTED, { valueString: step.actionRequested }));
-    if (step.firesAfterSilenceMinutes !== null && step.firesAfterSilenceMinutes !== undefined) {
-      ext.push(extension(CONTINGENCY_EXT.FIRES_AFTER_SILENCE_MINUTES, { valueInteger: step.firesAfterSilenceMinutes }));
-    }
-    if (ext.length) payload.extension = ext;
-    return new CommunicationRequest(payload);
-  }
-
   static fromIntervention({ intervention }) {
     const payload = {
       resourceType: 'CommunicationRequest',

package/lib/fhir/resources/Provenance.js

@@ -109,21 +109,6 @@ class Provenance {
     });
   }
 
-  static fromContingency({ planId, recipients, recordedAt, activityText }) {
-    const targets = [{ reference: `CarePlan/${fhirId(planId)}` }];
-    for (const recipient of recipients) {
-      targets.push({ reference: `CommunicationRequest/${fhirId(`${planId}-${recipient}`)}` });
-    }
-    return new Provenance({
-      resourceType: 'Provenance',
-      id: fhirId(`${planId}-prov`),
-      target: targets,
-      recorded: toIso(recordedAt),
-      agent: [{ who: reference('Device', getDeviceId()), onBehalfOf: reference('Organization', getOrganizationId()) }],
-      activity: codeableConcept(activityText),
-    });
-  }
-
   static fromResultObservations({ targetIds, provenanceId, activityText, now }) {
     return new Provenance({
       resourceType: 'Provenance',

package/lib/fhir/services/contingencyService.js

@@ -1,117 +1,23 @@
-const { ZodError } = require('zod');
-
 const { fhirId } = require('../helpers/fhirHelper');
-const { extMap, identifierValue, refToId } = require('../helpers/fhirReadHelper');
-const {
-  CONTINGENCY_PLAN_SLUG,
-  CONTINGENCY_STEP_SLUG,
-} = require('../constants/projectionSlugs');
-const { CONTINGENCY_EXT, CONTINGENCY_CATEGORY_PREFIX } = require('../constants/extensionSlugs');
-const { CONTINGENCY_STATUS_TO_FHIR } = require('../resources/CarePlan');
-const { PROJECTOR_NAME } = require('../projections/contingencyProjection');
 const { getFhirStore } = require('../stores/fhirStore');
-const { ContingencySafetyNet, RECIPIENTS } = require('../../shared/dtos/ContingencySafetyNet');
-const { logger } = require('../../utils/logger');
-const { project, storeResources } = require('./fhirService');
-
-const FHIR_TO_CONTINGENCY_STATUS = invert(CONTINGENCY_STATUS_TO_FHIR);
+const { toFhir, fromFhir, RESOURCE_TYPES } = require('../projections/contingencyProjection');
+const { storeResources } = require('./fhirService');
 
 async function storeContingency({ patientId, contingency }) {
   if (contingency.carePlan.patientId !== patientId) {
     throw new Error(`storeContingency patientId mismatch: expected ${patientId}`);
   }
-  const bundle = project([{ name: PROJECTOR_NAME, aggregate: contingency }]);
-  const resources = bundle.entry.map((entry) => entry.resource);
-  const { stored } = await storeResources(resources);
+  const { stored } = await storeResources(toFhir(contingency));
   return { count: stored.length, ids: stored };
 }
 
 async function readContingencies({ patientId, caseId = null, clusterId = null }) {
   const store = getFhirStore();
   const patient = `Patient/${fhirId(patientId)}`;
-  const plans = (await store.find({ patient, resourceType: 'CarePlan' }))
-    .filter((plan) => identifierValue(plan, CONTINGENCY_PLAN_SLUG));
-  const requests = (await store.find({ patient, resourceType: 'CommunicationRequest' }))
-    .filter((request) => identifierValue(request, CONTINGENCY_STEP_SLUG));
-
-  const nets = [];
-  for (const plan of plans) {
-    const net = reconstructContingency(plan, requests, patientId);
-    if (caseId && net.carePlan.relatedCaseId !== caseId) continue;
-    if (clusterId && net.carePlan.relatedClusterId !== clusterId) continue;
-    try {
-      nets.push(new ContingencySafetyNet(net));
-    } catch (error) {
-      if (error instanceof ZodError) {
-        logger.warn({ planId: net.carePlan.planId }, 'skipping malformed contingency CarePlan');
-        continue;
-      }
-      throw error;
-    }
-  }
-  return nets;
-}
-
-function reconstructContingency(plan, requests, patientId) {
-  const planId = identifierValue(plan, CONTINGENCY_PLAN_SLUG);
-  const ext = extMap(plan);
-  const stepIds = new Set([`${planId}-care_team`, `${planId}-patient`]);
-  const planSteps = requests
-    .filter((resource) => stepIds.has(identifierValue(resource, CONTINGENCY_STEP_SLUG)))
-    .map(reconstructStep);
-  const teamEscalation = planSteps.find((step) => step.recipient === 'care_team') || null;
-  const patientReminder = planSteps.find((step) => step.recipient === 'patient') || null;
-  const address = plan.addresses && plan.addresses[0] && plan.addresses[0].reference;
-  return {
-    schemaVersion: '1',
-    carePlan: {
-      planId,
-      patientId,
-      relatedCaseId: refToId(address && address.reference),
-      relatedClusterId: refToId(plan.supportingInfo && plan.supportingInfo[0] && plan.supportingInfo[0].reference),
-      concern: plan.description || '',
-      awaitingCharacterization: ext[CONTINGENCY_EXT.AWAITING_CHARACTERIZATION] || '',
-      whyThisMatters: ext[CONTINGENCY_EXT.WHY_THIS_MATTERS] || '',
-      creationReasoning: ext[CONTINGENCY_EXT.CREATION_REASONING] || '',
-      status: ext[CONTINGENCY_EXT.STATUS] || FHIR_TO_CONTINGENCY_STATUS[plan.status] || 'armed',
-      createdAt: plan.created,
-      resolvedAt: (plan.period && plan.period.end) || null,
-      resolvedReason: ext[CONTINGENCY_EXT.RESOLVED_REASON] || null,
-    },
-    teamEscalation,
-    patientReminder,
-  };
-}
-
-function reconstructStep(resource) {
-  const ext = extMap(resource);
-  const silence = ext[CONTINGENCY_EXT.FIRES_AFTER_SILENCE_MINUTES];
-  const firstPayload = resource.payload && resource.payload[0];
-  return {
-    recipient: recipientOf(resource),
-    message: (firstPayload && firstPayload.contentCodeableConcept && firstPayload.contentCodeableConcept.text) || null,
-    priority: ext[CONTINGENCY_EXT.STEP_PRIORITY] || resource.priority || null,
-    actionRequested: ext[CONTINGENCY_EXT.ACTION_REQUESTED] || null,
-    firesAfterSilenceMinutes: typeof silence === 'number' ? silence : null,
-  };
-}
-
-function recipientOf(resource) {
-  const category = resource.category && resource.category[0] && resource.category[0].text;
-  if (category && category.startsWith(CONTINGENCY_CATEGORY_PREFIX)) {
-    const recipient = category.slice(CONTINGENCY_CATEGORY_PREFIX.length);
-    if (RECIPIENTS.includes(recipient)) return recipient;
-  }
-  const ref = resource.recipient && resource.recipient[0] && resource.recipient[0].reference;
-  return ref && ref.startsWith('Organization/') ? 'care_team' : 'patient';
-}
-
-function invert(map) {
-  const out = {};
-  for (const [key, value] of Object.entries(map)) {
-    if (!(value in out)) out[value] = key;
-  }
-  return out;
+  const found = await Promise.all(RESOURCE_TYPES.map((resourceType) => store.find({ patient, resourceType })));
+  return fromFhir(found.flat(), { patientId })
+    .filter((contingency) => !caseId || contingency.carePlan.relatedCaseId === caseId)
+    .filter((contingency) => !clusterId || contingency.carePlan.relatedClusterId === clusterId);
 }
 
 module.exports = {

package/lib/shared/dtos/ContingencySafetyNet.js

@@ -52,5 +52,4 @@ module.exports = {
   ContingencySafetyNet,
   ESCALATION_PRIORITIES,
   ACTIVE_CARE_PLAN_STATUSES,
-  RECIPIENTS,
 };

package/package.json

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