@librechat/agents 3.2.21 → 3.2.32

package/src/messages/formatAgentMessages.skills.test.ts

@@ -1,13 +1,13 @@
 import { HumanMessage } from '@langchain/core/messages';
 import type { TPayload } from '@/types';
-import { formatAgentMessages } from './format';
 import { ContentTypes, Constants } from '@/common';
+import { formatAgentMessages } from './format';
 
 /** Helper to build a skill tool_call content part */
 function skillToolCall(
   id: string,
   skillName: string,
-  output = 'Skill loaded.',
+  output = 'Skill loaded.'
 ): Record<string, unknown> {
   return {
     type: ContentTypes.TOOL_CALL,
@@ -45,15 +45,24 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies
+      );
 
       // user, AI, ToolMessage, injected HumanMessage
       expect(messages.length).toBeGreaterThanOrEqual(4);
       const last = messages[messages.length - 1];
       expect(last).toBeInstanceOf(HumanMessage);
-      expect(last.content).toBe('# PDF Analyzer\nAnalyze PDF files step by step.');
+      expect(last.content).toBe(
+        '# PDF Analyzer\nAnalyze PDF files step by step.'
+      );
       expect((last as HumanMessage).additional_kwargs.source).toBe('skill');
-      expect((last as HumanMessage).additional_kwargs.skillName).toBe('pdf-analyzer');
+      expect((last as HumanMessage).additional_kwargs.skillName).toBe(
+        'pdf-analyzer'
+      );
       expect((last as HumanMessage).additional_kwargs.isMeta).toBe(true);
     });
 
@@ -67,7 +76,12 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, restrictedTools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        restrictedTools,
+        skillBodies
+      );
 
       const humanMessages = messages.filter((m) => m instanceof HumanMessage);
       // Only the user message, no injected skill body
@@ -83,7 +97,12 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies
+      );
 
       const humanMessages = messages.filter((m) => m instanceof HumanMessage);
       expect(humanMessages).toHaveLength(1); // only the user message
@@ -100,13 +119,22 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, undefined, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        undefined,
+        skillBodies
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(1);
-      expect(injected[0].content).toBe('# Code Review\nReview the code for issues.');
+      expect(injected[0].content).toBe(
+        '# Code Review\nReview the code for issues.'
+      );
     });
 
     it('no injection when skills Map is undefined', () => {
@@ -118,10 +146,17 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, undefined, undefined);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        undefined,
+        undefined
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(0);
     });
@@ -135,10 +170,17 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, undefined, new Map());
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        undefined,
+        new Map()
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(0);
     });
@@ -166,10 +208,17 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(1);
     });
@@ -193,10 +242,17 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(0); // gracefully skipped
     });
@@ -220,10 +276,17 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(0);
     });
@@ -244,10 +307,17 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(1);
     });
@@ -264,13 +334,22 @@ describe('formatAgentMessages skill body reconstruction', () => {
         },
       ];
 
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies
+      );
 
       const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
       );
       expect(injected).toHaveLength(2);
-      const names = injected.map((m) => (m as HumanMessage).additional_kwargs.skillName);
+      const names = injected.map(
+        (m) => (m as HumanMessage).additional_kwargs.skillName
+      );
       expect(names).toContain('pdf-analyzer');
       expect(names).toContain('code-review');
     });
@@ -304,7 +383,7 @@ describe('formatAgentMessages skill body reconstruction', () => {
         payload,
         inputTokenMap,
         tools,
-        skillBodies,
+        skillBodies
       );
 
       // There should be messages: user, AI, ToolMessage, injected HumanMessage
@@ -331,4 +410,104 @@ describe('formatAgentMessages skill body reconstruction', () => {
       expect(assistantTotal).toBe(500);
     });
   });
+
+  describe('skipSkillBodyNames (fresh-prime dedupe)', () => {
+    const tools = new Set([Constants.SKILL_TOOL]);
+
+    const injectedSkillBodies = (
+      messages: ReturnType<typeof formatAgentMessages>['messages']
+    ) =>
+      messages.filter(
+        (m) =>
+          m instanceof HumanMessage &&
+          (m as HumanMessage).additional_kwargs.source === 'skill'
+      );
+
+    it('does NOT reconstruct body when skill name is in skipSkillBodyNames', () => {
+      const payload: TPayload = [
+        { role: 'user', content: 'Review my code' },
+        {
+          role: 'assistant',
+          content: [skillToolCall('call_1', 'code-review')],
+        },
+      ];
+
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies,
+        { skipSkillBodyNames: new Set(['code-review']) }
+      );
+
+      expect(injectedSkillBodies(messages)).toHaveLength(0);
+    });
+
+    it('reconstructs only names NOT in skipSkillBodyNames', () => {
+      const payload: TPayload = [
+        { role: 'user', content: 'Go' },
+        {
+          role: 'assistant',
+          content: [
+            skillToolCall('call_1', 'pdf-analyzer'),
+            skillToolCall('call_2', 'code-review'),
+          ],
+        },
+      ];
+
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies,
+        { skipSkillBodyNames: new Set(['code-review']) }
+      );
+
+      const injected = injectedSkillBodies(messages);
+      expect(injected).toHaveLength(1);
+      expect((injected[0] as HumanMessage).additional_kwargs.skillName).toBe(
+        'pdf-analyzer'
+      );
+    });
+
+    it('reconstructs normally when skipSkillBodyNames is empty', () => {
+      const payload: TPayload = [
+        { role: 'user', content: 'Review my code' },
+        {
+          role: 'assistant',
+          content: [skillToolCall('call_1', 'code-review')],
+        },
+      ];
+
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        tools,
+        skillBodies,
+        { skipSkillBodyNames: new Set() }
+      );
+
+      expect(injectedSkillBodies(messages)).toHaveLength(1);
+    });
+
+    it('skips in the non-tools-filtering path too', () => {
+      const payload: TPayload = [
+        { role: 'user', content: 'Review my code' },
+        {
+          role: 'assistant',
+          content: [skillToolCall('call_1', 'code-review')],
+        },
+      ];
+
+      const { messages } = formatAgentMessages(
+        payload,
+        undefined,
+        undefined,
+        skillBodies,
+        { skipSkillBodyNames: new Set(['code-review']) }
+      );
+
+      expect(injectedSkillBodies(messages)).toHaveLength(0);
+    });
+  });
 });