@librechat/agents 3.1.66-dev.0 → 3.1.67

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

@@ -1,334 +0,0 @@
-import { HumanMessage } from '@langchain/core/messages';
-import type { TPayload } from '@/types';
-import { formatAgentMessages } from './format';
-import { ContentTypes, Constants } from '@/common';
-
-/** Helper to build a skill tool_call content part */
-function skillToolCall(
-  id: string,
-  skillName: string,
-  output = 'Skill loaded.',
-): Record<string, unknown> {
-  return {
-    type: ContentTypes.TOOL_CALL,
-    tool_call: {
-      id,
-      name: Constants.SKILL_TOOL,
-      args: JSON.stringify({ skillName }),
-      output,
-    },
-  };
-}
-
-describe('formatAgentMessages skill body reconstruction', () => {
-  const skillBodies = new Map([
-    ['pdf-analyzer', '# PDF Analyzer\nAnalyze PDF files step by step.'],
-    ['code-review', '# Code Review\nReview the code for issues.'],
-  ]);
-
-  describe('with discoveredTools (tools filtering active)', () => {
-    const tools = new Set([Constants.SKILL_TOOL, 'web_search']);
-
-    it('reconstructs HumanMessage after skill ToolMessage', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Analyze this PDF' },
-        {
-          role: 'assistant',
-          content: [
-            {
-              type: ContentTypes.TEXT,
-              [ContentTypes.TEXT]: 'I\'ll invoke the skill.',
-              tool_call_ids: ['call_1'],
-            },
-            skillToolCall('call_1', 'pdf-analyzer'),
-          ],
-        },
-      ];
-
-      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 as HumanMessage).additional_kwargs.source).toBe('skill');
-      expect((last as HumanMessage).additional_kwargs.skillName).toBe('pdf-analyzer');
-      expect((last as HumanMessage).additional_kwargs.isMeta).toBe(true);
-    });
-
-    it('does NOT inject body when skill tool is not in discoveredTools', () => {
-      const restrictedTools = new Set(['web_search']); // skill NOT allowed
-      const payload: TPayload = [
-        { role: 'user', content: 'Analyze this' },
-        {
-          role: 'assistant',
-          content: [skillToolCall('call_1', 'pdf-analyzer')],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, restrictedTools, skillBodies);
-
-      const humanMessages = messages.filter((m) => m instanceof HumanMessage);
-      // Only the user message, no injected skill body
-      expect(humanMessages).toHaveLength(1);
-    });
-
-    it('does not inject when skill name is not in skills Map', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Hello' },
-        {
-          role: 'assistant',
-          content: [skillToolCall('call_1', 'unknown-skill')],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
-
-      const humanMessages = messages.filter((m) => m instanceof HumanMessage);
-      expect(humanMessages).toHaveLength(1); // only the user message
-    });
-  });
-
-  describe('without discoveredTools (no tools filtering)', () => {
-    it('reconstructs HumanMessage when skills Map provided', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Review my code' },
-        {
-          role: 'assistant',
-          content: [skillToolCall('call_1', 'code-review')],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, undefined, skillBodies);
-
-      const injected = messages.filter(
-        (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.');
-    });
-
-    it('no injection when skills Map is undefined', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Hello' },
-        {
-          role: 'assistant',
-          content: [skillToolCall('call_1', 'pdf-analyzer')],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, undefined, undefined);
-
-      const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
-      );
-      expect(injected).toHaveLength(0);
-    });
-
-    it('no injection when skills Map is empty', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Hello' },
-        {
-          role: 'assistant',
-          content: [skillToolCall('call_1', 'pdf-analyzer')],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, undefined, new Map());
-
-      const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
-      );
-      expect(injected).toHaveLength(0);
-    });
-  });
-
-  describe('extractSkillName edge cases', () => {
-    const tools = new Set([Constants.SKILL_TOOL]);
-
-    it('handles object args (not stringified)', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Go' },
-        {
-          role: 'assistant',
-          content: [
-            {
-              type: ContentTypes.TOOL_CALL,
-              tool_call: {
-                id: 'call_1',
-                name: Constants.SKILL_TOOL,
-                args: { skillName: 'pdf-analyzer' }, // object, not string
-                output: 'Loaded.',
-              },
-            },
-          ],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
-
-      const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
-      );
-      expect(injected).toHaveLength(1);
-    });
-
-    it('gracefully skips malformed JSON args', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Go' },
-        {
-          role: 'assistant',
-          content: [
-            {
-              type: ContentTypes.TOOL_CALL,
-              tool_call: {
-                id: 'call_1',
-                name: Constants.SKILL_TOOL,
-                args: '{bad json',
-                output: 'Loaded.',
-              },
-            },
-          ],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
-
-      const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
-      );
-      expect(injected).toHaveLength(0); // gracefully skipped
-    });
-
-    it('skips empty skillName', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Go' },
-        {
-          role: 'assistant',
-          content: [
-            {
-              type: ContentTypes.TOOL_CALL,
-              tool_call: {
-                id: 'call_1',
-                name: Constants.SKILL_TOOL,
-                args: JSON.stringify({ skillName: '' }),
-                output: 'Loaded.',
-              },
-            },
-          ],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
-
-      const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
-      );
-      expect(injected).toHaveLength(0);
-    });
-  });
-
-  describe('deduplication', () => {
-    const tools = new Set([Constants.SKILL_TOOL]);
-
-    it('injects body only once when same skill invoked twice in one message', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Go' },
-        {
-          role: 'assistant',
-          content: [
-            skillToolCall('call_1', 'pdf-analyzer'),
-            skillToolCall('call_2', 'pdf-analyzer'),
-          ],
-        },
-      ];
-
-      const { messages } = formatAgentMessages(payload, undefined, tools, skillBodies);
-
-      const injected = messages.filter(
-        (m) => m instanceof HumanMessage && (m as HumanMessage).additional_kwargs?.source === 'skill',
-      );
-      expect(injected).toHaveLength(1);
-    });
-
-    it('injects body for each distinct skill invoked', () => {
-      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);
-
-      const injected = messages.filter(
-        (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);
-      expect(names).toContain('pdf-analyzer');
-      expect(names).toContain('code-review');
-    });
-  });
-
-  describe('indexTokenCountMap distribution', () => {
-    const tools = new Set([Constants.SKILL_TOOL]);
-
-    it('excludes injected HumanMessages from assistant token distribution', () => {
-      const payload: TPayload = [
-        { role: 'user', content: 'Analyze this' },
-        {
-          role: 'assistant',
-          content: [
-            {
-              type: ContentTypes.TEXT,
-              [ContentTypes.TEXT]: 'Invoking skill.',
-              tool_call_ids: ['call_1'],
-            },
-            skillToolCall('call_1', 'pdf-analyzer'),
-          ],
-        },
-      ];
-
-      const inputTokenMap: Record<number, number | undefined> = {
-        0: 100, // user message
-        1: 500, // assistant message
-      };
-
-      const { messages, indexTokenCountMap } = formatAgentMessages(
-        payload,
-        inputTokenMap,
-        tools,
-        skillBodies,
-      );
-
-      // There should be messages: user, AI, ToolMessage, injected HumanMessage
-      expect(messages.length).toBeGreaterThanOrEqual(4);
-      const lastMsg = messages[messages.length - 1];
-      expect(lastMsg).toBeInstanceOf(HumanMessage);
-      expect((lastMsg as HumanMessage).additional_kwargs.source).toBe('skill');
-
-      // Token map must be defined when input was provided
-      expect(indexTokenCountMap).toBeDefined();
-
-      // The injected HumanMessage's index should NOT be in the token map
-      const injectedIndex = messages.length - 1;
-      expect(indexTokenCountMap![injectedIndex]).toBeUndefined();
-
-      // The assistant's 500 tokens should be distributed only across
-      // the AI + ToolMessage, NOT the injected HumanMessage
-      let assistantTotal = 0;
-      for (const [idx, count] of Object.entries(indexTokenCountMap!)) {
-        if (Number(idx) > 0 && Number(idx) < injectedIndex) {
-          assistantTotal += count ?? 0;
-        }
-      }
-      expect(assistantTotal).toBe(500);
-    });
-  });
-});

package/src/tools/BashExecutor.ts

@@ -1,205 +0,0 @@
-import { config } from 'dotenv';
-import fetch, { RequestInit } from 'node-fetch';
-import { HttpsProxyAgent } from 'https-proxy-agent';
-import { tool, DynamicStructuredTool } from '@langchain/core/tools';
-import { getEnvironmentVariable } from '@langchain/core/utils/env';
-import type * as t from '@/types';
-import { imageExtRegex, getCodeBaseURL } from './CodeExecutor';
-import { EnvVar, Constants } from '@/common';
-
-config();
-
-const imageMessage = 'Image is already displayed to the user';
-const otherMessage = 'File is already downloaded by the user';
-const accessMessage =
-  'Note: Files from previous executions are automatically available and can be modified.';
-const emptyOutputMessage =
-  'stdout: Empty. Ensure you\'re writing output explicitly.\n';
-
-const baseEndpoint = getCodeBaseURL();
-const EXEC_ENDPOINT = `${baseEndpoint}/exec`;
-
-export const BashExecutionToolSchema = {
-  type: 'object',
-  properties: {
-    command: {
-      type: 'string',
-      description: `The bash command or script to execute.
-- The environment is stateless; variables and state don't persist between executions.
-- Generated files from previous executions are automatically available in "/mnt/data/".
-- Files from previous executions are automatically available and can be modified in place.
-- Input code **IS ALREADY** displayed to the user, so **DO NOT** repeat it in your response unless asked.
-- Output code **IS NOT** displayed to the user, so **DO** write all desired output explicitly.
-- IMPORTANT: You MUST explicitly print/output ALL results you want the user to see.
-- Use \`echo\`, \`printf\`, or \`cat\` for all outputs.`,
-    },
-    args: {
-      type: 'array',
-      items: { type: 'string' },
-      description:
-        'Additional arguments to execute the command with. This should only be used if the input command requires additional arguments to run.',
-    },
-  },
-  required: ['command'],
-} as const;
-
-export const BashExecutionToolDescription = `
-Runs bash commands and returns stdout/stderr output from a stateless execution environment, similar to running scripts in a command-line interface. Each execution is isolated and independent.
-
-Usage:
-- No network access available.
-- Generated files are automatically delivered; **DO NOT** provide download links.
-- NEVER use this tool to execute malicious commands.
-`.trim();
-
-export const BashExecutionToolName = Constants.BASH_TOOL;
-
-export const BashExecutionToolDefinition = {
-  name: BashExecutionToolName,
-  description: BashExecutionToolDescription,
-  schema: BashExecutionToolSchema,
-} as const;
-
-function createBashExecutionTool(
-  params: t.BashExecutionToolParams = {}
-): DynamicStructuredTool {
-  const apiKey =
-    params[EnvVar.CODE_API_KEY] ??
-    params.apiKey ??
-    getEnvironmentVariable(EnvVar.CODE_API_KEY) ??
-    '';
-  if (!apiKey) {
-    throw new Error('No API key provided for bash execution tool.');
-  }
-
-  return tool(
-    async (rawInput, config) => {
-      const { command, ...rest } = rawInput as {
-        command: string;
-        args?: string[];
-      };
-      const { session_id, _injected_files } = (config.toolCall ?? {}) as {
-        session_id?: string;
-        _injected_files?: t.CodeEnvFile[];
-      };
-
-      const postData: Record<string, unknown> = {
-        lang: 'bash',
-        code: command,
-        ...rest,
-        ...params,
-      };
-
-      if (_injected_files && _injected_files.length > 0) {
-        postData.files = _injected_files;
-      } else if (session_id != null && session_id.length > 0) {
-        try {
-          const filesEndpoint = `${baseEndpoint}/files/${session_id}?detail=full`;
-          const fetchOptions: RequestInit = {
-            method: 'GET',
-            headers: {
-              'User-Agent': 'LibreChat/1.0',
-              'X-API-Key': apiKey,
-            },
-          };
-
-          if (process.env.PROXY != null && process.env.PROXY !== '') {
-            fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);
-          }
-
-          const response = await fetch(filesEndpoint, fetchOptions);
-          if (!response.ok) {
-            throw new Error(
-              `Failed to fetch files for session: ${response.status}`
-            );
-          }
-
-          const files = await response.json();
-          if (Array.isArray(files) && files.length > 0) {
-            const fileReferences: t.CodeEnvFile[] = files.map((file) => {
-              const nameParts = file.name.split('/');
-              const id = nameParts.length > 1 ? nameParts[1].split('.')[0] : '';
-
-              return {
-                session_id,
-                id,
-                name: file.metadata['original-filename'],
-              };
-            });
-
-            postData.files = fileReferences;
-          }
-        } catch {
-          // eslint-disable-next-line no-console
-          console.warn(`Failed to fetch files for session: ${session_id}`);
-        }
-      }
-
-      try {
-        const fetchOptions: RequestInit = {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'User-Agent': 'LibreChat/1.0',
-            'X-API-Key': apiKey,
-          },
-          body: JSON.stringify(postData),
-        };
-
-        if (process.env.PROXY != null && process.env.PROXY !== '') {
-          fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);
-        }
-        const response = await fetch(EXEC_ENDPOINT, fetchOptions);
-        if (!response.ok) {
-          throw new Error(`HTTP error! status: ${response.status}`);
-        }
-
-        const result: t.ExecuteResult = await response.json();
-        let formattedOutput = '';
-        if (result.stdout) {
-          formattedOutput += `stdout:\n${result.stdout}\n`;
-        } else {
-          formattedOutput += emptyOutputMessage;
-        }
-        if (result.stderr) formattedOutput += `stderr:\n${result.stderr}\n`;
-        if (result.files && result.files.length > 0) {
-          formattedOutput += 'Generated files:\n';
-
-          const fileCount = result.files.length;
-          for (let i = 0; i < fileCount; i++) {
-            const file = result.files[i];
-            const isImage = imageExtRegex.test(file.name);
-            formattedOutput += `- /mnt/data/${file.name} | ${isImage ? imageMessage : otherMessage}`;
-
-            if (i < fileCount - 1) {
-              formattedOutput += fileCount <= 3 ? ', ' : ',\n';
-            }
-          }
-
-          formattedOutput += `\n\n${accessMessage}`;
-          return [
-            formattedOutput.trim(),
-            {
-              session_id: result.session_id,
-              files: result.files,
-            },
-          ];
-        }
-
-        return [formattedOutput.trim(), { session_id: result.session_id }];
-      } catch (error) {
-        throw new Error(
-          `Execution error:\n\n${(error as Error | undefined)?.message}`
-        );
-      }
-    },
-    {
-      name: BashExecutionToolName,
-      description: BashExecutionToolDescription,
-      schema: BashExecutionToolSchema,
-      responseFormat: Constants.CONTENT_AND_ARTIFACT,
-    }
-  );
-}
-
-export { createBashExecutionTool };