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

package/lib/clinical/services/skillService.js

@@ -11,26 +11,59 @@ 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 unavailableToolNames() {
-  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);
+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 [];
   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) {
-  if (getRegisteredToolNames().length === 0) return;
+  const registeredNames = getRegisteredToolNames();
+  if (registeredNames.length === 0) return;
+  const registered = new Set(registeredNames);
   const text = String(body || '');
-  const missing = (await unavailableToolNames())
-    .filter((id) => new RegExp(`\\b${id}\\b`).test(text))
-    .sort();
+
+  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();
+
   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/package.json

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