@librechat/agents 2.3.99 → 2.4.1

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.3.99",
+  "version": "2.4.01",
   "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/stream.ts

@@ -484,17 +484,19 @@ export function createContentAggregator(): t.ContentAggregatorResult {
       'tool_call' in contentPart
     ) {
       const existingContent = contentParts[index] as
-        | (Omit<t.ToolCallContent, 'tool_call'> & { tool_call?: ToolCall })
+        | (Omit<t.ToolCallContent, 'tool_call'> & {
+            tool_call?: t.ToolCallPart;
+          })
         | undefined;
 
-      const toolCallArgs =
-        (contentPart.tool_call.args as unknown as string | undefined) ?? '';
-      let args = finalUpdate
-        ? contentPart.tool_call.args
-        : (existingContent?.tool_call?.args ?? '');
-      if (!finalUpdate && typeof args === 'string' && args !== toolCallArgs) {
-        args += toolCallArgs;
-      }
+      const toolCallArgs = (contentPart.tool_call as t.ToolCallPart).args;
+      /** When args are a valid object, they are likely already invoked */
+      const args =
+        finalUpdate ||
+        typeof existingContent?.tool_call?.args === 'object' ||
+        typeof toolCallArgs === 'object'
+          ? contentPart.tool_call.args
+          : (existingContent?.tool_call?.args ?? '') + (toolCallArgs ?? '');
 
       const id =
         getNonEmptyValue([

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 =
+  'IMPORTANT: Files accessed via session ID are READ-ONLY snapshots. Any modifications MUST be saved as NEW files with different names. The original files cannot be modified in-place. To access these files in future executions, you MUST provide this session_id as a parameter. Without the session_id, previously generated files will not be accessible in subsequent executions.';
+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(
+      `Optional: Session ID from a previous execution to access generated files.
+- Files load into /mnt/data/ (current working directory)
+- Use relative paths ONLY
+- Files are READ-ONLY - 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 };