@librechat/agents 3.0.26 → 3.0.28

package/src/llm/anthropic/utils/message_inputs.ts

@@ -363,6 +363,32 @@ function _formatContent(message: BaseMessage) {
     return content;
   } else {
     const contentBlocks = content.map((contentPart) => {
+      /**
+       * Skip malformed blocks that have server tool fields mixed with text type.
+       * These can occur when server_tool_use blocks get mislabeled during aggregation.
+       */
+      if (
+        'id' in contentPart &&
+        'name' in contentPart &&
+        'input' in contentPart &&
+        contentPart.type === 'text'
+      ) {
+        return null;
+      }
+
+      /**
+       * Skip malformed web_search_tool_result blocks marked as text.
+       * These have tool_use_id and nested content arrays.
+       */
+      if (
+        'tool_use_id' in contentPart &&
+        'content' in contentPart &&
+        Array.isArray(contentPart.content) &&
+        contentPart.type === 'text'
+      ) {
+        return null;
+      }
+
       if (isDataContentBlock(contentPart)) {
         return convertToProviderContentBlock(
           contentPart,
@@ -459,6 +485,21 @@ function _formatContent(message: BaseMessage) {
           }
         }
 
+        /**
+         * Skip server tool blocks when formatting content for subsequent requests.
+         * Server tools (e.g., web_search) are executed by the provider's API, and both
+         * the tool use and their results are already included in the response.
+         * We should not send these back in subsequent requests as they're not tool_calls
+         * that need invocation - they're already completed inline.
+         */
+        if (
+          contentPartCopy.type === 'server_tool_use' ||
+          contentPartCopy.type === 'web_search_tool_result' ||
+          contentPartCopy.type === 'web_search_result'
+        ) {
+          return null;
+        }
+
         // TODO: Fix when SDK types are fixed
         return {
           ...contentPartCopy,
@@ -487,10 +528,14 @@ function _formatContent(message: BaseMessage) {
           input: contentPart.functionCall.args,
         };
       } else {
+        console.error(
+          'Unsupported content part:',
+          JSON.stringify(contentPart, null, 2)
+        );
         throw new Error('Unsupported message content format');
       }
     });
-    return contentBlocks;
+    return contentBlocks.filter((block) => block !== null);
   }
 }
 
@@ -545,14 +590,15 @@ export function _convertMessagesToAnthropicPayload(
         }
       } else {
         const { content } = message;
-        const hasMismatchedToolCalls = !message.tool_calls.every((toolCall) =>
-          content.find(
-            (contentPart) =>
-              (contentPart.type === 'tool_use' ||
-                contentPart.type === 'input_json_delta' ||
-                contentPart.type === 'server_tool_use') &&
-              contentPart.id === toolCall.id
-          )
+        const hasMismatchedToolCalls = !message.tool_calls.every(
+          (toolCall) =>
+            !!content.find(
+              (contentPart) =>
+                (contentPart.type === 'tool_use' ||
+                  contentPart.type === 'input_json_delta' ||
+                  contentPart.type === 'server_tool_use') &&
+                contentPart.id === toolCall.id
+            )
         );
         if (hasMismatchedToolCalls) {
           console.warn(

package/src/llm/google/utils/common.ts

@@ -316,20 +316,6 @@ function _convertLangChainContentToPart(
         mimeType,
       },
     };
-  } else if (
-    content.type === 'document' ||
-    content.type === 'audio' ||
-    content.type === 'video'
-  ) {
-    if (!isMultimodalModel) {
-      throw new Error(`This model does not support ${content.type}s`);
-    }
-    return {
-      inlineData: {
-        data: content.data,
-        mimeType: content.mimeType,
-      },
-    };
   } else if (content.type === 'media') {
     return messageContentMedia(content);
   } else if (content.type === 'tool_use') {

package/src/scripts/ant_web_search_edge_case.ts

@@ -0,0 +1,162 @@
+/* eslint-disable no-console */
+// src/scripts/cli.ts
+import { config } from 'dotenv';
+config();
+import { HumanMessage, BaseMessage } from '@langchain/core/messages';
+import type * as t from '@/types';
+import { ChatModelStreamHandler, createContentAggregator } from '@/stream';
+import { ToolEndHandler, ModelEndHandler } from '@/events';
+import { Calculator } from '@/tools/Calculator';
+
+import { getArgs } from '@/scripts/args';
+import { Run } from '@/run';
+import { GraphEvents, Callback, Providers } from '@/common';
+import { getLLMConfig } from '@/utils/llmConfig';
+
+const conversationHistory: BaseMessage[] = [];
+let _contentParts: (t.MessageContentComplex | undefined)[] = [];
+async function testStandardStreaming(): Promise<void> {
+  const { userName, location, currentDate } = await getArgs();
+  const { contentParts, aggregateContent } = createContentAggregator();
+  _contentParts = contentParts;
+  const customHandlers = {
+    [GraphEvents.TOOL_END]: new ToolEndHandler(),
+    [GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(),
+    [GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
+    [GraphEvents.ON_RUN_STEP_COMPLETED]: {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_COMPLETED,
+        data: t.StreamEventData
+      ): void => {
+        console.log('====== ON_RUN_STEP_COMPLETED ======');
+        // console.dir(data, { depth: null });
+        aggregateContent({
+          event,
+          data: data as unknown as { result: t.ToolEndEvent },
+        });
+      },
+    },
+    [GraphEvents.ON_RUN_STEP]: {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP,
+        data: t.StreamEventData
+      ): void => {
+        console.log('====== ON_RUN_STEP ======');
+        console.dir(data, { depth: null });
+        aggregateContent({ event, data: data as t.RunStep });
+      },
+    },
+    [GraphEvents.ON_RUN_STEP_DELTA]: {
+      handle: (
+        event: GraphEvents.ON_RUN_STEP_DELTA,
+        data: t.StreamEventData
+      ): void => {
+        console.log('====== ON_RUN_STEP_DELTA ======');
+        console.dir(data, { depth: null });
+        aggregateContent({ event, data: data as t.RunStepDeltaEvent });
+      },
+    },
+    [GraphEvents.ON_MESSAGE_DELTA]: {
+      handle: (
+        event: GraphEvents.ON_MESSAGE_DELTA,
+        data: t.StreamEventData
+      ): void => {
+        // console.log('====== ON_MESSAGE_DELTA ======');
+        // console.dir(data, { depth: null });
+        aggregateContent({ event, data: data as t.MessageDeltaEvent });
+      },
+    },
+    [GraphEvents.TOOL_START]: {
+      handle: (
+        _event: string,
+        data: t.StreamEventData,
+        metadata?: Record<string, unknown>
+      ): void => {
+        console.log('====== TOOL_START ======');
+        // console.dir(data, { depth: null });
+      },
+    },
+  };
+
+  const llmConfig = getLLMConfig(
+    Providers.ANTHROPIC
+  ) as t.AnthropicClientOptions & t.SharedLLMConfig;
+  llmConfig.model = 'claude-haiku-4-5';
+
+  const run = await Run.create<t.IState>({
+    runId: 'test-run-id',
+    graphConfig: {
+      type: 'standard',
+      llmConfig,
+      tools: [
+        {
+          type: 'web_search_20250305',
+          name: 'web_search',
+          max_uses: 5,
+        },
+        new Calculator(),
+      ],
+      instructions: 'You are a friendly AI assistant.',
+      // additional_instructions: `Always address the user by their name. The user's name is ${userName} and they are located in ${location}.`,
+    },
+    returnContent: true,
+    customHandlers,
+  });
+
+  const config = {
+    configurable: {
+      provider: Providers.ANTHROPIC,
+      thread_id: 'conversation-num-1',
+    },
+    streamMode: 'values',
+    version: 'v2' as const,
+  };
+
+  console.log('Test 1: Web search + calculator (simultaneous tool test)');
+
+  // const userMessage = `
+  // Make a search for the weather in ${location} today, which is ${currentDate}.
+  // Before making the search, please let me know what you're about to do, then immediately start searching without hesitation.
+  // Make sure to always refer to me by name, which is ${userName}.
+  // After giving me a thorough summary, tell me a joke about the weather forecast we went over.
+  // `;
+  // const userMessage = 'Are massage guns good?';
+  // const userMessage = 'What is functional programming?';
+  // const userMessage = "Get me today's trending news.";
+  // const userMessage = "search recent italy earthquake volcano activity";
+  // const userMessage =
+  //   "use 'Trump' as the exact search query and tell me what you find.";
+  const userMessage =
+    'Can you search the web for the current population of Tokyo, and also calculate what 15% of that population would be? Do both at the same time.';
+
+  conversationHistory.push(new HumanMessage(userMessage));
+
+  const inputs = {
+    messages: conversationHistory,
+  };
+  const finalContentParts = await run.processStream(inputs, config);
+  const finalMessages = run.getRunMessages();
+  if (finalMessages) {
+    conversationHistory.push(...finalMessages);
+    console.dir(conversationHistory, { depth: null });
+  }
+  // console.dir(finalContentParts, { depth: null });
+  console.log('\n\n====================\n\n');
+  // console.dir(contentParts, { depth: null });
+}
+
+process.on('unhandledRejection', (reason, promise) => {
+  console.error('Unhandled Rejection at:', promise, 'reason:', reason);
+  console.log('Content Parts:');
+  console.dir(_contentParts, { depth: null });
+  process.exit(1);
+});
+
+testStandardStreaming().catch((err) => {
+  console.error(err);
+  console.log('Conversation history:');
+  console.dir(conversationHistory, { depth: null });
+  console.log('Content Parts:');
+  console.dir(_contentParts, { depth: null });
+  process.exit(1);
+});

package/src/stream.ts

@@ -155,7 +155,10 @@ export class ChatModelStreamHandler implements t.EventHandler {
       chunk.tool_calls.length > 0 &&
       chunk.tool_calls.every(
         (tc) =>
-          tc.id != null && tc.id !== '' && tc.name != null && tc.name !== ''
+          tc.id != null &&
+          tc.id !== '' &&
+          (tc as Partial<ToolCall>).name != null &&
+          tc.name !== ''
       )
     ) {
       hasToolCalls = true;

package/src/tools/ToolNode.ts

@@ -201,7 +201,18 @@ export class ToolNode<T = any> extends RunnableCallable<T, T> {
 
       outputs = await Promise.all(
         aiMessage.tool_calls
-          ?.filter((call) => call.id == null || !toolMessageIds.has(call.id))
+          ?.filter((call) => {
+            /**
+             * Filter out:
+             * 1. Already processed tool calls (present in toolMessageIds)
+             * 2. Server tool calls (e.g., web_search with IDs starting with 'srvtoolu_')
+             *    which are executed by the provider's API and don't require invocation
+             */
+            return (
+              (call.id == null || !toolMessageIds.has(call.id)) &&
+              !(call.id?.startsWith('srvtoolu_') ?? false)
+            );
+          })
           .map((call) => this.runTool(call, config)) ?? []
       );
     }