🚧 chore: merge latest dev build (#4288)

* fix: agent initialization, add `collectedUsage` handling

* style: improve side panel styling

* refactor(loadAgent): Optimize order agent project ID retrieval

* feat: code execution

* fix: typing issues

* feat: ExecuteCode content part

* refactor: use local state for default collapsed state of analysis content parts

* fix: code parsing in ExecuteCode component

* chore: bump agents package, export loadAuthValues

* refactor: Update handleTools.js to use EnvVar for code execution tool authentication

* WIP

* feat: download code outputs

* fix(useEventHandlers): type issues

* feat: backend handling for code outputs

* Refactor: Remove console.log statement in Part.tsx

* refactor: add attachments to TMessage/messageSchema

* WIP: prelim handling for code outputs

* feat: attachments rendering

* refactor: improve attachments rendering

* fix: attachments, nullish edge case, handle attachments from event stream, bump agents package

* fix filename download

* fix: tool assignment for 'run code' on agent creation

* fix: image handling by adding attachments

* refactor: prevent agent creation without provider/model

* refactor: remove unnecessary space in agent creation success message

* refactor: select first model if selecting provider from empty on form

* fix: Agent avatar bug

* fix: `defaultAgentFormValues` causing boolean typing issue and typeerror

* fix: capabilities counting as tools, causing duplication of them

* fix: formatted messages edge case where consecutive content text type parts with the latter having tool_call_ids would cause consecutive AI messages to be created. furthermore, content could not be an array for tool_use messages (anthropic limitation)

* chore: bump @librechat/agents dependency to version 1.6.9

* feat: bedrock agents

* feat: new Agents icon

* feat: agent titling

* feat: agent landing

* refactor: allow sharing agent globally only if user is admin or author

* feat: initial AgentPanelSkeleton

* feat: AgentPanelSkeleton

* feat: collaborative agents

* chore: add potential authorName as part of schema

* chore: Remove unnecessary console.log statement

* WIP: agent model parameters

* chore: ToolsDialog typing and tool related localization chnages

* refactor: update tool instance type (latest langchain class), and rename google tool to 'google' proper

* chore: add back tools

* feat: Agent knowledge files upload

* refactor: better verbiage for disabled knowledge

* chore: debug logs for file deletions

* chore: debug logs for file deletions

* feat: upload/delete agent knowledge/file-search files

* feat: file search UI for agents

* feat: first pass, file search tool

* chore: update default agent capabilities and info

client/src/utils/endpoints.ts

@@ -3,19 +3,14 @@ import {
   defaultEndpoints,
   modularEndpoints,
   LocalStorageKeys,
+  isAgentsEndpoint,
   isAssistantsEndpoint,
 } from 'librechat-data-provider';
-import type {
-  TConfig,
-  TPreset,
-  TModelSpec,
-  TConversation,
-  TEndpointsConfig,
-} from 'librechat-data-provider';
+import type * as t from 'librechat-data-provider';
 import type { LocalizeFunction } from '~/common';
 
 export const getAssistantName = ({
-  name,
+  name = '',
   localize,
 }: {
   name?: string;
@@ -28,7 +23,7 @@ export const getAssistantName = ({
   }
 };
 
-export const getEndpointsFilter = (endpointsConfig: TEndpointsConfig) => {
+export const getEndpointsFilter = (endpointsConfig: t.TEndpointsConfig) => {
   const filter: Record<string, boolean> = {};
   if (!endpointsConfig) {
     return filter;
@@ -41,7 +36,7 @@ export const getEndpointsFilter = (endpointsConfig: TEndpointsConfig) => {
 
 export const getAvailableEndpoints = (
   filter: Record<string, boolean>,
-  endpointsConfig: TEndpointsConfig,
+  endpointsConfig: t.TEndpointsConfig,
 ) => {
   const defaultSet = new Set(defaultEndpoints);
   const availableEndpoints: EModelEndpoint[] = [];
@@ -61,11 +56,11 @@ export const getAvailableEndpoints = (
 };
 
 /** Get the specified field from the endpoint config */
-export function getEndpointField<K extends keyof TConfig>(
-  endpointsConfig: TEndpointsConfig | undefined,
+export function getEndpointField<K extends keyof t.TConfig>(
+  endpointsConfig: t.TEndpointsConfig | undefined,
   endpoint: EModelEndpoint | string | null | undefined,
   property: K,
-): TConfig[K] | undefined {
+): t.TConfig[K] | undefined {
   if (!endpointsConfig || endpoint === null || endpoint === undefined) {
     return undefined;
   }
@@ -78,7 +73,7 @@ export function getEndpointField<K extends keyof TConfig>(
   return config[property];
 }
 
-export function mapEndpoints(endpointsConfig: TEndpointsConfig) {
+export function mapEndpoints(endpointsConfig: t.TEndpointsConfig) {
   const filter = getEndpointsFilter(endpointsConfig);
   return getAvailableEndpoints(filter, endpointsConfig).sort(
     (a, b) => (endpointsConfig?.[a]?.order ?? 0) - (endpointsConfig?.[b]?.order ?? 0),
@@ -113,14 +108,14 @@ export function updateLastSelectedModel({
 }
 
 interface ConversationInitParams {
-  conversation: TConversation | null;
-  newEndpoint: EModelEndpoint | string;
-  endpointsConfig: TEndpointsConfig;
+  conversation: t.TConversation | null;
+  newEndpoint: EModelEndpoint | string | null;
+  endpointsConfig: t.TEndpointsConfig;
   modularChat?: boolean;
 }
 
 interface InitiatedTemplateResult {
-  template: Partial<TPreset>;
+  template: Partial<t.TPreset>;
   shouldSwitch: boolean;
   isExistingConversation: boolean;
   isCurrentModular: boolean;
@@ -130,10 +125,10 @@ interface InitiatedTemplateResult {
 
 /** Get the conditional logic for switching conversations */
 export function getConvoSwitchLogic(params: ConversationInitParams): InitiatedTemplateResult {
-  const { conversation, newEndpoint, endpointsConfig, modularChat } = params;
+  const { conversation, newEndpoint, endpointsConfig, modularChat = false } = params;
 
   const currentEndpoint = conversation?.endpoint;
-  const template: Partial<TPreset> = {
+  const template: Partial<t.TPreset> = {
     ...conversation,
     endpoint: newEndpoint,
     conversationId: 'new',
@@ -144,7 +139,7 @@ export function getConvoSwitchLogic(params: ConversationInitParams): InitiatedTe
     isAssistantsEndpoint(currentEndpoint) &&
     currentEndpoint === newEndpoint;
 
-  const conversationId = conversation?.conversationId;
+  const conversationId = conversation?.conversationId ?? '';
   const isExistingConversation = !!(conversationId && conversationId !== 'new');
 
   const currentEndpointType =
@@ -178,7 +173,7 @@ export function getConvoSwitchLogic(params: ConversationInitParams): InitiatedTe
  *
  * First, the admin defined default, then last selected spec, followed by first spec
  */
-export function getDefaultModelSpec(modelSpecs?: TModelSpec[]) {
+export function getDefaultModelSpec(modelSpecs?: t.TModelSpec[]) {
   const defaultSpec = modelSpecs?.find((spec) => spec.default);
   const lastSelectedSpecName = localStorage.getItem(LocalStorageKeys.LAST_SPEC);
   const lastSelectedSpec = modelSpecs?.find((spec) => spec.name === lastSelectedSpecName);
@@ -189,7 +184,7 @@ export function getDefaultModelSpec(modelSpecs?: TModelSpec[]) {
  *
  * First, the admin defined default, then last selected spec, followed by first spec
  */
-export function getModelSpecIconURL(modelSpec: TModelSpec) {
+export function getModelSpecIconURL(modelSpec: t.TModelSpec) {
   return modelSpec.iconURL ?? modelSpec.preset.iconURL ?? modelSpec.preset.endpoint ?? '';
 }
 
@@ -202,7 +197,7 @@ export function getIconEndpoint({
   iconURL,
   endpoint,
 }: {
-  endpointsConfig: TEndpointsConfig | undefined;
+  endpointsConfig: t.TEndpointsConfig | undefined;
   iconURL: string | undefined;
   endpoint: string | null | undefined;
 }) {
@@ -217,14 +212,44 @@ export function getIconKey({
   endpointIconURL: iconURL,
 }: {
   endpoint?: string | null;
-  endpointsConfig?: TEndpointsConfig | undefined;
+  endpointsConfig?: t.TEndpointsConfig | undefined;
   endpointType?: string | null;
   endpointIconURL?: string;
 }) {
-  const endpointType = _eType ?? getEndpointField(endpointsConfig, endpoint, 'type');
-  const endpointIconURL = iconURL ?? getEndpointField(endpointsConfig, endpoint, 'iconURL');
-  if (endpointIconURL && EModelEndpoint[endpointIconURL]) {
+  const endpointType = _eType ?? getEndpointField(endpointsConfig, endpoint, 'type') ?? '';
+  const endpointIconURL = iconURL ?? getEndpointField(endpointsConfig, endpoint, 'iconURL') ?? '';
+  if (endpointIconURL && EModelEndpoint[endpointIconURL] != null) {
     return endpointIconURL;
   }
   return endpointType ? 'unknown' : endpoint ?? 'unknown';
 }
+
+export const getEntity = ({
+  endpoint,
+  assistant_id,
+  agent_id,
+  agentsMap,
+  assistantMap,
+}: {
+  endpoint: EModelEndpoint | string | null | undefined;
+  assistant_id: string | undefined;
+  agent_id: string | undefined;
+  agentsMap: t.TAgentsMap | undefined;
+  assistantMap: t.TAssistantsMap | undefined;
+}): {
+  entity: t.Agent | t.Assistant | undefined | null;
+  isAgent: boolean;
+  isAssistant: boolean;
+} => {
+  const isAgent = isAgentsEndpoint(endpoint);
+  const isAssistant = isAssistantsEndpoint(endpoint);
+
+  if (isAgent) {
+    const agent = agentsMap?.[agent_id ?? ''];
+    return { entity: agent, isAgent, isAssistant };
+  } else if (isAssistant) {
+    const assistant = assistantMap?.[endpoint ?? '']?.[assistant_id ?? ''];
+    return { entity: assistant, isAgent, isAssistant };
+  }
+  return { entity: null, isAgent, isAssistant };
+};

client/src/utils/forms.tsx

@@ -1,7 +1,12 @@
 import { EarthIcon } from 'lucide-react';
-import { alternateName } from 'librechat-data-provider';
+import {
+  alternateName,
+  EModelEndpoint,
+  FileSources,
+  EToolResources,
+} from 'librechat-data-provider';
 import type { Agent, TFile } from 'librechat-data-provider';
-import type { DropdownValueSetter, TAgentOption } from '~/common';
+import type { DropdownValueSetter, TAgentOption, ExtendedFile } from '~/common';
 
 /**
  * Creates a Dropdown value setter that always passes a string value,
@@ -37,9 +42,6 @@ export const createProviderOption = (provider: string) => ({
   value: provider,
 });
 
-type FileTuple = [string, Partial<TFile>];
-type FileList = Array<FileTuple>;
-
 export const processAgentOption = ({
   agent: _agent,
   fileMap,
@@ -56,20 +58,49 @@ export const processAgentOption = ({
     label: _agent?.name ?? '',
     value: _agent?.id ?? '',
     icon: isGlobal ? <EarthIcon className="icon-md text-green-400" /> : null,
-    // files: _agent?.file_ids ? ([] as FileList) : undefined,
-    // code_files: _agent?.tool_resources?.code_interpreter?.file_ids
-    //   ? ([] as FileList)
-    //   : undefined,
+    knowledge_files: _agent?.tool_resources?.file_search?.file_ids
+      ? ([] as Array<[string, ExtendedFile]>)
+      : undefined,
+    code_files: _agent?.tool_resources?.execute_code?.file_ids
+      ? ([] as Array<[string, ExtendedFile]>)
+      : undefined,
   };
 
   if (!fileMap) {
     return agent;
   }
 
-  const handleFile = (file_id: string, list?: FileList) => {
+  const handleFile = ({
+    file_id,
+    tool_resource,
+    list,
+  }: {
+    file_id: string;
+    tool_resource: EToolResources;
+    list?: Array<[string, ExtendedFile]>;
+  }) => {
     const file = fileMap[file_id];
+    const source =
+      tool_resource === EToolResources.file_search
+        ? FileSources.vectordb
+        : file?.source ?? FileSources.local;
+
     if (file) {
-      list?.push([file_id, file]);
+      list?.push([
+        file_id,
+        {
+          file_id: file.file_id,
+          type: file.type,
+          filepath: file.filepath,
+          filename: file.filename,
+          width: file.width,
+          height: file.height,
+          size: file.bytes,
+          preview: file.filepath,
+          progress: 1,
+          source,
+        },
+      ]);
     } else {
       list?.push([
         file_id,
@@ -77,22 +108,28 @@ export const processAgentOption = ({
           file_id,
           type: '',
           filename: '',
-          bytes: 1,
-          // progress: 1,
-          // TODO: file handling
-          // filepath: endpoint,
+          size: 1,
+          progress: 1,
+          filepath: EModelEndpoint.agents,
+          source,
         },
       ]);
     }
   };
 
-  if (agent.files && _agent?.file_ids) {
-    _agent.file_ids.forEach((file_id) => handleFile(file_id, agent.files));
+  if (agent.knowledge_files && _agent?.tool_resources?.file_search?.file_ids) {
+    _agent.tool_resources.file_search.file_ids.forEach((file_id) =>
+      handleFile({
+        file_id,
+        list: agent.knowledge_files,
+        tool_resource: EToolResources.file_search,
+      }),
+    );
   }
 
-  if (agent.code_files && _agent?.tool_resources?.code_interpreter?.file_ids) {
-    _agent.tool_resources.code_interpreter.file_ids.forEach((file_id) =>
-      handleFile(file_id, agent.code_files),
+  if (agent.code_files && _agent?.tool_resources?.execute_code?.file_ids) {
+    _agent.tool_resources.execute_code.file_ids.forEach((file_id) =>
+      handleFile({ file_id, list: agent.code_files, tool_resource: EToolResources.execute_code }),
     );
   }
 

client/src/utils/map.ts

@@ -1,6 +1,29 @@
-import type { TFile, Assistant, Agent, TPlugin } from 'librechat-data-provider';
+import type { TFile, TAttachment, Assistant, Agent, TPlugin } from 'librechat-data-provider';
 import type { TPluginMap } from '~/common';
 
+/** Maps Attachments by `toolCallId` for quick lookup */
+export function mapAttachments(attachments: Array<TAttachment | null | undefined>) {
+  const attachmentMap: Record<string, TAttachment[] | undefined> = {};
+
+  for (const attachment of attachments) {
+    if (attachment === null || attachment === undefined) {
+      continue;
+    }
+    const key = attachment.toolCallId ?? '';
+    if (key.length === 0) {
+      continue;
+    }
+
+    if (!attachmentMap[key]) {
+      attachmentMap[key] = [];
+    }
+
+    attachmentMap[key].push(attachment);
+  }
+
+  return attachmentMap;
+}
+
 /** Maps Files by `file_id` for quick lookup */
 export function mapFiles(files: TFile[]) {
   const fileMap = {} as Record<string, TFile>;