🔀 fix: MCP Improvements, Auto-Save Drafts, Artifact Markup (danny-avila#7040)

* feat: Update MCP tool creation to use lowercase provider name

* refactor: handle MCP image output edge cases where tool outputs must contain string responses

* feat: Drop 'anyOf' and 'oneOf' fields from JSON schema conversion

* feat: Transform 'oneOf' and 'anyOf' fields to Zod union in JSON schema conversion

* fix: artifactPlugin to replace textDirective with expected text, closes danny-avila#7029

* fix: auto-save functionality to handle conversation transitions from pending drafts, closes danny-avila#7027

* refactor: improve async handling during user disconnection process

* fix: use correct user ID variable for MCP tool calling

* fix: improve handling of pending drafts in auto-save functionality

* fix: add support for additional model names in getValueKey function

* fix: reset form values on agent deletion when no agents remain

Author: danny-avila

api/models/tx.js

@@ -180,6 +180,14 @@ const getValueKey = (model, endpoint) => {
     return 'gpt-3.5-turbo-1106';
   } else if (modelName.includes('gpt-3.5')) {
     return '4k';
+  } else if (modelName.includes('o4-mini')) {
+    return 'o4-mini';
+  } else if (modelName.includes('o4')) {
+    return 'o4';
+  } else if (modelName.includes('o3-mini')) {
+    return 'o3-mini';
+  } else if (modelName.includes('o3')) {
+    return 'o3';
   } else if (modelName.includes('o1-preview')) {
     return 'o1-preview';
   } else if (modelName.includes('o1-mini')) {

api/package.json

@@ -48,7 +48,7 @@
     "@langchain/google-genai": "^0.2.2",
     "@langchain/google-vertexai": "^0.2.3",
     "@langchain/textsplitters": "^0.1.0",
-    "@librechat/agents": "^2.4.20",
+    "@librechat/agents": "^2.4.22",
     "@librechat/data-schemas": "*",
     "@waylaidwanderer/fetch-event-source": "^3.0.1",
     "axios": "^1.8.2",

api/server/services/MCP.js

@@ -19,17 +19,18 @@ const { logger, getMCPManager } = require('~/config');
  * @param {string} params.model - The model for the tool.
  * @returns { Promise<typeof tool | { _call: (toolInput: Object | string) => unknown}> } An object with `_call` method to execute the tool input.
  */
-async function createMCPTool({ req, toolKey, provider }) {
+async function createMCPTool({ req, toolKey, provider: _provider }) {
   const toolDefinition = req.app.locals.availableTools[toolKey]?.function;
   if (!toolDefinition) {
     logger.error(`Tool ${toolKey} not found in available tools`);
     return null;
   }
   /** @type {LCTool} */
   const { description, parameters } = toolDefinition;
-  const isGoogle = provider === Providers.VERTEXAI || provider === Providers.GOOGLE;
+  const isGoogle = _provider === Providers.VERTEXAI || _provider === Providers.GOOGLE;
   let schema = convertJsonSchemaToZod(parameters, {
     allowEmptyObject: !isGoogle,
+    transformOneOfAnyOf: true,
   });
 
   if (!schema) {
@@ -49,7 +50,8 @@ async function createMCPTool({ req, toolKey, provider }) {
   const _call = async (toolArguments, config) => {
     try {
       const derivedSignal = config?.signal ? AbortSignal.any([config.signal]) : undefined;
-      const mcpManager = getMCPManager(config?.userId);
+      const mcpManager = getMCPManager(config?.configurable?.user_id);
+      const provider = (config?.metadata?.provider || _provider)?.toLowerCase();
       const result = await mcpManager.callTool({
         serverName,
         toolName,
@@ -70,7 +72,7 @@ async function createMCPTool({ req, toolKey, provider }) {
       return result;
     } catch (error) {
       logger.error(
-        `[MCP][User: ${config?.userId}][${serverName}] Error calling "${toolName}" MCP tool:`,
+        `[MCP][User: ${config?.configurable?.user_id}][${serverName}] Error calling "${toolName}" MCP tool:`,
         error,
       );
       throw new Error(

client/src/components/Artifacts/Artifact.tsx

@@ -11,7 +11,16 @@ import ArtifactButton from './ArtifactButton';
 
 export const artifactPlugin: Pluggable = () => {
   return (tree) => {
-    visit(tree, ['textDirective', 'leafDirective', 'containerDirective'], (node) => {
+    visit(tree, ['textDirective', 'leafDirective', 'containerDirective'], (node, index, parent) => {
+      if (node.type === 'textDirective') {
+        const replacementText = `:${node.name}`;
+        if (parent && Array.isArray(parent.children) && typeof index === 'number') {
+          parent.children[index] = {
+            type: 'text',
+            value: replacementText,
+          };
+        }
+      }
       if (node.name !== 'artifact') {
         return;
       }
@@ -26,7 +35,6 @@ export const artifactPlugin: Pluggable = () => {
 };
 
 export function Artifact({
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   node,
   ...props
 }: Artifact & {

client/src/components/SidePanel/Agents/DeleteButton.tsx

@@ -1,3 +1,5 @@
+import { useFormContext } from 'react-hook-form';
+import { defaultAgentFormValues } from 'librechat-data-provider';
 import type { Agent, AgentCreateParams } from 'librechat-data-provider';
 import type { UseMutationResult } from '@tanstack/react-query';
 import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
@@ -18,6 +20,7 @@ export default function DeleteButton({
   createMutation: UseMutationResult<Agent, Error, AgentCreateParams>;
 }) {
   const localize = useLocalize();
+  const { reset } = useFormContext();
   const { showToast } = useToastContext();
   const { conversation } = useChatContext();
   const { setOption } = useSetIndexOptions();
@@ -41,6 +44,10 @@ export default function DeleteButton({
 
       const firstAgent = updatedList[0] as Agent | undefined;
       if (!firstAgent) {
+        setCurrentAgentId(undefined);
+        reset({
+          ...defaultAgentFormValues,
+        });
         return setOption('agent_id')('');
       }
 

client/src/hooks/Input/useAutoSave.ts

@@ -1,6 +1,6 @@
 import debounce from 'lodash/debounce';
 import { SetterOrUpdater, useRecoilValue } from 'recoil';
-import { useState, useEffect, useMemo, useCallback } from 'react';
+import { useState, useEffect, useMemo, useCallback, useRef } from 'react';
 import { LocalStorageKeys, Constants } from 'librechat-data-provider';
 import type { TFile } from 'librechat-data-provider';
 import type { ExtendedFile } from '~/common';
@@ -159,6 +159,8 @@ export const useAutoSave = ({
     };
   }, [conversationId, saveDrafts, textAreaRef]);
 
+  const prevConversationIdRef = useRef<string | null>(null);
+
   useEffect(() => {
     // This useEffect is responsible for saving the current conversation's draft and
     // restoring the new conversation's draft when switching between conversations.
@@ -176,7 +178,28 @@ export const useAutoSave = ({
     setFiles(new Map());
 
     try {
-      if (currentConversationId != null && currentConversationId) {
+      // Check for transition from PENDING_CONVO to a valid conversationId
+      if (
+        prevConversationIdRef.current === Constants.PENDING_CONVO &&
+        conversationId !== Constants.PENDING_CONVO &&
+        conversationId.length > 3
+      ) {
+        const pendingDraft = localStorage.getItem(
+          `${LocalStorageKeys.TEXT_DRAFT}${Constants.PENDING_CONVO}`,
+        );
+
+        // Clear the pending draft, if it exists, and save the current draft to the new conversationId;
+        // otherwise, save the current text area value to the new conversationId
+        localStorage.removeItem(`${LocalStorageKeys.TEXT_DRAFT}${Constants.PENDING_CONVO}`);
+        if (pendingDraft) {
+          localStorage.setItem(`${LocalStorageKeys.TEXT_DRAFT}${conversationId}`, pendingDraft);
+        } else if (textAreaRef?.current?.value) {
+          localStorage.setItem(
+            `${LocalStorageKeys.TEXT_DRAFT}${conversationId}`,
+            encodeBase64(textAreaRef.current.value),
+          );
+        }
+      } else if (currentConversationId != null && currentConversationId) {
         saveText(currentConversationId);
       }
 
@@ -186,11 +209,13 @@ export const useAutoSave = ({
       console.error(e);
     }
 
+    prevConversationIdRef.current = conversationId;
     setCurrentConversationId(conversationId);
   }, [
-    conversationId,
     currentConversationId,
+    conversationId,
     restoreFiles,
+    textAreaRef,
     restoreText,
     saveDrafts,
     saveText,