@librechat/agents 3.3.2 → 3.3.4

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

@@ -1,6 +1,9 @@
 import { expect, test, describe } from '@jest/globals';
-import { AIMessageChunk } from '@langchain/core/messages';
-import type { Content, EnhancedGenerateContentResponse } from '@google/generative-ai';
+import { AIMessage, AIMessageChunk } from '@langchain/core/messages';
+import type {
+  Content,
+  EnhancedGenerateContentResponse,
+} from '@google/generative-ai';
 import {
   STREAMED_TOOL_CALL_SEAL_METADATA_KEY,
   STREAMED_TOOL_CALL_ADAPTER_METADATA_KEY,
@@ -8,9 +11,53 @@ import {
 } from '@/tools/streamedToolCallSeals';
 import {
   convertResponseContentToChatGenerationChunk,
+  convertMessageContentToParts,
   dropUnsupportedModelTurnPrefill,
   rejectsModelTurnPrefill,
 } from './common';
+import { toLangChainContent } from '@/messages/langchain';
+
+describe('convertMessageContentToParts cross-provider tool calls', () => {
+  test('deduplicates Anthropic tool_use content mirrored in parsed tool_calls', () => {
+    const message = new AIMessage({
+      content: toLangChainContent([
+        { type: 'text', text: 'Checking.' },
+        {
+          type: 'tool_use',
+          id: 'call_weather',
+          name: 'weather',
+          input: '',
+        },
+        { type: 'text', index: 0, input: '{"city":"NYC"}' },
+      ]),
+      tool_calls: [
+        {
+          id: 'call_weather',
+          name: 'weather',
+          args: { city: 'NYC' },
+        },
+      ],
+    });
+
+    const parts = convertMessageContentToParts(
+      message,
+      false,
+      [],
+      'gemini-3.5-flash'
+    );
+    const functionCalls = parts.filter((part) => 'functionCall' in part);
+
+    expect(functionCalls).toHaveLength(1);
+    expect(parts).not.toContainEqual({});
+    expect(functionCalls[0]).toMatchObject({
+      functionCall: {
+        id: 'call_weather',
+        name: 'weather',
+        args: { city: 'NYC' },
+      },
+    });
+  });
+});
 
 function buildResponse(
   parts: Array<Record<string, unknown>>
@@ -72,7 +119,9 @@ describe('rejectsModelTurnPrefill', () => {
     expect(rejectsModelTurnPrefill('gemini-3.6-flash')).toBe(true);
     expect(rejectsModelTurnPrefill('gemini-3.5-flash-lite')).toBe(true);
     expect(rejectsModelTurnPrefill('models/gemini-3.6-flash')).toBe(true);
-    expect(rejectsModelTurnPrefill('google/gemini-3.5-flash-lite-latest')).toBe(true);
+    expect(rejectsModelTurnPrefill('google/gemini-3.5-flash-lite-latest')).toBe(
+      true
+    );
   });
 
   test('is false for models that still accept prefill and for empty input', () => {
@@ -86,34 +135,51 @@ describe('rejectsModelTurnPrefill', () => {
 
 describe('dropUnsupportedModelTurnPrefill', () => {
   const userTurn: Content = { role: 'user', parts: [{ text: 'Hi' }] };
-  const modelTurn: Content = { role: 'model', parts: [{ text: 'Hello, I am' }] };
+  const modelTurn: Content = {
+    role: 'model',
+    parts: [{ text: 'Hello, I am' }],
+  };
 
   test('drops a trailing model turn for no-prefill models', () => {
     const contents: Content[] = [userTurn, modelTurn];
-    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.6-flash');
+    const result = dropUnsupportedModelTurnPrefill(
+      contents,
+      'gemini-3.6-flash'
+    );
     expect(result).toEqual([userTurn]);
   });
 
   test('drops multiple consecutive trailing model turns but keeps one turn', () => {
     const contents: Content[] = [userTurn, modelTurn, modelTurn];
-    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.5-flash-lite');
+    const result = dropUnsupportedModelTurnPrefill(
+      contents,
+      'gemini-3.5-flash-lite'
+    );
     expect(result).toEqual([userTurn]);
   });
 
   test('leaves a trailing model turn for models that accept prefill', () => {
     const contents: Content[] = [userTurn, modelTurn];
-    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.5-flash');
+    const result = dropUnsupportedModelTurnPrefill(
+      contents,
+      'gemini-3.5-flash'
+    );
     expect(result).toBe(contents);
   });
 
   test('is a no-op when the request already ends with a user turn', () => {
     const contents: Content[] = [modelTurn, userTurn];
-    const result = dropUnsupportedModelTurnPrefill(contents, 'gemini-3.6-flash');
+    const result = dropUnsupportedModelTurnPrefill(
+      contents,
+      'gemini-3.6-flash'
+    );
     expect(result).toBe(contents);
   });
 
   test('is a no-op for empty or undefined contents', () => {
     expect(dropUnsupportedModelTurnPrefill([], 'gemini-3.6-flash')).toEqual([]);
-    expect(dropUnsupportedModelTurnPrefill(undefined, 'gemini-3.6-flash')).toBeUndefined();
+    expect(
+      dropUnsupportedModelTurnPrefill(undefined, 'gemini-3.6-flash')
+    ).toBeUndefined();
   });
 });

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

@@ -390,7 +390,9 @@ function _convertLangChainContentToPart(
   }
 
   if (content.type === 'text') {
-    return { text: content.text };
+    return typeof content.text === 'string' && content.text !== ''
+      ? { text: content.text }
+      : undefined;
   } else if (content.type === 'executableCode') {
     return { executableCode: content.executableCode };
   } else if (content.type === 'codeExecutionResult') {
@@ -429,10 +431,14 @@ function _convertLangChainContentToPart(
   } else if (content.type === 'media') {
     return messageContentMedia(content);
   } else if (content.type === 'tool_use') {
+    const functionId = getGoogleFunctionId(
+      typeof content.id === 'string' ? content.id : undefined
+    );
     return {
       functionCall: {
         name: content.name,
         args: content.input,
+        ...(functionId != null ? { id: functionId } : {}),
       },
     };
   } else if (
@@ -553,7 +559,28 @@ export function convertMessageContentToParts(
     });
   }
 
-  return [...messageParts, ...functionCalls];
+  const parsedFunctionCallIds = new Set(
+    functionCalls.flatMap((part) => {
+      const functionCall = part.functionCall as GoogleFunctionCallWithId;
+      return functionCall.id != null ? [functionCall.id] : [];
+    })
+  );
+  const parsedFunctionCallNames = new Set(
+    functionCalls.map((part) => part.functionCall.name)
+  );
+  const contentWithoutParsedMirrors = messageParts.filter((part) => {
+    if (!('functionCall' in part) || part.functionCall == null) {
+      return true;
+    }
+    const functionCall = part.functionCall as GoogleFunctionCallWithId;
+    return !(
+      (functionCall.id != null && parsedFunctionCallIds.has(functionCall.id)) ||
+      (functionCall.id == null &&
+        parsedFunctionCallNames.has(functionCall.name))
+    );
+  });
+
+  return [...contentWithoutParsedMirrors, ...functionCalls];
 }
 
 export function convertBaseMessagesToContent(
@@ -665,7 +692,11 @@ export function dropUnsupportedModelTurnPrefill(
   contents: Content[] | undefined,
   model?: string
 ): Content[] | undefined {
-  if (contents == null || contents.length === 0 || !rejectsModelTurnPrefill(model)) {
+  if (
+    contents == null ||
+    contents.length === 0 ||
+    !rejectsModelTurnPrefill(model)
+  ) {
     return contents;
   }
   let end = contents.length;