2025-06-13 15:47:41 -04:00
|
|
|
import { useState, useEffect } from 'react';
|
|
|
|
|
import { useFormContext, Controller } from 'react-hook-form';
|
🤖 feat: Streamline Endpoints to Agent Framework (#8013)
* refactor(buildEndpointOption): Improve error logging in middleware, consolidate `isAgents` builder logic, remove adding `modelsConfig` to `endpointOption`
* refactor: parameter extraction and organization in agent services, minimize redundancy of shared fields across objects, make clear distinction of parameters processed uniquely by LibreChat vs LLM Provider Configs
* refactor(createPayload): streamline all endpoints to agent route
* fix: add `modelLabel` to response sender options for agent initialization
* chore: correct log message context in EditController abort controller cleanup
* chore: remove unused abortRequest hook
* chore: remove unused addToCache module and its dependencies
* refactor: remove AskController and related routes, update endpoint URLs (now all streamlined to agents route)
* chore: remove unused bedrock route and its related imports
* refactor: simplify response sender logic for Google endpoint
* chore: add `modelDisplayLabel` handling for agents endpoint
* feat: add file search capability to ephemeral agents, update code interpreter selection based of file upload, consolidate main upload menu for all endpoints
* feat: implement useToolToggle hook for managing tool toggle state, refactor CodeInterpreter and WebSearch components to utilize new hook
* feat: add ToolsDropdown component to BadgeRow for enhanced tool options
* feat: introduce BadgeRowContext and BadgeRowProvider for managing conversation state, refactor related components to utilize context
* feat: implement useMCPSelect hook for managing MCP selection state, refactor MCPSelect component to utilize new hook
* feat: enhance BadgeRowContext with MCPSelect and tool toggle functionality, refactor related components to utilize updated context and hooks
* refactor: streamline useToolToggle hook by integrating setEphemeralAgent directly into toggle logic and removing redundant setValue function
* refactor: consolidate codeApiKeyForm and searchApiKeyForm from CodeInterpreter and WebSearch to utilize new context properties
* refactor: update CheckboxButton to support controlled state and enhance ToolsDropdown with permission-based toggles for web search and code interpreter
* refactor: conditionally render CheckboxButton in CodeInterpreter and WebSearch components for improved UI responsiveness
* chore: add jotai dependency to package.json and package-lock.json
* chore: update brace-expansion package to version 2.0.2 in package-lock.json due to CVE-2025-5889
* Revert "chore: add jotai dependency to package.json and package-lock.json"
This reverts commit 69b699739671e740820f570ddb83d1caa0dbd6e4.
* refactor: add pinning functionality to CodeInterpreter and WebSearch components, and enhance ToolsDropdown with pin toggle for web search and code interpreter
* chore: move MCPIcon to correct location, remove duplicate
* fix: update MCP import to use type-only import from librechat-data-provider
* feat: implement MCPSubMenu component and integrate pinning functionality into ToolsDropdown
* fix: cycling to submenu by using parent menu context
* feat: add FileSearch component and integrate it into BadgeRow and ToolsDropdown
* chore: import order
* chore: remove agent specific logic that would block functionality for streamlined endpoints
* chore: linting for `createContextHandlers`
* chore: ensure ToolsDropdown doesn't show up for agents
* chore: ensure tool resource is selected when dragged to UI
* chore: update file search behavior to simulate legacy functionality
* feat: ToolDialogs with multiple trigger references, add settings to tool dropdown
* refactor: simplify web search and code interpreter settings checks
* chore: simplify local storage key for pinned state in useToolToggle
* refactor: reinstate agent check in AttachFileChat component, as individual providers will ahve different file configurations
* ci: increase timeout for MongoDB connection in Agent tests
2025-06-23 09:59:05 -04:00
|
|
|
import type { MCP } from 'librechat-data-provider';
|
2025-06-13 15:47:41 -04:00
|
|
|
import MCPAuth from '~/components/SidePanel/Builder/MCPAuth';
|
|
|
|
|
import MCPIcon from '~/components/SidePanel/Agents/MCPIcon';
|
|
|
|
|
import { Label, Checkbox } from '~/components/ui';
|
|
|
|
|
import useLocalize from '~/hooks/useLocalize';
|
|
|
|
|
import { useToastContext } from '~/Providers';
|
|
|
|
|
import { Spinner } from '~/components/svg';
|
|
|
|
|
import { MCPForm } from '~/common/types';
|
|
|
|
|
|
|
|
|
|
function useUpdateAgentMCP({
|
|
|
|
|
onSuccess,
|
|
|
|
|
onError,
|
|
|
|
|
}: {
|
|
|
|
|
onSuccess: (data: [string, MCP]) => void;
|
|
|
|
|
onError: (error: Error) => void;
|
|
|
|
|
}) {
|
|
|
|
|
return {
|
|
|
|
|
mutate: async ({
|
|
|
|
|
mcp_id,
|
|
|
|
|
metadata,
|
|
|
|
|
agent_id,
|
|
|
|
|
}: {
|
|
|
|
|
mcp_id?: string;
|
|
|
|
|
metadata: MCP['metadata'];
|
|
|
|
|
agent_id: string;
|
|
|
|
|
}) => {
|
|
|
|
|
try {
|
|
|
|
|
// TODO: Implement MCP endpoint
|
|
|
|
|
onSuccess(['success', { mcp_id, metadata, agent_id } as MCP]);
|
|
|
|
|
} catch (error) {
|
|
|
|
|
onError(error as Error);
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
isLoading: false,
|
|
|
|
|
};
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
interface MCPInputProps {
|
|
|
|
|
mcp?: MCP;
|
|
|
|
|
agent_id?: string;
|
|
|
|
|
setMCP: React.Dispatch<React.SetStateAction<MCP | undefined>>;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
export default function MCPInput({ mcp, agent_id, setMCP }: MCPInputProps) {
|
|
|
|
|
const localize = useLocalize();
|
|
|
|
|
const { showToast } = useToastContext();
|
|
|
|
|
const {
|
|
|
|
|
handleSubmit,
|
|
|
|
|
register,
|
|
|
|
|
formState: { errors },
|
|
|
|
|
control,
|
|
|
|
|
} = useFormContext<MCPForm>();
|
|
|
|
|
const [isLoading, setIsLoading] = useState(false);
|
|
|
|
|
const [showTools, setShowTools] = useState(false);
|
|
|
|
|
const [selectedTools, setSelectedTools] = useState<string[]>([]);
|
|
|
|
|
|
|
|
|
|
// Initialize tools list if editing existing MCP
|
|
|
|
|
useEffect(() => {
|
|
|
|
|
if (mcp?.mcp_id && mcp.metadata.tools) {
|
|
|
|
|
setShowTools(true);
|
|
|
|
|
setSelectedTools(mcp.metadata.tools);
|
|
|
|
|
}
|
|
|
|
|
}, [mcp]);
|
|
|
|
|
|
|
|
|
|
const updateAgentMCP = useUpdateAgentMCP({
|
|
|
|
|
onSuccess(data) {
|
|
|
|
|
showToast({
|
|
|
|
|
message: localize('com_ui_update_mcp_success'),
|
|
|
|
|
status: 'success',
|
|
|
|
|
});
|
|
|
|
|
setMCP(data[1]);
|
|
|
|
|
setShowTools(true);
|
|
|
|
|
setSelectedTools(data[1].metadata.tools ?? []);
|
|
|
|
|
setIsLoading(false);
|
|
|
|
|
},
|
|
|
|
|
onError(error) {
|
|
|
|
|
showToast({
|
|
|
|
|
message: (error as Error).message || localize('com_ui_update_mcp_error'),
|
|
|
|
|
status: 'error',
|
|
|
|
|
});
|
|
|
|
|
setIsLoading(false);
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const saveMCP = handleSubmit(async (data: MCPForm) => {
|
|
|
|
|
setIsLoading(true);
|
|
|
|
|
try {
|
|
|
|
|
const response = await updateAgentMCP.mutate({
|
|
|
|
|
agent_id: agent_id ?? '',
|
|
|
|
|
mcp_id: mcp?.mcp_id,
|
|
|
|
|
metadata: {
|
|
|
|
|
...data,
|
|
|
|
|
tools: selectedTools,
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
setMCP(response[1]);
|
|
|
|
|
showToast({
|
|
|
|
|
message: localize('com_ui_update_mcp_success'),
|
|
|
|
|
status: 'success',
|
|
|
|
|
});
|
|
|
|
|
} catch {
|
|
|
|
|
showToast({
|
|
|
|
|
message: localize('com_ui_update_mcp_error'),
|
|
|
|
|
status: 'error',
|
|
|
|
|
});
|
|
|
|
|
} finally {
|
|
|
|
|
setIsLoading(false);
|
|
|
|
|
}
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
const handleSelectAll = () => {
|
|
|
|
|
if (mcp?.metadata.tools) {
|
|
|
|
|
setSelectedTools(mcp.metadata.tools);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const handleDeselectAll = () => {
|
|
|
|
|
setSelectedTools([]);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const handleToolToggle = (tool: string) => {
|
|
|
|
|
setSelectedTools((prev) =>
|
|
|
|
|
prev.includes(tool) ? prev.filter((t) => t !== tool) : [...prev, tool],
|
|
|
|
|
);
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const handleToggleAll = () => {
|
|
|
|
|
if (selectedTools.length === mcp?.metadata.tools?.length) {
|
|
|
|
|
handleDeselectAll();
|
|
|
|
|
} else {
|
|
|
|
|
handleSelectAll();
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
const handleIconChange = (e: React.ChangeEvent<HTMLInputElement>) => {
|
|
|
|
|
const file = e.target.files?.[0];
|
|
|
|
|
if (file) {
|
|
|
|
|
const reader = new FileReader();
|
|
|
|
|
reader.onloadend = () => {
|
|
|
|
|
const base64String = reader.result as string;
|
|
|
|
|
setMCP({
|
|
|
|
|
mcp_id: mcp?.mcp_id ?? '',
|
|
|
|
|
agent_id: agent_id ?? '',
|
|
|
|
|
metadata: {
|
|
|
|
|
...mcp?.metadata,
|
|
|
|
|
icon: base64String,
|
|
|
|
|
},
|
|
|
|
|
});
|
|
|
|
|
};
|
|
|
|
|
reader.readAsDataURL(file);
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
<div className="flex flex-col gap-4">
|
|
|
|
|
{/* Icon Picker */}
|
|
|
|
|
<div className="mb-4">
|
|
|
|
|
<MCPIcon icon={mcp?.metadata.icon} onIconChange={handleIconChange} />
|
|
|
|
|
</div>
|
|
|
|
|
{/* name, description, url */}
|
|
|
|
|
<div className="flex flex-col gap-4">
|
|
|
|
|
<div className="flex flex-col gap-2">
|
|
|
|
|
<Label htmlFor="name">{localize('com_ui_name')}</Label>
|
|
|
|
|
<input
|
|
|
|
|
id="name"
|
|
|
|
|
{...register('name', { required: true })}
|
|
|
|
|
className="border-token-border-medium flex h-9 w-full rounded-lg border bg-transparent px-3 py-1.5 text-sm outline-none placeholder:text-text-secondary-alt focus:ring-1 focus:ring-border-light"
|
|
|
|
|
placeholder={localize('com_agents_mcp_name_placeholder')}
|
|
|
|
|
/>
|
|
|
|
|
{errors.name && (
|
|
|
|
|
<span className="text-xs text-red-500">{localize('com_ui_field_required')}</span>
|
|
|
|
|
)}
|
|
|
|
|
</div>
|
|
|
|
|
<div className="flex flex-col gap-2">
|
|
|
|
|
<Label htmlFor="description">
|
|
|
|
|
{localize('com_ui_description')}
|
|
|
|
|
<span className="ml-1 text-xs text-text-secondary-alt">
|
|
|
|
|
{localize('com_ui_optional')}
|
|
|
|
|
</span>
|
|
|
|
|
</Label>
|
|
|
|
|
<input
|
|
|
|
|
id="description"
|
|
|
|
|
{...register('description')}
|
|
|
|
|
className="border-token-border-medium flex h-9 w-full rounded-lg border bg-transparent px-3 py-1.5 text-sm outline-none placeholder:text-text-secondary-alt focus:ring-1 focus:ring-border-light"
|
|
|
|
|
placeholder={localize('com_agents_mcp_description_placeholder')}
|
|
|
|
|
/>
|
|
|
|
|
</div>
|
|
|
|
|
<div className="flex flex-col gap-2">
|
|
|
|
|
<Label htmlFor="url">{localize('com_ui_mcp_url')}</Label>
|
|
|
|
|
<input
|
|
|
|
|
id="url"
|
|
|
|
|
{...register('url', {
|
|
|
|
|
required: true,
|
|
|
|
|
})}
|
|
|
|
|
className="border-token-border-medium flex h-9 w-full rounded-lg border bg-transparent px-3 py-1.5 text-sm outline-none placeholder:text-text-secondary-alt focus:ring-1 focus:ring-border-light"
|
|
|
|
|
placeholder={'https://mcp.example.com'}
|
|
|
|
|
/>
|
|
|
|
|
{errors.url && (
|
|
|
|
|
<span className="text-xs text-red-500">
|
|
|
|
|
{errors.url.type === 'required'
|
|
|
|
|
? localize('com_ui_field_required')
|
|
|
|
|
: errors.url.message}
|
|
|
|
|
</span>
|
|
|
|
|
)}
|
|
|
|
|
</div>
|
|
|
|
|
<MCPAuth />
|
|
|
|
|
<div className="my-2 flex items-center gap-2">
|
|
|
|
|
<Controller
|
|
|
|
|
name="trust"
|
|
|
|
|
control={control}
|
|
|
|
|
rules={{ required: true }}
|
|
|
|
|
render={({ field }) => (
|
|
|
|
|
<Checkbox id="trust" checked={field.value} onCheckedChange={field.onChange} />
|
|
|
|
|
)}
|
|
|
|
|
/>
|
|
|
|
|
<Label htmlFor="trust" className="flex flex-col">
|
|
|
|
|
{localize('com_ui_trust_app')}
|
|
|
|
|
<span className="text-xs text-text-secondary">
|
|
|
|
|
{localize('com_agents_mcp_trust_subtext')}
|
|
|
|
|
</span>
|
|
|
|
|
</Label>
|
|
|
|
|
</div>
|
|
|
|
|
{errors.trust && (
|
|
|
|
|
<span className="text-xs text-red-500">{localize('com_ui_field_required')}</span>
|
|
|
|
|
)}
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<div className="flex items-center justify-end">
|
|
|
|
|
<button
|
|
|
|
|
onClick={saveMCP}
|
|
|
|
|
disabled={isLoading}
|
|
|
|
|
className="focus:shadow-outline mt-1 flex min-w-[100px] items-center justify-center rounded bg-green-500 px-4 py-2 font-semibold text-white hover:bg-green-400 focus:border-green-500 focus:outline-none focus:ring-0 disabled:bg-green-400"
|
|
|
|
|
type="button"
|
|
|
|
|
>
|
|
|
|
|
{(() => {
|
|
|
|
|
if (isLoading) {
|
|
|
|
|
return <Spinner className="icon-md" />;
|
|
|
|
|
}
|
|
|
|
|
return mcp?.mcp_id ? localize('com_ui_update') : localize('com_ui_create');
|
|
|
|
|
})()}
|
|
|
|
|
</button>
|
|
|
|
|
</div>
|
|
|
|
|
|
|
|
|
|
{showTools && mcp?.metadata.tools && (
|
|
|
|
|
<div className="mt-4 flex flex-col gap-4">
|
|
|
|
|
<div className="flex items-center justify-between">
|
|
|
|
|
<h3 className="text-token-text-primary block font-medium">
|
|
|
|
|
{localize('com_ui_available_tools')}
|
|
|
|
|
</h3>
|
|
|
|
|
<button
|
|
|
|
|
onClick={handleToggleAll}
|
|
|
|
|
type="button"
|
|
|
|
|
className="btn btn-neutral border-token-border-light relative h-8 rounded-full px-4 font-medium"
|
|
|
|
|
>
|
|
|
|
|
{selectedTools.length === mcp.metadata.tools.length
|
|
|
|
|
? localize('com_ui_deselect_all')
|
|
|
|
|
: localize('com_ui_select_all')}
|
|
|
|
|
</button>
|
|
|
|
|
</div>
|
|
|
|
|
<div className="flex flex-col gap-2">
|
|
|
|
|
{mcp.metadata.tools.map((tool) => (
|
|
|
|
|
<label
|
|
|
|
|
key={tool}
|
|
|
|
|
htmlFor={tool}
|
|
|
|
|
className="border-token-border-light hover:bg-token-surface-secondary flex cursor-pointer items-center rounded-lg border p-2"
|
|
|
|
|
>
|
|
|
|
|
<Checkbox
|
|
|
|
|
id={tool}
|
|
|
|
|
checked={selectedTools.includes(tool)}
|
|
|
|
|
onCheckedChange={() => handleToolToggle(tool)}
|
|
|
|
|
className="relative float-left mr-2 inline-flex h-4 w-4 cursor-pointer"
|
|
|
|
|
/>
|
|
|
|
|
<span className="text-token-text-primary">
|
|
|
|
|
{tool
|
|
|
|
|
.split('_')
|
|
|
|
|
.map((word) => word.charAt(0).toUpperCase() + word.slice(1))
|
|
|
|
|
.join(' ')}
|
|
|
|
|
</span>
|
|
|
|
|
</label>
|
|
|
|
|
))}
|
|
|
|
|
</div>
|
|
|
|
|
</div>
|
|
|
|
|
)}
|
|
|
|
|
</div>
|
|
|
|
|
);
|
|
|
|
|
}
|