mirror of
https://github.com/AstrBotDevs/AstrBot
synced 2026-07-16 01:40:15 +08:00
Resolved merge conflicts in: - func_tool_manager.py: kept origin version (full implementation) - astr_main_agent*.py: kept HEAD version (complete refactor) - cron_tools.py: kept HEAD version (with get_all_tools) - config/default.py: kept HEAD version (DEFAULT_WEB_SEARCH_PROVIDER) - dashboard/*.vue: kept HEAD version - web_searcher engines: kept HEAD version - Added new tools: knowledge_base_tools, message_tools, registry, web_search_tools