@peopl-health/nexus 3.8.2 → 3.8.3

package/lib/eval/EvalProvider.js

@@ -7,7 +7,7 @@ const { Thread } = require('../models/threadModel');
 const { DefaultMemoryManager } = require('../memory/DefaultMemoryManager');
 const { OpenAIResponsesProvider } = require('../providers/OpenAIResponsesProvider');
 const { handleFunctionCalls } = require('../providers/OpenAIResponsesProviderTools');
-const { composePrompt } = require('../services/promptComposerService');
+const { composePrompt, resolveTools } = require('../services/promptComposerService');
 const { getAssistantById } = require('../services/assistantResolver');
 
 const MAX_FUNCTION_ROUNDS = parseInt(process.env.MAX_FUNCTION_ROUNDS || '5', 10);
@@ -123,9 +123,17 @@ class EvalProvider {
       try {
         assistant = getAssistantById(assistantId, thread);
         toolSchemas = assistant.getToolSchemas?.() || [];
-        if (assistant.tools?.size && !Object.keys(this.promptVersions).length) {
-          const toolNames = Array.from(assistant.tools.keys()).join(', ');
+        if (assistant.tools?.size) {
+          const { toolIds, filtered } = await resolveTools({ promptId: assistantId, assistant });
+          const activeToolNames = filtered && toolIds.length > 0
+            ? 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.`;
+
+          if (filtered && toolIds.length > 0) {
+            toolSchemas = toolSchemas.filter(s => toolIds.includes(s.function?.name));
+          }
         }
       } catch {
         logger.warn('[NexusEvalProvider] Failed to resolve assistant', { assistantId });
@@ -154,9 +162,7 @@ class EvalProvider {
       apiConfig.tool_choice = this.toolChoice;
     }
 
-    // Only send local tool schemas if NOT using a stored prompt with version
-    // (stored prompts have their own tool definitions on the platform)
-    if (toolSchemas.length > 0 && !apiConfig.prompt?.version) {
+    if (toolSchemas.length > 0) {
       apiConfig.tools = toolSchemas.map(schema => {
         if (schema.type === 'function' && schema.function) {
           const { name, description, parameters, strict } = schema.function;

package/lib/providers/OpenAIResponsesProvider.js

@@ -320,7 +320,9 @@ class OpenAIResponsesProvider {
     const { toolIds, filtered } = await resolveTools({ promptId: assistantId, assistant });
     let devContent = resolvedPrompt;
     if (assistant?.tools?.size) {
-      const activeToolNames = filtered ? toolIds : Array.from(assistant.tools.keys());
+      const activeToolNames = filtered && toolIds.length > 0
+        ? 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.`;
     }
@@ -333,14 +335,31 @@ class OpenAIResponsesProvider {
     if (promptVariables) promptConfig.variables = promptVariables;
     if (promptVersion) promptConfig.version = String(promptVersion);
 
-    const makeAPICall = (inputData) => retryWithBackoff(() =>
-      this.client.responses.create({
-        prompt: promptConfig,
-        input: inputData,
-        instructions: instructions || additionalInstructions || '',
-        metadata,
-        tool_choice: toolChoice
-      }), { providerName: PROVIDER_NAME });
+    const toolSchemas = assistant?.getToolSchemas?.() || [];
+    const activeToolSchemas = filtered && toolIds.length > 0
+      ? toolSchemas.filter(s => toolIds.includes(s.function?.name))
+      : toolSchemas;
+
+    const apiCallConfig = {
+      prompt: promptConfig,
+      instructions: instructions || additionalInstructions || '',
+      metadata,
+      tool_choice: toolChoice
+    };
+    if (activeToolSchemas.length > 0) {
+      apiCallConfig.tools = activeToolSchemas.map(schema => {
+        if (schema.type === 'function' && schema.function) {
+          const { name, description, parameters, strict } = schema.function;
+          return { type: 'function', name, description, parameters, strict };
+        }
+        return schema;
+      });
+    }
+
+    const makeAPICall = (inputData) => retryWithBackoff(
+      () => this.client.responses.create({ input: inputData, ...apiCallConfig }),
+      { providerName: PROVIDER_NAME }
+    );
 
     const { result: response, retries } = await makeAPICall(input);
     totalRetries += retries;

package/lib/services/promptComposerService.js

@@ -38,7 +38,7 @@ async function fetchSnippets(promptId) {
     snippetCache.set(cacheKey, snippets);
     return snippets;
   } catch (error) {
-    logger.warn('[promptComposer] Failed to fetch snippets, continuing without them', {
+    logger.error('[promptComposer] Failed to fetch snippets', {
       promptId, error: error.message,
     });
     return [];
@@ -60,6 +60,11 @@ function applyVariables(text, variables) {
 
 async function composePrompt({ promptId, variables = null, status = null }) {
   const baseRecord = await fetchBasePrompt(promptId);
+
+  if (!baseRecord) {
+    logger.error('[promptComposer] Base prompt not found in Airtable', { promptId });
+  }
+
   let baseContent = baseRecord?.content || '';
 
   const snippets = await fetchSnippets(promptId);
@@ -67,11 +72,11 @@ async function composePrompt({ promptId, variables = null, status = null }) {
     ? snippets.filter(s => !s.status || s.status === status)
     : snippets;
 
-  const sorted = sortSnippets(activeSnippets);
-  const snippetIds = sorted.map(s => s.snippet_id || s.name || 'unknown');
+  const sorted = sortSnippets(activeSnippets).filter(s => s.content);
+  const snippetIds = sorted.map(s => s.snippet_id);
 
   if (sorted.length > 0) {
-    const snippetTexts = sorted.map(s => s.content).filter(Boolean);
+    const snippetTexts = sorted.map(s => s.content);
     baseContent = [baseContent, ...snippetTexts].join('\n\n');
   }
 
@@ -102,7 +107,7 @@ async function fetchToolMapping(promptId) {
     toolCache.set(cacheKey, tools);
     return tools;
   } catch (error) {
-    logger.warn('[promptComposer] Failed to fetch tool mapping, using all registered tools', {
+    logger.warn('[promptComposer] Failed to fetch tool mapping, returning empty list', {
       promptId, error: error.message,
     });
     return [];

package/package.json

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