@peopl-health/nexus 3.8.0 → 3.8.2

package/lib/eval/EvalProvider.js

@@ -1,6 +1,5 @@
 const { OpenAI } = require('openai');
 
-const { Config_ID } = require('../config/airtableConfig');
 const { getCurrentMexicoDateTime } = require('../utils/dateUtils');
 const { retryWithBackoff } = require('../utils/retryUtils');
 const { logger } = require('../utils/logger');
@@ -8,7 +7,7 @@ const { Thread } = require('../models/threadModel');
 const { DefaultMemoryManager } = require('../memory/DefaultMemoryManager');
 const { OpenAIResponsesProvider } = require('../providers/OpenAIResponsesProvider');
 const { handleFunctionCalls } = require('../providers/OpenAIResponsesProviderTools');
-const { getRecordByFilter } = require('../services/airtableService');
+const { composePrompt } = require('../services/promptComposerService');
 const { getAssistantById } = require('../services/assistantResolver');
 
 const MAX_FUNCTION_ROUNDS = parseInt(process.env.MAX_FUNCTION_ROUNDS || '5', 10);
@@ -108,12 +107,15 @@ class EvalProvider {
   async _resolvePrompt(fallbackPrompt, assistantId, thread, promptVariables) {
     let devContent;
     if (this.promptSource === 'airtable' && assistantId) {
-      const devRecord = await getRecordByFilter(Config_ID, 'responses', `{prompt_id} = "${assistantId}"`);
-      devContent = devRecord?.[0]?.content || '';
+      const { resolvedPrompt } = await composePrompt({
+        promptId: assistantId,
+        variables: promptVariables,
+      });
+      devContent = resolvedPrompt;
     } else {
       devContent = fallbackPrompt;
+      devContent = devContent.replace(/\{\{(\w+)\}\}/g, (_, key) => promptVariables[key] ?? '');
     }
-    devContent = devContent.replace(/\{\{(\w+)\}\}/g, (_, key) => promptVariables[key] ?? '');
 
     let assistant = null;
     let toolSchemas = [];

package/lib/providers/OpenAIResponsesProvider.js

@@ -1,7 +1,5 @@
 const { OpenAI } = require('openai');
 
-const { Config_ID } = require('../config/airtableConfig');
-
 const { retryWithBackoff } = require('../utils/retryUtils');
 const { logger } = require('../utils/logger');
 const { getCurrentMexicoDateTime } = require('../utils/dateUtils');
@@ -10,7 +8,7 @@ const { DefaultMemoryManager } = require('../memory/DefaultMemoryManager');
 
 const { getLastNMessages } = require('../helpers/messageHelper');
 
-const { getRecordByFilter } = require('../services/airtableService');
+const { composePrompt, resolveTools } = require('../services/promptComposerService');
 const { handleFunctionCalls } = require('./OpenAIResponsesProviderTools');
 
 const CONVERSATION_PREFIX = 'conv_';
@@ -314,12 +312,16 @@ class OpenAIResponsesProvider {
       accumulatedUsage.total_tokens += usage.total_tokens || 0;
     };
 
-    const devRecord = await getRecordByFilter(Config_ID, 'responses', `{prompt_id} = "${assistantId}"`);
-    let devContent = devRecord?.[0]?.content || '';
-    if (promptVariables) devContent = devContent.replace(/\{\{(\w+)\}\}/g, (_, key) => promptVariables[key] ?? '');
+    const { resolvedPrompt, snippetIds } = await composePrompt({
+      promptId: assistantId,
+      variables: promptVariables,
+    });
 
+    const { toolIds, filtered } = await resolveTools({ promptId: assistantId, assistant });
+    let devContent = resolvedPrompt;
     if (assistant?.tools?.size) {
-      const toolNames = Array.from(assistant.tools.keys()).join(', ');
+      const activeToolNames = filtered ? toolIds : Array.from(assistant.tools.keys());
+      const toolNames = activeToolNames.join(', ');
       devContent += `\n\nYou only have access to these tools: ${toolNames}. Do not call or reference any tools not listed here.`;
     }
 
@@ -376,6 +378,9 @@ class OpenAIResponsesProvider {
       tools_executed: allToolsExecuted,
       retries: totalRetries,
       usage: accumulatedUsage,
+      resolved_prompt: devContent,
+      snippet_ids: snippetIds,
+      tool_ids: toolIds,
     };
   }
 

package/lib/services/assistantService.js

@@ -243,6 +243,9 @@ const replyAssistantCore = async (code, message_ = null, thread_ = null, runOpti
     const response_id = runResult.run?.id || null;
     const usage = runResult.run?.usage || null;
     const model = runResult.run?.model || null;
+    const resolved_prompt = runResult.run?.resolved_prompt || null;
+    const snippet_ids = runResult.run?.snippet_ids || [];
+    const tool_ids = runResult.run?.tool_ids || [];
     
     const output = sanitizeOutput(rawOutput);
     if (rawOutput !== output) {
@@ -294,6 +297,9 @@ const replyAssistantCore = async (code, message_ = null, thread_ = null, runOpti
         prompt_config: prompt || null,
         response_id: response_id || null,
         context_message_count: lastMessage?.length || null,
+        resolved_prompt: resolved_prompt,
+        snippet_ids: snippet_ids,
+        tool_ids: tool_ids,
       }).catch(err => logger.error('[replyAssistant] Failed to store metrics', { error: err.message }));
 
       const alertThreshold = parseInt(process.env.TOKEN_ALERT_THRESHOLD, 10);

package/lib/services/promptComposerService.js

@@ -10,6 +10,7 @@ const CACHE_TTL = 5 * 60 * 1000;
 
 const promptCache = new MapCache({ maxSize: 50, ttl: CACHE_TTL });
 const snippetCache = new MapCache({ maxSize: 200, ttl: CACHE_TTL });
+const toolCache = new MapCache({ maxSize: 50, ttl: CACHE_TTL });
 
 async function fetchBasePrompt(promptId) {
   const cacheKey = `prompt:${promptId}`;
@@ -86,9 +87,66 @@ async function composePrompt({ promptId, variables = null, status = null }) {
   return { resolvedPrompt, snippetIds };
 }
 
+async function fetchToolMapping(promptId) {
+  const cacheKey = `tools:${promptId}`;
+  const cached = toolCache.get(cacheKey);
+  if (cached) return cached;
+
+  try {
+    const records = await getRecordByFilter(
+      Config_ID,
+      'tools',
+      `FIND("${promptId}", ARRAYJOIN({prompts}))`,
+    );
+    const tools = records || [];
+    toolCache.set(cacheKey, tools);
+    return tools;
+  } catch (error) {
+    logger.warn('[promptComposer] Failed to fetch tool mapping, using all registered tools', {
+      promptId, error: error.message,
+    });
+    return [];
+  }
+}
+
+async function resolveTools({ promptId, assistant, status = null }) {
+  if (!assistant?.tools?.size) return { toolIds: [], filtered: false };
+
+  const mappedTools = await fetchToolMapping(promptId);
+  if (!mappedTools.length) return { toolIds: [], filtered: false };
+
+  const activeTools = status
+    ? mappedTools.filter(t => !t.status || t.status === status)
+    : mappedTools;
+
+  const registeredNames = new Set(assistant.tools.keys());
+  const validToolIds = [];
+
+  for (const tool of activeTools) {
+    const id = tool.tool_id;
+    if (registeredNames.has(id)) {
+      validToolIds.push(id);
+    } else {
+      logger.warn('[promptComposer] Tool mapped in Airtable but not registered in code', {
+        toolId: id, promptId,
+      });
+    }
+  }
+
+  logger.debug('[promptComposer] Tools resolved', {
+    promptId,
+    mapped: activeTools.length,
+    valid: validToolIds.length,
+    filtered: true,
+  });
+
+  return { toolIds: validToolIds, filtered: true };
+}
+
 function clearCache() {
   promptCache.clear();
   snippetCache.clear();
+  toolCache.clear();
 }
 
-module.exports = { composePrompt, clearCache, _test: { applyVariables, sortSnippets } };
+module.exports = { composePrompt, resolveTools, clearCache, _test: { applyVariables, sortSnippets } };

package/package.json

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