@peopl-health/nexus 5.67.0-dev.11929 → 5.67.0-dev.11930

package/lib/clinical/providers/AnthropicProvider.js

@@ -475,14 +475,17 @@ class AnthropicProvider extends BaseLLMProvider {
   // Split placement: the inline copy carries recency on single-round turns, the hoisted developer
   // turn persists once tool results are appended after it on multi-round turns.
   _buildInput({ additionalInstructions, ...rest }) {
-    const input = super._buildInput({ additionalInstructions, ...rest });
-    const pinned = { role: 'developer', content: `${RISK_HEADLINE_MARKER}\n${RISK_HEADLINE_DISCLAIMER}` };
-    const ordered = [...input.filter(i => !i[TAIL_PLACEMENT]), pinned, ...input.filter(i => i[TAIL_PLACEMENT])];
+    const ordered = this._orderRuntimeMessages(super._buildInput({ additionalInstructions, ...rest }));
     if (!additionalInstructions) return ordered;
     const { content } = this._operatorInstructionTurn(additionalInstructions);
     return [...ordered, { role: 'user', content: `${OPERATOR_TURN_PREFIX} ${content}`, type: 'message' }];
   }
 
+  _orderRuntimeMessages(input) {
+    const pinned = { role: 'developer', content: `${RISK_HEADLINE_MARKER}\n${RISK_HEADLINE_DISCLAIMER}` };
+    return [...input.filter(i => !i[TAIL_PLACEMENT]), pinned, ...input.filter(i => i[TAIL_PLACEMENT])];
+  }
+
   _mapModelConfig(modelConfig) {
     const mapped = { ...(modelConfig || {}) };
     if (mapped.max_tokens == null && mapped.max_output_tokens != null) mapped.max_tokens = mapped.max_output_tokens;

package/lib/clinical/providers/BaseLLMProvider.js

@@ -783,6 +783,11 @@ class BaseLLMProvider {
     };
   }
 
+  // Providers that pin runtime messages around the tail-placed block override this.
+  _orderRuntimeMessages(input) {
+    return input;
+  }
+
   _sanitizeInput(input) {
     const isMessage = (item) => !item.type || item.type === 'message';
     const items = (input || []).filter(item => isMessage(item) ? this._hasTextContent(item.content) : true);

package/lib/clinical/providers/GatewayProvider.js

@@ -38,6 +38,11 @@ class GatewayProvider extends BaseLLMProvider {
     return this._sub(vendor)._buildInput(config);
   }
 
+  _orderRuntimeMessages(input, modelConfig = null) {
+    const { vendor } = this._route(modelConfig?.model);
+    return this._sub(vendor)._orderRuntimeMessages(input);
+  }
+
   _route(model) {
     if (!model) return { vendor: 'openai', model: undefined };
     const slash = model.indexOf('/');

package/lib/clinical/services/nutritionPlanService.js

@@ -1,6 +1,7 @@
 const { safeParse, isPlainObject } = require('../../utils/jsonUtils');
 const { logger } = require('../../utils/logger');
 const { sanitizeInlineText } = require('../../utils/sanitizerUtils');
+const { withTimeout } = require('../../utils/timeoutUtils');
 const { composePrompt } = require('./promptComposerService');
 
 const NUTRITION_GUIDE_PROMPT_ID = 'nutrition_plan_guide';
@@ -60,15 +61,14 @@ function readGuide() {
 // The guide only adds to the plan, so a slow read must not hold the patient's turn,
 // and a read that never settles must not hold every later turn either.
 async function loadNutritionGuide() {
-  let timer;
   const read = readGuide();
-  const timedOut = new Promise((resolve) => { timer = setTimeout(() => resolve(null), GUIDE_TIMEOUT_MS); });
-  const guide = await Promise.race([read, timedOut]);
-  clearTimeout(timer);
-  if (guide !== null) return guide;
-  if (guideRead === read) guideRead = null;
-  logger.warn('[nutritionPlanService] nutrition guide read timed out; using the last one read', { timeoutMs: GUIDE_TIMEOUT_MS });
-  return lastGuide;
+  try {
+    return await withTimeout(read, GUIDE_TIMEOUT_MS, 'nutrition guide read');
+  } catch {
+    if (guideRead === read) guideRead = null;
+    logger.warn('[nutritionPlanService] nutrition guide read timed out; using the last one read', { timeoutMs: GUIDE_TIMEOUT_MS });
+    return lastGuide;
+  }
 }
 
 async function resolveNutritionPlan(section, { now = new Date() } = {}) {

package/lib/eval/EvalProvider.js

@@ -225,17 +225,21 @@ class EvalProvider {
     const clinicalMessage = typeof this.provider._buildClinicalMessage === 'function'
       ? this.provider._buildClinicalMessage(promptVariables, interpolatedVariables)
       : [];
-    const input = this.provider._sanitizeInput([...memoryMessage, ...clinicalMessage, ...convertedMessages]);
     const isContextOnly = this.mode === 'context-only';
 
     const shouldUsePromptRegistry = !presetId && this.provider.supportsPromptRegistry && !!assistantId;
+    const modelConfig = shouldUsePromptRegistry ? {} : this._modelConfig(presetModelConfig);
+    const input = this.provider._orderRuntimeMessages(
+      this.provider._sanitizeInput([...memoryMessage, ...clinicalMessage, ...convertedMessages]),
+      modelConfig,
+    );
 
     return {
       instructions: devContent || '',
       input,
       toolSchemas: isContextOnly ? [] : toolSchemas,
       toolChoice: isContextOnly ? 'none' : this.toolChoice,
-      modelConfig: shouldUsePromptRegistry ? {} : this._modelConfig(presetModelConfig),
+      modelConfig,
       assistant: isContextOnly ? null : assistant,
       phiProcessor: this.phiProcessor,
       promptVariables,

package/package.json

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