@librechat/agents 2.4.0 → 2.4.11

package/dist/esm/tools/CodeExecutor.mjs

@@ -8,11 +8,15 @@ import { Constants, EnvVar } from '../common/enum.mjs';
 
 config();
 const imageExtRegex = /\.(jpg|jpeg|png|gif|webp)$/i;
-const getCodeBaseURL = () => getEnvironmentVariable(EnvVar.CODE_BASEURL) ?? Constants.OFFICIAL_CODE_BASEURL;
-const imageMessage = ' - the image is already displayed to the user';
-const otherMessage = ' - the file is already downloaded by the user';
+const getCodeBaseURL = () => getEnvironmentVariable(EnvVar.CODE_BASEURL) ??
+    Constants.OFFICIAL_CODE_BASEURL;
+const imageMessage = 'Image is already displayed to the user';
+const otherMessage = 'File is already downloaded by the user';
+const accessMessage = 'Note: Files are READ-ONLY snapshots. Save any changes as NEW files with different names. Original files CANNOT be modified in-place. To access these files again, you MUST include the `session_id` in future sessions. Without it, previously generated files will be inaccessible.';
+const emptyOutputMessage = 'stdout: Empty. Ensure you\'re writing output explicitly.\n';
 const CodeExecutionToolSchema = z.object({
-    lang: z.enum([
+    lang: z
+        .enum([
         'py',
         'js',
         'ts',
@@ -38,12 +42,27 @@ const CodeExecutionToolSchema = z.object({
 - js: use the \`console\` or \`process\` methods for all outputs.
 - r: IMPORTANT: No X11 display available. ALL graphics MUST use Cairo library (library(Cairo)).
 - Other languages: use appropriate output functions.`),
-    args: z.array(z.string()).optional()
+    session_id: z
+        .string()
+        .optional()
+        .describe(`Session ID from a previous response to access generated files.
+- Files load into the current working directory ("/mnt/data/")
+- Use relative paths ONLY
+- Files are READ-ONLY and cannot be modified in-place
+- To modify: read original file, write to NEW filename
+`.trim()),
+    args: z
+        .array(z.string())
+        .optional()
         .describe('Additional arguments to execute the code with. This should only be used if the input code requires additional arguments to run.'),
 });
-const EXEC_ENDPOINT = `${getCodeBaseURL()}/exec`;
+const baseEndpoint = getCodeBaseURL();
+const EXEC_ENDPOINT = `${baseEndpoint}/exec`;
 function createCodeExecutionTool(params = {}) {
-    const apiKey = params[EnvVar.CODE_API_KEY] ?? params.apiKey ?? getEnvironmentVariable(EnvVar.CODE_API_KEY) ?? '';
+    const apiKey = params[EnvVar.CODE_API_KEY] ??
+        params.apiKey ??
+        getEnvironmentVariable(EnvVar.CODE_API_KEY) ??
+        '';
     if (!apiKey) {
         throw new Error('No API key provided for code execution tool.');
     }
@@ -55,13 +74,55 @@ Usage:
 - Generated files are automatically delivered; **DO NOT** provide download links.
 - NEVER use this tool to execute malicious code.
 `.trim();
-    return tool(async ({ lang, code, ...rest }) => {
+    return tool(async ({ lang, code, session_id, ...rest }) => {
         const postData = {
             lang,
             code,
             ...rest,
             ...params,
         };
+        if (session_id != null && session_id.length > 0) {
+            try {
+                const filesEndpoint = `${baseEndpoint}/files/${session_id}?detail=full`;
+                const fetchOptions = {
+                    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 = files.map((file) => {
+                        // Extract the ID from the file name (part after session ID prefix and before extension)
+                        const nameParts = file.name.split('/');
+                        const id = nameParts.length > 1 ? nameParts[1].split('.')[0] : '';
+                        return {
+                            session_id,
+                            id,
+                            name: file.metadata['original-filename'],
+                        };
+                    });
+                    if (!postData.files) {
+                        postData.files = fileReferences;
+                    }
+                    else if (Array.isArray(postData.files)) {
+                        postData.files = [...postData.files, ...fileReferences];
+                    }
+                }
+            }
+            catch {
+                // eslint-disable-next-line no-console
+                console.warn(`Failed to fetch files for session: ${session_id}`);
+            }
+        }
         try {
             const fetchOptions = {
                 method: 'POST',
@@ -85,7 +146,7 @@ Usage:
                 formattedOutput += `stdout:\n${result.stdout}\n`;
             }
             else {
-                formattedOutput += 'stdout: Empty. Ensure you\'re writing output explicitly.\n';
+                formattedOutput += emptyOutputMessage;
             }
             if (result.stderr)
                 formattedOutput += `stderr:\n${result.stderr}\n`;
@@ -93,22 +154,26 @@ Usage:
                 formattedOutput += 'Generated files:\n';
                 const fileCount = result.files.length;
                 for (let i = 0; i < fileCount; i++) {
-                    const filename = result.files[i].name;
-                    const isImage = imageExtRegex.test(filename);
-                    formattedOutput += isImage ? `${filename}${imageMessage}` : `${filename}${otherMessage}`;
+                    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';
                     }
                 }
-                return [formattedOutput.trim(), {
+                formattedOutput += `\nsession_id: ${result.session_id}\n\n${accessMessage}`;
+                return [
+                    formattedOutput.trim(),
+                    {
                         session_id: result.session_id,
                         files: result.files,
-                    }];
+                    },
+                ];
             }
             return [formattedOutput.trim(), { session_id: result.session_id }];
         }
         catch (error) {
-            return [`Execution error:\n\n${error?.message}`, {}];
+            throw new Error(`Execution error:\n\n${error?.message}`);
         }
     }, {
         name: Constants.EXECUTE_CODE,

package/dist/esm/tools/CodeExecutor.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"CodeExecutor.mjs","sources":["../../../src/tools/CodeExecutor.ts"],"sourcesContent":["import { z } from 'zod';\nimport { config } from 'dotenv';\nimport fetch, { RequestInit } from 'node-fetch';\nimport { HttpsProxyAgent } from 'https-proxy-agent';\nimport { tool, DynamicStructuredTool } from '@langchain/core/tools';\nimport { getEnvironmentVariable } from '@langchain/core/utils/env';\nimport type * as t from '@/types';\nimport { EnvVar, Constants } from '@/common';\n\nconfig();\n\nexport const imageExtRegex = /\\.(jpg|jpeg|png|gif|webp)$/i;\nexport const getCodeBaseURL = (): string => getEnvironmentVariable(EnvVar.CODE_BASEURL) ?? Constants.OFFICIAL_CODE_BASEURL;\n\nconst imageMessage = ' - the image is already displayed to the user';\nconst otherMessage = ' - the file is already downloaded by the user';\n\nconst CodeExecutionToolSchema = z.object({\n  lang: z.enum([\n    'py',\n    'js',\n    'ts',\n    'c',\n    'cpp',\n    'java',\n    'php',\n    'rs',\n    'go',\n    'd',\n    'f90',\n    'r',\n  ])\n    .describe('The programming language or runtime to execute the code in.'),\n  code: z.string()\n    .describe(`The complete, self-contained code to execute, without any truncation or minimization.\n- The environment is stateless; variables and imports don't persist between executions.\n- Input code **IS ALREADY** displayed to the user, so **DO NOT** repeat it in your response unless asked.\n- Output code **IS NOT** displayed to the user, so **DO** write all desired output explicitly.\n- IMPORTANT: You MUST explicitly print/output ALL results you want the user to see.\n- py: This is not a Jupyter notebook environment. Use \\`print()\\` for all outputs.\n- py: Matplotlib: Use \\`plt.savefig()\\` to save plots as files.\n- js: use the \\`console\\` or \\`process\\` methods for all outputs.\n- r: IMPORTANT: No X11 display available. ALL graphics MUST use Cairo library (library(Cairo)).\n- Other languages: use appropriate output functions.`),\n  args: z.array(z.string()).optional()\n    .describe('Additional arguments to execute the code with. This should only be used if the input code requires additional arguments to run.'),\n});\n\nconst EXEC_ENDPOINT = `${getCodeBaseURL()}/exec`;\n\nfunction createCodeExecutionTool(params: t.CodeExecutionToolParams = {}): DynamicStructuredTool<typeof CodeExecutionToolSchema> {\n  const apiKey = params[EnvVar.CODE_API_KEY] ?? params.apiKey ?? getEnvironmentVariable(EnvVar.CODE_API_KEY) ?? '';\n  if (!apiKey) {\n    throw new Error('No API key provided for code execution tool.');\n  }\n\n  const description = `\nRuns code 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.\n\nUsage:\n- No network access available.\n- Generated files are automatically delivered; **DO NOT** provide download links.\n- NEVER use this tool to execute malicious code.\n`.trim();\n\n  return tool<typeof CodeExecutionToolSchema>(\n    async ({ lang, code, ...rest }) => {\n      const postData = {\n        lang,\n        code,\n        ...rest,\n        ...params,\n      };\n\n      try {\n        const fetchOptions: RequestInit = {\n          method: 'POST',\n          headers: {\n            'Content-Type': 'application/json',\n            'User-Agent': 'LibreChat/1.0',\n            'X-API-Key': apiKey,\n          },\n          body: JSON.stringify(postData),\n        };\n\n        if (process.env.PROXY != null && process.env.PROXY !== '') {\n          fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);\n        }\n        const response = await fetch(EXEC_ENDPOINT, fetchOptions);\n        if (!response.ok) {\n          throw new Error(`HTTP error! status: ${response.status}`);\n        }\n\n        const result: t.ExecuteResult = await response.json();\n        let formattedOutput = '';\n        if (result.stdout) {\n          formattedOutput += `stdout:\\n${result.stdout}\\n`;\n        } else {\n          formattedOutput += 'stdout: Empty. Ensure you\\'re writing output explicitly.\\n';\n        }\n        if (result.stderr) formattedOutput += `stderr:\\n${result.stderr}\\n`;\n        if (result.files && result.files.length > 0) {\n          formattedOutput += 'Generated files:\\n';\n\n          const fileCount = result.files.length;\n          for (let i = 0; i < fileCount; i++) {\n            const filename = result.files[i].name;\n            const isImage = imageExtRegex.test(filename);\n            formattedOutput += isImage ? `${filename}${imageMessage}` : `${filename}${otherMessage}`;\n\n            if (i < fileCount - 1) {\n              formattedOutput += fileCount <= 3 ? ', ' : ',\\n';\n            }\n          }\n\n          return [formattedOutput.trim(), {\n            session_id: result.session_id,\n            files: result.files,\n          }];\n        }\n\n        return [formattedOutput.trim(), { session_id: result.session_id }];\n      } catch (error) {\n        return [`Execution error:\\n\\n${(error as Error | undefined)?.message}`, {}];\n      }\n    },\n    {\n      name: Constants.EXECUTE_CODE,\n      description,\n      schema: CodeExecutionToolSchema,\n      responseFormat: Constants.CONTENT_AND_ARTIFACT,\n    }\n  );\n}\n\nexport { createCodeExecutionTool };"],"names":[],"mappings":"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"}
+{"version":3,"file":"CodeExecutor.mjs","sources":["../../../src/tools/CodeExecutor.ts"],"sourcesContent":["import { z } from 'zod';\nimport { config } from 'dotenv';\nimport fetch, { RequestInit } from 'node-fetch';\nimport { HttpsProxyAgent } from 'https-proxy-agent';\nimport { tool, DynamicStructuredTool } from '@langchain/core/tools';\nimport { getEnvironmentVariable } from '@langchain/core/utils/env';\nimport type * as t from '@/types';\nimport { EnvVar, Constants } from '@/common';\n\nconfig();\n\nexport const imageExtRegex = /\\.(jpg|jpeg|png|gif|webp)$/i;\nexport const getCodeBaseURL = (): string =>\n  getEnvironmentVariable(EnvVar.CODE_BASEURL) ??\n  Constants.OFFICIAL_CODE_BASEURL;\n\nconst imageMessage = 'Image is already displayed to the user';\nconst otherMessage = 'File is already downloaded by the user';\nconst accessMessage =\n  'Note: Files are READ-ONLY snapshots. Save any changes as NEW files with different names. Original files CANNOT be modified in-place. To access these files again, you MUST include the `session_id` in future sessions. Without it, previously generated files will be inaccessible.';\nconst emptyOutputMessage =\n  'stdout: Empty. Ensure you\\'re writing output explicitly.\\n';\n\nconst CodeExecutionToolSchema = z.object({\n  lang: z\n    .enum([\n      'py',\n      'js',\n      'ts',\n      'c',\n      'cpp',\n      'java',\n      'php',\n      'rs',\n      'go',\n      'd',\n      'f90',\n      'r',\n    ])\n    .describe('The programming language or runtime to execute the code in.'),\n  code: z.string()\n    .describe(`The complete, self-contained code to execute, without any truncation or minimization.\n- The environment is stateless; variables and imports don't persist between executions.\n- Input code **IS ALREADY** displayed to the user, so **DO NOT** repeat it in your response unless asked.\n- Output code **IS NOT** displayed to the user, so **DO** write all desired output explicitly.\n- IMPORTANT: You MUST explicitly print/output ALL results you want the user to see.\n- py: This is not a Jupyter notebook environment. Use \\`print()\\` for all outputs.\n- py: Matplotlib: Use \\`plt.savefig()\\` to save plots as files.\n- js: use the \\`console\\` or \\`process\\` methods for all outputs.\n- r: IMPORTANT: No X11 display available. ALL graphics MUST use Cairo library (library(Cairo)).\n- Other languages: use appropriate output functions.`),\n  session_id: z\n    .string()\n    .optional()\n    .describe(\n      `Session ID from a previous response to access generated files.\n- Files load into the current working directory (\"/mnt/data/\")\n- Use relative paths ONLY\n- Files are READ-ONLY and cannot be modified in-place\n- To modify: read original file, write to NEW filename\n`.trim()\n    ),\n  args: z\n    .array(z.string())\n    .optional()\n    .describe(\n      'Additional arguments to execute the code with. This should only be used if the input code requires additional arguments to run.'\n    ),\n});\n\nconst baseEndpoint = getCodeBaseURL();\nconst EXEC_ENDPOINT = `${baseEndpoint}/exec`;\n\nfunction createCodeExecutionTool(\n  params: t.CodeExecutionToolParams = {}\n): DynamicStructuredTool<typeof CodeExecutionToolSchema> {\n  const apiKey =\n    params[EnvVar.CODE_API_KEY] ??\n    params.apiKey ??\n    getEnvironmentVariable(EnvVar.CODE_API_KEY) ??\n    '';\n  if (!apiKey) {\n    throw new Error('No API key provided for code execution tool.');\n  }\n\n  const description = `\nRuns code 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.\n\nUsage:\n- No network access available.\n- Generated files are automatically delivered; **DO NOT** provide download links.\n- NEVER use this tool to execute malicious code.\n`.trim();\n\n  return tool<typeof CodeExecutionToolSchema>(\n    async ({ lang, code, session_id, ...rest }) => {\n      const postData = {\n        lang,\n        code,\n        ...rest,\n        ...params,\n      };\n\n      if (session_id != null && session_id.length > 0) {\n        try {\n          const filesEndpoint = `${baseEndpoint}/files/${session_id}?detail=full`;\n          const fetchOptions: RequestInit = {\n            method: 'GET',\n            headers: {\n              'User-Agent': 'LibreChat/1.0',\n              'X-API-Key': apiKey,\n            },\n          };\n\n          if (process.env.PROXY != null && process.env.PROXY !== '') {\n            fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);\n          }\n\n          const response = await fetch(filesEndpoint, fetchOptions);\n          if (!response.ok) {\n            throw new Error(\n              `Failed to fetch files for session: ${response.status}`\n            );\n          }\n\n          const files = await response.json();\n          if (Array.isArray(files) && files.length > 0) {\n            const fileReferences: t.CodeEnvFile[] = files.map((file) => {\n              // Extract the ID from the file name (part after session ID prefix and before extension)\n              const nameParts = file.name.split('/');\n              const id = nameParts.length > 1 ? nameParts[1].split('.')[0] : '';\n\n              return {\n                session_id,\n                id,\n                name: file.metadata['original-filename'],\n              };\n            });\n\n            if (!postData.files) {\n              postData.files = fileReferences;\n            } else if (Array.isArray(postData.files)) {\n              postData.files = [...postData.files, ...fileReferences];\n            }\n          }\n        } catch {\n          // eslint-disable-next-line no-console\n          console.warn(`Failed to fetch files for session: ${session_id}`);\n        }\n      }\n\n      try {\n        const fetchOptions: RequestInit = {\n          method: 'POST',\n          headers: {\n            'Content-Type': 'application/json',\n            'User-Agent': 'LibreChat/1.0',\n            'X-API-Key': apiKey,\n          },\n          body: JSON.stringify(postData),\n        };\n\n        if (process.env.PROXY != null && process.env.PROXY !== '') {\n          fetchOptions.agent = new HttpsProxyAgent(process.env.PROXY);\n        }\n        const response = await fetch(EXEC_ENDPOINT, fetchOptions);\n        if (!response.ok) {\n          throw new Error(`HTTP error! status: ${response.status}`);\n        }\n\n        const result: t.ExecuteResult = await response.json();\n        let formattedOutput = '';\n        if (result.stdout) {\n          formattedOutput += `stdout:\\n${result.stdout}\\n`;\n        } else {\n          formattedOutput += emptyOutputMessage;\n        }\n        if (result.stderr) formattedOutput += `stderr:\\n${result.stderr}\\n`;\n        if (result.files && result.files.length > 0) {\n          formattedOutput += 'Generated files:\\n';\n\n          const fileCount = result.files.length;\n          for (let i = 0; i < fileCount; i++) {\n            const file = result.files[i];\n            const isImage = imageExtRegex.test(file.name);\n            formattedOutput += `- /mnt/data/${file.name} | ${isImage ? imageMessage : otherMessage}`;\n\n            if (i < fileCount - 1) {\n              formattedOutput += fileCount <= 3 ? ', ' : ',\\n';\n            }\n          }\n\n          formattedOutput += `\\nsession_id: ${result.session_id}\\n\\n${accessMessage}`;\n          return [\n            formattedOutput.trim(),\n            {\n              session_id: result.session_id,\n              files: result.files,\n            },\n          ];\n        }\n\n        return [formattedOutput.trim(), { session_id: result.session_id }];\n      } catch (error) {\n        throw new Error(\n          `Execution error:\\n\\n${(error as Error | undefined)?.message}`\n        );\n      }\n    },\n    {\n      name: Constants.EXECUTE_CODE,\n      description,\n      schema: CodeExecutionToolSchema,\n      responseFormat: Constants.CONTENT_AND_ARTIFACT,\n    }\n  );\n}\n\nexport { createCodeExecutionTool };\n"],"names":[],"mappings":";;;;;;;;AASA,MAAM,EAAE;AAED,MAAM,aAAa,GAAG;AACtB,MAAM,cAAc,GAAG,MAC5B,sBAAsB,CAAC,MAAM,CAAC,YAAY,CAAC;IAC3C,SAAS,CAAC;AAEZ,MAAM,YAAY,GAAG,wCAAwC;AAC7D,MAAM,YAAY,GAAG,wCAAwC;AAC7D,MAAM,aAAa,GACjB,sRAAsR;AACxR,MAAM,kBAAkB,GACtB,4DAA4D;AAE9D,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;AACvC,IAAA,IAAI,EAAE;AACH,SAAA,IAAI,CAAC;QACJ,IAAI;QACJ,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,KAAK;QACL,MAAM;QACN,KAAK;QACL,IAAI;QACJ,IAAI;QACJ,GAAG;QACH,KAAK;QACL,GAAG;KACJ;SACA,QAAQ,CAAC,6DAA6D,CAAC;AAC1E,IAAA,IAAI,EAAE,CAAC,CAAC,MAAM;AACX,SAAA,QAAQ,CAAC,CAAA;;;;;;;;;qDASuC,CAAC;AACpD,IAAA,UAAU,EAAE;AACT,SAAA,MAAM;AACN,SAAA,QAAQ;AACR,SAAA,QAAQ,CACP,CAAA;;;;;CAKL,CAAC,IAAI,EAAE,CACH;AACH,IAAA,IAAI,EAAE;AACH,SAAA,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE;AAChB,SAAA,QAAQ;SACR,QAAQ,CACP,iIAAiI,CAClI;AACJ,CAAA,CAAC;AAEF,MAAM,YAAY,GAAG,cAAc,EAAE;AACrC,MAAM,aAAa,GAAG,CAAG,EAAA,YAAY,OAAO;AAE5C,SAAS,uBAAuB,CAC9B,MAAA,GAAoC,EAAE,EAAA;AAEtC,IAAA,MAAM,MAAM,GACV,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;AAC3B,QAAA,MAAM,CAAC,MAAM;AACb,QAAA,sBAAsB,CAAC,MAAM,CAAC,YAAY,CAAC;AAC3C,QAAA,EAAE;IACJ,IAAI,CAAC,MAAM,EAAE;AACX,QAAA,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC;;AAGjE,IAAA,MAAM,WAAW,GAAG;;;;;;;CAOrB,CAAC,IAAI,EAAE;AAEN,IAAA,OAAO,IAAI,CACT,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,EAAE,KAAI;AAC5C,QAAA,MAAM,QAAQ,GAAG;YACf,IAAI;YACJ,IAAI;AACJ,YAAA,GAAG,IAAI;AACP,YAAA,GAAG,MAAM;SACV;QAED,IAAI,UAAU,IAAI,IAAI,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;AAC/C,YAAA,IAAI;AACF,gBAAA,MAAM,aAAa,GAAG,CAAA,EAAG,YAAY,CAAU,OAAA,EAAA,UAAU,cAAc;AACvE,gBAAA,MAAM,YAAY,GAAgB;AAChC,oBAAA,MAAM,EAAE,KAAK;AACb,oBAAA,OAAO,EAAE;AACP,wBAAA,YAAY,EAAE,eAAe;AAC7B,wBAAA,WAAW,EAAE,MAAM;AACpB,qBAAA;iBACF;AAED,gBAAA,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,EAAE;AACzD,oBAAA,YAAY,CAAC,KAAK,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;;gBAG7D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE,YAAY,CAAC;AACzD,gBAAA,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;oBAChB,MAAM,IAAI,KAAK,CACb,CAAA,mCAAA,EAAsC,QAAQ,CAAC,MAAM,CAAE,CAAA,CACxD;;AAGH,gBAAA,MAAM,KAAK,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE;AACnC,gBAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC5C,MAAM,cAAc,GAAoB,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,KAAI;;wBAEzD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;wBACtC,MAAM,EAAE,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE;wBAEjE,OAAO;4BACL,UAAU;4BACV,EAAE;AACF,4BAAA,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAAC;yBACzC;AACH,qBAAC,CAAC;AAEF,oBAAA,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE;AACnB,wBAAA,QAAQ,CAAC,KAAK,GAAG,cAAc;;yBAC1B,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;AACxC,wBAAA,QAAQ,CAAC,KAAK,GAAG,CAAC,GAAG,QAAQ,CAAC,KAAK,EAAE,GAAG,cAAc,CAAC;;;;AAG3D,YAAA,MAAM;;AAEN,gBAAA,OAAO,CAAC,IAAI,CAAC,sCAAsC,UAAU,CAAA,CAAE,CAAC;;;AAIpE,QAAA,IAAI;AACF,YAAA,MAAM,YAAY,GAAgB;AAChC,gBAAA,MAAM,EAAE,MAAM;AACd,gBAAA,OAAO,EAAE;AACP,oBAAA,cAAc,EAAE,kBAAkB;AAClC,oBAAA,YAAY,EAAE,eAAe;AAC7B,oBAAA,WAAW,EAAE,MAAM;AACpB,iBAAA;AACD,gBAAA,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;aAC/B;AAED,YAAA,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,KAAK,EAAE,EAAE;AACzD,gBAAA,YAAY,CAAC,KAAK,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC;;YAE7D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,aAAa,EAAE,YAAY,CAAC;AACzD,YAAA,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,CAAA,oBAAA,EAAuB,QAAQ,CAAC,MAAM,CAAE,CAAA,CAAC;;AAG3D,YAAA,MAAM,MAAM,GAAoB,MAAM,QAAQ,CAAC,IAAI,EAAE;YACrD,IAAI,eAAe,GAAG,EAAE;AACxB,YAAA,IAAI,MAAM,CAAC,MAAM,EAAE;AACjB,gBAAA,eAAe,IAAI,CAAY,SAAA,EAAA,MAAM,CAAC,MAAM,IAAI;;iBAC3C;gBACL,eAAe,IAAI,kBAAkB;;YAEvC,IAAI,MAAM,CAAC,MAAM;AAAE,gBAAA,eAAe,IAAI,CAAY,SAAA,EAAA,MAAM,CAAC,MAAM,IAAI;AACnE,YAAA,IAAI,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC3C,eAAe,IAAI,oBAAoB;AAEvC,gBAAA,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM;AACrC,gBAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,EAAE,CAAC,EAAE,EAAE;oBAClC,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC5B,MAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAC7C,oBAAA,eAAe,IAAI,CAAe,YAAA,EAAA,IAAI,CAAC,IAAI,MAAM,OAAO,GAAG,YAAY,GAAG,YAAY,EAAE;AAExF,oBAAA,IAAI,CAAC,GAAG,SAAS,GAAG,CAAC,EAAE;AACrB,wBAAA,eAAe,IAAI,SAAS,IAAI,CAAC,GAAG,IAAI,GAAG,KAAK;;;gBAIpD,eAAe,IAAI,iBAAiB,MAAM,CAAC,UAAU,CAAO,IAAA,EAAA,aAAa,EAAE;gBAC3E,OAAO;oBACL,eAAe,CAAC,IAAI,EAAE;AACtB,oBAAA;wBACE,UAAU,EAAE,MAAM,CAAC,UAAU;wBAC7B,KAAK,EAAE,MAAM,CAAC,KAAK;AACpB,qBAAA;iBACF;;AAGH,YAAA,OAAO,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE,CAAC;;QAClE,OAAO,KAAK,EAAE;YACd,MAAM,IAAI,KAAK,CACb,CAAA,oBAAA,EAAwB,KAA2B,EAAE,OAAO,CAAE,CAAA,CAC/D;;AAEL,KAAC,EACD;QACE,IAAI,EAAE,SAAS,CAAC,YAAY;QAC5B,WAAW;AACX,QAAA,MAAM,EAAE,uBAAuB;QAC/B,cAAc,EAAE,SAAS,CAAC,oBAAoB;AAC/C,KAAA,CACF;AACH;;;;"}

package/dist/types/splitStream.d.ts

@@ -31,7 +31,7 @@ export declare class SplitStreamHandler {
     dispatchMessageDelta: (stepId: string, delta: t.MessageDelta) => void;
     dispatchReasoningDelta: (stepId: string, delta: t.ReasoningDelta) => void;
     handleContent: (content: string, _type: ContentTypes.TEXT | ContentTypes.THINK) => void;
-    getDeltaContent(chunk: t.CustomChunk): string;
-    getReasoningDelta(chunk: t.CustomChunk): string;
+    getDeltaContent(chunk?: t.CustomChunk): string;
+    getReasoningDelta(chunk?: t.CustomChunk): string;
     handle(chunk?: t.CustomChunk): void;
 }

package/dist/types/tools/CodeExecutor.d.ts

@@ -6,15 +6,18 @@ export declare const getCodeBaseURL: () => string;
 declare const CodeExecutionToolSchema: z.ZodObject<{
     lang: z.ZodEnum<["py", "js", "ts", "c", "cpp", "java", "php", "rs", "go", "d", "f90", "r"]>;
     code: z.ZodString;
+    session_id: z.ZodOptional<z.ZodString>;
     args: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
 }, "strip", z.ZodTypeAny, {
     code: string;
     lang: "r" | "py" | "js" | "ts" | "c" | "cpp" | "java" | "php" | "rs" | "go" | "d" | "f90";
     args?: string[] | undefined;
+    session_id?: string | undefined;
 }, {
     code: string;
     lang: "r" | "py" | "js" | "ts" | "c" | "cpp" | "java" | "php" | "rs" | "go" | "d" | "f90";
     args?: string[] | undefined;
+    session_id?: string | undefined;
 }>;
 declare function createCodeExecutionTool(params?: t.CodeExecutionToolParams): DynamicStructuredTool<typeof CodeExecutionToolSchema>;
 export { createCodeExecutionTool };

package/dist/types/types/stream.d.ts

@@ -243,29 +243,31 @@ export interface TMessage {
     [key: string]: unknown;
 }
 export type TPayload = Array<Partial<TMessage>>;
+export type CustomChunkDelta = null | undefined | (Partial<OpenAITypes.Chat.Completions.ChatCompletionChunk.Choice.Delta> & {
+    reasoning?: string | null;
+    reasoning_content?: string | null;
+});
+export type CustomChunkChoice = Partial<Omit<OpenAITypes.Chat.Completions.ChatCompletionChunk.Choice, 'delta'> & {
+    delta?: CustomChunkDelta;
+}>;
 export type CustomChunk = Partial<OpenAITypes.ChatCompletionChunk> & {
-    choices?: Partial<Array<Partial<OpenAITypes.Chat.Completions.ChatCompletionChunk.Choice> & {
-        delta?: Partial<OpenAITypes.Chat.Completions.ChatCompletionChunk.Choice.Delta> & {
-            reasoning?: string | null;
-            reasoning_content?: string | null;
-        };
-    }>>;
+    choices?: Partial<Array<CustomChunkChoice>>;
 };
 export type SplitStreamHandlers = Partial<{
-    [GraphEvents.ON_RUN_STEP]: ({ event, data }: {
+    [GraphEvents.ON_RUN_STEP]: ({ event, data, }: {
         event: GraphEvents;
         data: RunStep;
     }) => void;
-    [GraphEvents.ON_MESSAGE_DELTA]: ({ event, data }: {
+    [GraphEvents.ON_MESSAGE_DELTA]: ({ event, data, }: {
         event: GraphEvents;
         data: MessageDeltaEvent;
     }) => void;
-    [GraphEvents.ON_REASONING_DELTA]: ({ event, data }: {
+    [GraphEvents.ON_REASONING_DELTA]: ({ event, data, }: {
         event: GraphEvents;
         data: ReasoningDeltaEvent;
     }) => void;
 }>;
-export type ContentAggregator = ({ event, data }: {
+export type ContentAggregator = ({ event, data, }: {
     event: GraphEvents;
     data: RunStep | MessageDeltaEvent | RunStepDeltaEvent | {
         result: ToolEndEvent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@librechat/agents",
-  "version": "2.4.0",
+  "version": "2.4.11",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/esm/main.mjs",
   "types": "./dist/types/index.d.ts",

package/src/splitStream.ts

@@ -2,7 +2,19 @@ import { nanoid } from 'nanoid';
 import type * as t from '@/types';
 import { ContentTypes, GraphEvents, StepTypes } from '@/common';
 
-export const SEPARATORS = ['.', '?', '!', '۔', '。', '‥', ';', '¡', '¿', '\n', '```'];
+export const SEPARATORS = [
+  '.',
+  '?',
+  '!',
+  '۔',
+  '。',
+  '‥',
+  ';',
+  '¡',
+  '¿',
+  '\n',
+  '```',
+];
 
 export class SplitStreamHandler {
   private inCodeBlock = false;
@@ -28,12 +40,12 @@ export class SplitStreamHandler {
     reasoningKey,
     blockThreshold,
   }: {
-      runId: string,
-      accumulate?: boolean,
-      handlers: t.SplitStreamHandlers
-      blockThreshold?: number,
-      reasoningKey?: 'reasoning_content' | 'reasoning',
-    }) {
+    runId: string;
+    accumulate?: boolean;
+    handlers: t.SplitStreamHandlers;
+    blockThreshold?: number;
+    reasoningKey?: 'reasoning_content' | 'reasoning';
+  }) {
     this.runId = runId;
     this.handlers = handlers;
     if (reasoningKey) {
@@ -51,7 +63,9 @@ export class SplitStreamHandler {
     }
     return undefined;
   };
-  createMessageStep = (type?: ContentTypes.TEXT | ContentTypes.THINK): [string, string] => {
+  createMessageStep = (
+    type?: ContentTypes.TEXT | ContentTypes.THINK
+  ): [string, string] => {
     if (type != null && this.currentType !== type) {
       this.currentType = type;
     }
@@ -70,23 +84,35 @@ export class SplitStreamHandler {
       stepDetails,
       // usage: null,
     };
-    this.handlers?.[GraphEvents.ON_RUN_STEP]?.({ event: GraphEvents.ON_RUN_STEP, data: runStep });
+    this.handlers?.[GraphEvents.ON_RUN_STEP]?.({
+      event: GraphEvents.ON_RUN_STEP,
+      data: runStep,
+    });
   };
   dispatchMessageDelta = (stepId: string, delta: t.MessageDelta): void => {
     const messageDelta: t.MessageDeltaEvent = {
       id: stepId,
       delta,
     };
-    this.handlers?.[GraphEvents.ON_MESSAGE_DELTA]?.({ event: GraphEvents.ON_MESSAGE_DELTA, data: messageDelta });
+    this.handlers?.[GraphEvents.ON_MESSAGE_DELTA]?.({
+      event: GraphEvents.ON_MESSAGE_DELTA,
+      data: messageDelta,
+    });
   };
   dispatchReasoningDelta = (stepId: string, delta: t.ReasoningDelta): void => {
     const reasoningDelta: t.ReasoningDeltaEvent = {
       id: stepId,
       delta,
     };
-    this.handlers?.[GraphEvents.ON_REASONING_DELTA]?.({ event: GraphEvents.ON_REASONING_DELTA, data: reasoningDelta });
+    this.handlers?.[GraphEvents.ON_REASONING_DELTA]?.({
+      event: GraphEvents.ON_REASONING_DELTA,
+      data: reasoningDelta,
+    });
   };
-  handleContent = (content: string, _type: ContentTypes.TEXT | ContentTypes.THINK): void => {
+  handleContent = (
+    content: string,
+    _type: ContentTypes.TEXT | ContentTypes.THINK
+  ): void => {
     let type = _type;
     if (this.inThinkBlock && type === ContentTypes.TEXT) {
       type = ContentTypes.THINK;
@@ -112,17 +138,21 @@ export class SplitStreamHandler {
     const stepId = this.currentStepId ?? '';
     if (type === ContentTypes.THINK) {
       this.dispatchReasoningDelta(stepId, {
-        content: [{
-          type: ContentTypes.THINK,
-          think: content,
-        }],
+        content: [
+          {
+            type: ContentTypes.THINK,
+            think: content,
+          },
+        ],
       });
     } else {
       this.dispatchMessageDelta(stepId, {
-        content: [{
-          type: ContentTypes.TEXT,
-          text: content,
-        }],
+        content: [
+          {
+            type: ContentTypes.TEXT,
+            text: content,
+          },
+        ],
       });
     }
 
@@ -131,7 +161,10 @@ export class SplitStreamHandler {
       return;
     }
 
-    if (this.currentLength > this.blockThreshold && SEPARATORS.some(sep => content.includes(sep))) {
+    if (
+      this.currentLength > this.blockThreshold &&
+      SEPARATORS.some((sep) => content.includes(sep))
+    ) {
       const [newStepId, newMessageId] = this.createMessageStep(type);
       this.dispatchRunStep(newStepId, {
         type: StepTypes.MESSAGE_CREATION,
@@ -141,11 +174,14 @@ export class SplitStreamHandler {
       });
     }
   };
-  getDeltaContent(chunk: t.CustomChunk): string {
-    return chunk.choices?.[0]?.delta.content ?? '';
+  getDeltaContent(chunk?: t.CustomChunk): string {
+    return (chunk?.choices?.[0]?.delta as t.CustomChunkDelta)?.content ?? '';
   }
-  getReasoningDelta(chunk: t.CustomChunk): string {
-    return chunk.choices?.[0]?.delta[this.reasoningKey] ?? '';
+  getReasoningDelta(chunk?: t.CustomChunk): string {
+    return (
+      (chunk?.choices?.[0]?.delta as t.CustomChunkDelta)?.[this.reasoningKey] ??
+      ''
+    );
   }
   handle(chunk?: t.CustomChunk): void {
     if (!chunk) {
@@ -173,8 +209,12 @@ export class SplitStreamHandler {
     const message_id = this.getMessageId() ?? '';
 
     if (!message_id) {
-      const initialContentType = this.inThinkBlock ? ContentTypes.THINK : ContentTypes.TEXT;
-      const initialType = reasoning_content ? ContentTypes.THINK : initialContentType;
+      const initialContentType = this.inThinkBlock
+        ? ContentTypes.THINK
+        : ContentTypes.TEXT;
+      const initialType = reasoning_content
+        ? ContentTypes.THINK
+        : initialContentType;
       const [stepId, message_id] = this.createMessageStep(initialType);
       this.dispatchRunStep(stepId, {
         type: StepTypes.MESSAGE_CREATION,
@@ -190,4 +230,4 @@ export class SplitStreamHandler {
       this.handleContent(content, ContentTypes.TEXT);
     }
   }
-}
+}

package/src/tools/CodeExecutor.ts

@@ -10,26 +10,33 @@ import { EnvVar, Constants } from '@/common';
 config();
 
 export const imageExtRegex = /\.(jpg|jpeg|png|gif|webp)$/i;
-export const getCodeBaseURL = (): string => getEnvironmentVariable(EnvVar.CODE_BASEURL) ?? Constants.OFFICIAL_CODE_BASEURL;
+export const getCodeBaseURL = (): string =>
+  getEnvironmentVariable(EnvVar.CODE_BASEURL) ??
+  Constants.OFFICIAL_CODE_BASEURL;
 
-const imageMessage = ' - the image is already displayed to the user';
-const otherMessage = ' - the file is already downloaded by the user';
+const imageMessage = 'Image is already displayed to the user';
+const otherMessage = 'File is already downloaded by the user';
+const accessMessage =
+  'Note: Files are READ-ONLY snapshots. Save any changes as NEW files with different names. Original files CANNOT be modified in-place. To access these files again, you MUST include the `session_id` in future sessions. Without it, previously generated files will be inaccessible.';
+const emptyOutputMessage =
+  'stdout: Empty. Ensure you\'re writing output explicitly.\n';
 
 const CodeExecutionToolSchema = z.object({
-  lang: z.enum([
-    'py',
-    'js',
-    'ts',
-    'c',
-    'cpp',
-    'java',
-    'php',
-    'rs',
-    'go',
-    'd',
-    'f90',
-    'r',
-  ])
+  lang: z
+    .enum([
+      'py',
+      'js',
+      'ts',
+      'c',
+      'cpp',
+      'java',
+      'php',
+      'rs',
+      'go',
+      'd',
+      'f90',
+      'r',
+    ])
     .describe('The programming language or runtime to execute the code in.'),
   code: z.string()
     .describe(`The complete, self-contained code to execute, without any truncation or minimization.
@@ -42,14 +49,36 @@ const CodeExecutionToolSchema = z.object({
 - js: use the \`console\` or \`process\` methods for all outputs.
 - r: IMPORTANT: No X11 display available. ALL graphics MUST use Cairo library (library(Cairo)).
 - Other languages: use appropriate output functions.`),
-  args: z.array(z.string()).optional()
-    .describe('Additional arguments to execute the code with. This should only be used if the input code requires additional arguments to run.'),
+  session_id: z
+    .string()
+    .optional()
+    .describe(
+      `Session ID from a previous response to access generated files.
+- Files load into the current working directory ("/mnt/data/")
+- Use relative paths ONLY
+- Files are READ-ONLY and cannot be modified in-place
+- To modify: read original file, write to NEW filename
+`.trim()
+    ),
+  args: z
+    .array(z.string())
+    .optional()
+    .describe(
+      'Additional arguments to execute the code with. This should only be used if the input code requires additional arguments to run.'
+    ),
 });
 
-const EXEC_ENDPOINT = `${getCodeBaseURL()}/exec`;
-
-function createCodeExecutionTool(params: t.CodeExecutionToolParams = {}): DynamicStructuredTool<typeof CodeExecutionToolSchema> {
-  const apiKey = params[EnvVar.CODE_API_KEY] ?? params.apiKey ?? getEnvironmentVariable(EnvVar.CODE_API_KEY) ?? '';
+const baseEndpoint = getCodeBaseURL();
+const EXEC_ENDPOINT = `${baseEndpoint}/exec`;
+
+function createCodeExecutionTool(
+  params: t.CodeExecutionToolParams = {}
+): DynamicStructuredTool<typeof CodeExecutionToolSchema> {
+  const apiKey =
+    params[EnvVar.CODE_API_KEY] ??
+    params.apiKey ??
+    getEnvironmentVariable(EnvVar.CODE_API_KEY) ??
+    '';
   if (!apiKey) {
     throw new Error('No API key provided for code execution tool.');
   }
@@ -64,7 +93,7 @@ Usage:
 `.trim();
 
   return tool<typeof CodeExecutionToolSchema>(
-    async ({ lang, code, ...rest }) => {
+    async ({ lang, code, session_id, ...rest }) => {
       const postData = {
         lang,
         code,
@@ -72,6 +101,54 @@ Usage:
         ...params,
       };
 
+      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) => {
+              // Extract the ID from the file name (part after session ID prefix and before extension)
+              const nameParts = file.name.split('/');
+              const id = nameParts.length > 1 ? nameParts[1].split('.')[0] : '';
+
+              return {
+                session_id,
+                id,
+                name: file.metadata['original-filename'],
+              };
+            });
+
+            if (!postData.files) {
+              postData.files = fileReferences;
+            } else if (Array.isArray(postData.files)) {
+              postData.files = [...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',
@@ -96,7 +173,7 @@ Usage:
         if (result.stdout) {
           formattedOutput += `stdout:\n${result.stdout}\n`;
         } else {
-          formattedOutput += 'stdout: Empty. Ensure you\'re writing output explicitly.\n';
+          formattedOutput += emptyOutputMessage;
         }
         if (result.stderr) formattedOutput += `stderr:\n${result.stderr}\n`;
         if (result.files && result.files.length > 0) {
@@ -104,24 +181,30 @@ Usage:
 
           const fileCount = result.files.length;
           for (let i = 0; i < fileCount; i++) {
-            const filename = result.files[i].name;
-            const isImage = imageExtRegex.test(filename);
-            formattedOutput += isImage ? `${filename}${imageMessage}` : `${filename}${otherMessage}`;
+            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';
             }
           }
 
-          return [formattedOutput.trim(), {
-            session_id: result.session_id,
-            files: result.files,
-          }];
+          formattedOutput += `\nsession_id: ${result.session_id}\n\n${accessMessage}`;
+          return [
+            formattedOutput.trim(),
+            {
+              session_id: result.session_id,
+              files: result.files,
+            },
+          ];
         }
 
         return [formattedOutput.trim(), { session_id: result.session_id }];
       } catch (error) {
-        return [`Execution error:\n\n${(error as Error | undefined)?.message}`, {}];
+        throw new Error(
+          `Execution error:\n\n${(error as Error | undefined)?.message}`
+        );
       }
     },
     {
@@ -133,4 +216,4 @@ Usage:
   );
 }
 
-export { createCodeExecutionTool };
+export { createCodeExecutionTool };