Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions backend/app/agent/factory/developer.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# TODO: Remove NoteTakingToolkit and use TerminalToolkit instead
from app.agent.toolkit.note_taking_toolkit import NoteTakingToolkit
from app.agent.toolkit.screenshot_toolkit import ScreenshotToolkit
from app.agent.toolkit.search_toolkit import SearchToolkit
from app.agent.toolkit.skill_toolkit import SkillToolkit
from app.agent.toolkit.terminal_toolkit import TerminalToolkit
from app.agent.toolkit.web_deploy_toolkit import WebDeployToolkit
Expand Down Expand Up @@ -75,6 +76,11 @@ async def developer_agent(options: Chat):
)
terminal_toolkit = message_integration.register_toolkits(terminal_toolkit)

search_tools = SearchToolkit.get_can_use_tools(options.project_id)
if search_tools:
search_tools = message_integration.register_functions(search_tools)
else:
search_tools = []
skill_toolkit = SkillToolkit(
options.project_id,
Agents.developer_agent,
Expand All @@ -91,6 +97,7 @@ async def developer_agent(options: Chat):
*web_deploy_toolkit.get_tools(),
*terminal_toolkit.get_tools(),
*screenshot_toolkit.get_tools(),
*search_tools,
*skill_toolkit.get_tools(),
]
system_message = DEVELOPER_SYS_PROMPT.format(
Expand All @@ -113,6 +120,7 @@ async def developer_agent(options: Chat):
TerminalToolkit.toolkit_name(),
NoteTakingToolkit.toolkit_name(),
WebDeployToolkit.toolkit_name(),
SearchToolkit.toolkit_name(),
ScreenshotToolkit.toolkit_name(),
SkillToolkit.toolkit_name(),
],
Expand Down
8 changes: 8 additions & 0 deletions backend/app/agent/factory/document.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from app.agent.toolkit.note_taking_toolkit import NoteTakingToolkit
from app.agent.toolkit.pptx_toolkit import PPTXToolkit
from app.agent.toolkit.screenshot_toolkit import ScreenshotToolkit
from app.agent.toolkit.search_toolkit import SearchToolkit
from app.agent.toolkit.skill_toolkit import SkillToolkit
from app.agent.toolkit.terminal_toolkit import TerminalToolkit
from app.agent.utils import NOW_STR
Expand Down Expand Up @@ -94,6 +95,11 @@ async def document_agent(options: Chat):
options.project_id, options.get_bun_env()
)

search_tools = SearchToolkit.get_can_use_tools(options.project_id)
if search_tools:
search_tools = message_integration.register_functions(search_tools)
else:
search_tools = []
skill_toolkit = SkillToolkit(
options.project_id,
Agents.document_agent,
Expand All @@ -114,6 +120,7 @@ async def document_agent(options: Chat):
*terminal_toolkit.get_tools(),
*screenshot_toolkit.get_tools(),
*google_drive_tools,
*search_tools,
*skill_toolkit.get_tools(),
]
system_message = DOCUMENT_SYS_PROMPT.format(
Expand Down Expand Up @@ -141,6 +148,7 @@ async def document_agent(options: Chat):
TerminalToolkit.toolkit_name(),
ScreenshotToolkit.toolkit_name(),
GoogleDriveMCPToolkit.toolkit_name(),
SearchToolkit.toolkit_name(),
SkillToolkit.toolkit_name(),
],
toolkits_to_register_agent=[
Expand Down
7 changes: 7 additions & 0 deletions backend/app/agent/factory/multi_modal.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ def multi_modal_agent(options: Chat):
)
note_toolkit = message_integration.register_toolkits(note_toolkit)

search_tools = SearchToolkit.get_can_use_tools(options.project_id)
if search_tools:
search_tools = message_integration.register_functions(search_tools)
else:
search_tools = []

skill_toolkit = SkillToolkit(
options.project_id,
Agents.multi_modal_agent,
Expand All @@ -92,6 +98,7 @@ def multi_modal_agent(options: Chat):
),
*terminal_toolkit.get_tools(),
*note_toolkit.get_tools(),
*search_tools,
*skill_toolkit.get_tools(),
]
if options.is_cloud():
Expand Down
3 changes: 3 additions & 0 deletions backend/app/agent/factory/social_media.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
from app.agent.toolkit.note_taking_toolkit import NoteTakingToolkit
from app.agent.toolkit.notion_mcp_toolkit import NotionMCPToolkit
from app.agent.toolkit.reddit_toolkit import RedditToolkit
from app.agent.toolkit.search_toolkit import SearchToolkit
from app.agent.toolkit.skill_toolkit import SkillToolkit
from app.agent.toolkit.terminal_toolkit import TerminalToolkit
from app.agent.toolkit.twitter_toolkit import TwitterToolkit
Expand Down Expand Up @@ -71,6 +72,7 @@ async def social_media_agent(options: Chat):
Agents.social_media_agent,
working_directory=working_directory,
).get_tools(),
*SearchToolkit.get_can_use_tools(options.project_id),
*SkillToolkit(
options.project_id,
Agents.social_media_agent,
Expand Down Expand Up @@ -101,6 +103,7 @@ async def social_media_agent(options: Chat):
HumanToolkit.toolkit_name(),
TerminalToolkit.toolkit_name(),
NoteTakingToolkit.toolkit_name(),
SearchToolkit.toolkit_name(),
SkillToolkit.toolkit_name(),
],
)
14 changes: 14 additions & 0 deletions server/tests/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. =========
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. =========

17 changes: 13 additions & 4 deletions test/unit/electron/main/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1291,7 +1291,10 @@ describe('Electron Main Index Functions', () => {
*/
const path = require('node:path');

const isPathAllowed = (filePath: string, allowedBases: string[]): boolean => {
const isPathAllowed = (
filePath: string,
allowedBases: string[]
): boolean => {
const resolvedPath = path.resolve(filePath);
return allowedBases.some((base: string) => {
const resolvedBase = path.resolve(base);
Expand All @@ -1305,11 +1308,15 @@ describe('Electron Main Index Functions', () => {
const ALLOWED_BASES = ['/home/user', '/mock/user/data', '/tmp'];

it('should allow files within home directory', () => {
expect(isPathAllowed('/home/user/documents/file.pdf', ALLOWED_BASES)).toBe(true);
expect(
isPathAllowed('/home/user/documents/file.pdf', ALLOWED_BASES)
).toBe(true);
});

it('should allow files within userData directory', () => {
expect(isPathAllowed('/mock/user/data/cache/image.png', ALLOWED_BASES)).toBe(true);
expect(
isPathAllowed('/mock/user/data/cache/image.png', ALLOWED_BASES)
).toBe(true);
});

it('should allow files within temp directory', () => {
Expand Down Expand Up @@ -1343,7 +1350,9 @@ describe('Electron Main Index Functions', () => {

it('should block paths that are prefixes but not subdirectories', () => {
// /home/user-evil should NOT match /home/user
expect(isPathAllowed('/home/user-evil/file.txt', ALLOWED_BASES)).toBe(false);
expect(isPathAllowed('/home/user-evil/file.txt', ALLOWED_BASES)).toBe(
false
);
});
});

Expand Down