🤖 refactor: Auto-validate IDs in Agent Query (#9555)

* 🤖 refactor: Auto-validate IDs in Agent Query

* chore: remove comments in useAgentToolPermissions
This commit is contained in:
Danny Avila 2025-09-10 18:38:33 -04:00 committed by GitHub
parent f3eca8c7a7
commit f125f5bd32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 21 additions and 33 deletions

View file

@ -20,24 +20,18 @@ export default function useAgentToolPermissions(
): AgentToolPermissionsResult {
const agentsMap = useAgentsMapContext();
// Get the agent from the map if available
const selectedAgent = useMemo(() => {
return agentId != null && agentId !== '' ? agentsMap?.[agentId] : undefined;
}, [agentId, agentsMap]);
// Query for agent data from the API
const { data: agentData } = useGetAgentByIdQuery(agentId ?? '', {
enabled: !!agentId,
});
const { data: agentData } = useGetAgentByIdQuery(agentId);
// Get tools from either the API data or the agents map
const tools = useMemo(
() =>
(agentData?.tools as string[] | undefined) || (selectedAgent?.tools as string[] | undefined),
[agentData?.tools, selectedAgent?.tools],
);
// Determine if file_search is allowed
const fileSearchAllowedByAgent = useMemo(() => {
// If no agentId, allow for ephemeral agents
if (!agentId) return true;
@ -47,7 +41,6 @@ export default function useAgentToolPermissions(
return tools?.includes(Tools.file_search) ?? false;
}, [agentId, selectedAgent, tools]);
// Determine if execute_code is allowed
const codeAllowedByAgent = useMemo(() => {
// If no agentId, allow for ephemeral agents
if (!agentId) return true;

View file

@ -22,9 +22,7 @@ export default function useSelectAgent() {
conversation?.agent_id ?? null,
);
const agentQuery = useGetAgentByIdQuery(selectedAgentId ?? '', {
enabled: !!(selectedAgentId ?? '') && selectedAgentId !== Constants.EPHEMERAL_AGENT_ID,
});
const agentQuery = useGetAgentByIdQuery(selectedAgentId);
const updateConversation = useCallback(
(agent: Partial<Agent>, template: Partial<TPreset | TConversation>) => {

View file

@ -125,13 +125,8 @@ export default function useQueryParams({
const queryClient = useQueryClient();
const { conversation, newConversation } = useChatContext();
// Extract agent_id from URL for proactive fetching
const urlAgentId = searchParams.get('agent_id') || '';
// Use the existing query hook to fetch agent if present in URL
const { data: urlAgent } = useGetAgentByIdQuery(urlAgentId, {
enabled: !!urlAgentId, // Only fetch if agent_id exists in URL
});
const { data: urlAgent } = useGetAgentByIdQuery(urlAgentId);
/**
* Applies settings from URL query parameters to create a new conversation.