Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🔧 fix: Make assistant tool filtering compatible with plugin filtering (#3325)

Benedikt Nordhoff0a1d38e3189a
diff --git a/api/server/services/ToolService.js b/api/server/services/ToolService.js
index 524797d062..a91948b19a 100644
--- a/api/server/services/ToolService.js
+++ b/api/server/services/ToolService.js
@@ -73,10 +73,6 @@ function loadAndFormatTools({ directory, adminFilter = [], adminIncluded = [] })
continue;
}
- if (included.size > 0 && !included.has(file)) {
- continue;
- }
-
let toolInstance = null;
try {
toolInstance = new ToolClass({ override: true });
@@ -92,6 +88,14 @@ function loadAndFormatTools({ directory, adminFilter = [], adminIncluded = [] })
continue;
}
+ if (filter.has(toolInstance.name) && included.size === 0) {
+ continue;
+ }
+
+ if (included.size > 0 && !included.has(file) && !included.has(toolInstance.name)) {
+ continue;
+ }
+
const formattedTool = formatToOpenAIAssistantTool(toolInstance);
tools.push(formattedTool);
}