AstrBot 4.13.2__py3-none-any.whl → 4.14.1__py3-none-any.whl

astrbot/core/config/default.py

@@ -5,7 +5,7 @@ from typing import Any, TypedDict
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.13.2"
+VERSION = "4.14.1"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [
@@ -91,7 +91,7 @@ DEFAULT_CONFIG = {
             "3. If there was an initial user goal, state it first and describe the current progress/status.\n"
             "4. Write the summary in the user's language.\n"
         ),
-        "llm_compress_keep_recent": 4,
+        "llm_compress_keep_recent": 6,
         "llm_compress_provider_id": "",
         "max_context_length": -1,
         "dequeue_context_length": 1,
@@ -114,15 +114,31 @@ DEFAULT_CONFIG = {
             "provider": "moonshotai",
             "moonshotai_api_key": "",
         },
+        "proactive_capability": {
+            "add_cron_tools": True,
+        },
+        "computer_use_runtime": "local",
         "sandbox": {
-            "enable": False,
             "booter": "shipyard",
             "shipyard_endpoint": "",
             "shipyard_access_token": "",
             "shipyard_ttl": 3600,
             "shipyard_max_sessions": 10,
         },
-        "skills": {"runtime": "sandbox"},
+    },
+    # SubAgent orchestrator mode:
+    # - main_enable = False: disabled; main LLM mounts tools normally (persona selection).
+    # - main_enable = True: enabled; main LLM will include handoff tools and can optionally
+    #   remove tools that are duplicated on subagents via remove_main_duplicate_tools.
+    "subagent_orchestrator": {
+        "main_enable": False,
+        "remove_main_duplicate_tools": False,
+        "router_system_prompt": (
+            "You are a task router. Your job is to chat naturally, recognize user intent, "
+            "and delegate work to the most suitable subagent using transfer_to_* tools. "
+            "Do not try to use domain tools yourself. If no subagent fits, respond directly."
+        ),
+        "agents": [],
     },
     "provider_stt_settings": {
         "enable": False,
@@ -185,6 +201,7 @@ DEFAULT_CONFIG = {
     "log_file_enable": False,
     "log_file_path": "logs/astrbot.log",
     "log_file_max_mb": 20,
+    "trace_enable": False,
     "trace_log_enable": False,
     "trace_log_path": "logs/astrbot.trace.log",
     "trace_log_max_mb": 20,
@@ -2207,15 +2224,12 @@ CONFIG_METADATA_2 = {
                             },
                         },
                     },
-                    "skills": {
+                    "proactive_capability": {
                         "type": "object",
                         "items": {
-                            "enable": {
+                            "add_cron_tools": {
                                 "type": "bool",
                             },
-                            "runtime": {
-                                "type": "string",
-                            },
                         },
                     },
                 },
@@ -2490,6 +2504,7 @@ CONFIG_METADATA_3 = {
             },
             "persona": {
                 "description": "人格",
+                "hint": "",
                 "type": "object",
                 "items": {
                     "provider_settings.default_personality": {
@@ -2505,6 +2520,7 @@ CONFIG_METADATA_3 = {
             },
             "knowledgebase": {
                 "description": "知识库",
+                "hint": "",
                 "type": "object",
                 "items": {
                     "kb_names": {
@@ -2537,6 +2553,7 @@ CONFIG_METADATA_3 = {
             },
             "websearch": {
                 "description": "网页搜索",
+                "hint": "",
                 "type": "object",
                 "items": {
                     "provider_settings.web_search": {
@@ -2547,6 +2564,9 @@ CONFIG_METADATA_3 = {
                         "description": "网页搜索提供商",
                         "type": "string",
                         "options": ["default", "tavily", "baidu_ai_search"],
+                        "condition": {
+                            "provider_settings.web_search": True,
+                        },
                     },
                     "provider_settings.websearch_tavily_key": {
                         "description": "Tavily API Key",
@@ -2555,6 +2575,7 @@ CONFIG_METADATA_3 = {
                         "hint": "可添加多个 Key 进行轮询。",
                         "condition": {
                             "provider_settings.websearch_provider": "tavily",
+                            "provider_settings.web_search": True,
                         },
                     },
                     "provider_settings.websearch_baidu_app_builder_key": {
@@ -2568,6 +2589,9 @@ CONFIG_METADATA_3 = {
                     "provider_settings.web_search_link": {
                         "description": "显示来源引用",
                         "type": "bool",
+                        "condition": {
+                            "provider_settings.web_search": True,
+                        },
                     },
                 },
                 "condition": {
@@ -2575,45 +2599,17 @@ CONFIG_METADATA_3 = {
                     "provider_settings.enable": True,
                 },
             },
-            # "file_extract": {
-            #     "description": "文档解析能力 [beta]",
-            #     "type": "object",
-            #     "items": {
-            #         "provider_settings.file_extract.enable": {
-            #             "description": "启用文档解析能力",
-            #             "type": "bool",
-            #         },
-            #         "provider_settings.file_extract.provider": {
-            #             "description": "文档解析提供商",
-            #             "type": "string",
-            #             "options": ["moonshotai"],
-            #             "condition": {
-            #                 "provider_settings.file_extract.enable": True,
-            #             },
-            #         },
-            #         "provider_settings.file_extract.moonshotai_api_key": {
-            #             "description": "Moonshot AI API Key",
-            #             "type": "string",
-            #             "condition": {
-            #                 "provider_settings.file_extract.provider": "moonshotai",
-            #                 "provider_settings.file_extract.enable": True,
-            #             },
-            #         },
-            #     },
-            #     "condition": {
-            #         "provider_settings.agent_runner_type": "local",
-            #         "provider_settings.enable": True,
-            #     },
-            # },
-            "sandbox": {
-                "description": "Agent 沙箱环境",
+            "agent_computer_use": {
+                "description": "Agent Computer Use",
                 "hint": "",
                 "type": "object",
                 "items": {
-                    "provider_settings.sandbox.enable": {
-                        "description": "启用沙箱环境",
-                        "type": "bool",
-                        "hint": "启用后，Agent 可以使用沙箱环境中的工具和资源，如 Python 代码执行、Shell 等。",
+                    "provider_settings.computer_use_runtime": {
+                        "description": "Computer Use Runtime",
+                        "type": "string",
+                        "options": ["none", "local", "sandbox"],
+                        "labels": ["无", "本地", "沙箱"],
+                        "hint": "选择 Computer Use 运行环境。",
                     },
                     "provider_settings.sandbox.booter": {
                         "description": "沙箱环境驱动器",
@@ -2621,7 +2617,7 @@ CONFIG_METADATA_3 = {
                         "options": ["shipyard"],
                         "labels": ["Shipyard"],
                         "condition": {
-                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.computer_use_runtime": "sandbox",
                         },
                     },
                     "provider_settings.sandbox.shipyard_endpoint": {
@@ -2629,7 +2625,7 @@ CONFIG_METADATA_3 = {
                         "type": "string",
                         "hint": "Shipyard 服务的 API 访问地址。",
                         "condition": {
-                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.computer_use_runtime": "sandbox",
                             "provider_settings.sandbox.booter": "shipyard",
                         },
                         "_special": "check_shipyard_connection",
@@ -2639,7 +2635,7 @@ CONFIG_METADATA_3 = {
                         "type": "string",
                         "hint": "用于访问 Shipyard 服务的访问令牌。",
                         "condition": {
-                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.computer_use_runtime": "sandbox",
                             "provider_settings.sandbox.booter": "shipyard",
                         },
                     },
@@ -2648,7 +2644,7 @@ CONFIG_METADATA_3 = {
                         "type": "int",
                         "hint": "Shipyard 会话的生存时间（秒）。",
                         "condition": {
-                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.computer_use_runtime": "sandbox",
                             "provider_settings.sandbox.booter": "shipyard",
                         },
                     },
@@ -2657,7 +2653,7 @@ CONFIG_METADATA_3 = {
                         "type": "int",
                         "hint": "Shipyard 最大会话数量。",
                         "condition": {
-                            "provider_settings.sandbox.enable": True,
+                            "provider_settings.computer_use_runtime": "sandbox",
                             "provider_settings.sandbox.booter": "shipyard",
                         },
                     },
@@ -2667,16 +2663,45 @@ CONFIG_METADATA_3 = {
                     "provider_settings.enable": True,
                 },
             },
-            "skills": {
-                "description": "Skills",
+            # "file_extract": {
+            #     "description": "文档解析能力 [beta]",
+            #     "type": "object",
+            #     "items": {
+            #         "provider_settings.file_extract.enable": {
+            #             "description": "启用文档解析能力",
+            #             "type": "bool",
+            #         },
+            #         "provider_settings.file_extract.provider": {
+            #             "description": "文档解析提供商",
+            #             "type": "string",
+            #             "options": ["moonshotai"],
+            #             "condition": {
+            #                 "provider_settings.file_extract.enable": True,
+            #             },
+            #         },
+            #         "provider_settings.file_extract.moonshotai_api_key": {
+            #             "description": "Moonshot AI API Key",
+            #             "type": "string",
+            #             "condition": {
+            #                 "provider_settings.file_extract.provider": "moonshotai",
+            #                 "provider_settings.file_extract.enable": True,
+            #             },
+            #         },
+            #     },
+            #     "condition": {
+            #         "provider_settings.agent_runner_type": "local",
+            #         "provider_settings.enable": True,
+            #     },
+            # },
+            "proactive_capability": {
+                "description": "主动型 Agent",
+                "hint": "https://docs.astrbot.app/use/proactive-agent.html",
                 "type": "object",
                 "items": {
-                    "provider_settings.skills.runtime": {
-                        "description": "Skill Runtime",
-                        "type": "string",
-                        "options": ["local", "sandbox"],
-                        "labels": ["本地", "沙箱"],
-                        "hint": "选择 Skills 运行环境。使用沙箱时需先启用沙箱环境。",
+                    "provider_settings.proactive_capability.add_cron_tools": {
+                        "description": "启用",
+                        "type": "bool",
+                        "hint": "启用后，将会传递给 Agent 相关工具来实现主动型 Agent。你可以告诉 AstrBot 未来某个时间要做的事情，它将被定时触发然后执行任务。",
                     },
                 },
                 "condition": {
@@ -2685,6 +2710,7 @@ CONFIG_METADATA_3 = {
                 },
             },
             "truncate_and_compress": {
+                "hint": "",
                 "description": "上下文管理策略",
                 "type": "object",
                 "items": {

astrbot/core/core_lifecycle.py

@@ -21,6 +21,7 @@ from astrbot.core import LogBroker, LogManager
 from astrbot.core.astrbot_config_mgr import AstrBotConfigManager
 from astrbot.core.config.default import VERSION
 from astrbot.core.conversation_mgr import ConversationManager
+from astrbot.core.cron import CronJobManager
 from astrbot.core.db import BaseDatabase
 from astrbot.core.knowledge_base.kb_mgr import KnowledgeBaseManager
 from astrbot.core.persona_mgr import PersonaManager
@@ -31,6 +32,7 @@ from astrbot.core.provider.manager import ProviderManager
 from astrbot.core.star import PluginManager
 from astrbot.core.star.context import Context
 from astrbot.core.star.star_handler import EventType, star_handlers_registry, star_map
+from astrbot.core.subagent_orchestrator import SubAgentOrchestrator
 from astrbot.core.umop_config_router import UmopConfigRouter
 from astrbot.core.updator import AstrBotUpdator
 from astrbot.core.utils.llm_metadata import update_llm_metadata
@@ -53,6 +55,9 @@ class AstrBotCoreLifecycle:
         self.astrbot_config = astrbot_config  # 初始化配置
         self.db = db  # 初始化数据库
 
+        self.subagent_orchestrator: SubAgentOrchestrator | None = None
+        self.cron_manager: CronJobManager | None = None
+
         # 设置代理
         proxy_config = self.astrbot_config.get("http_proxy", "")
         if proxy_config != "":
@@ -72,6 +77,24 @@ class AstrBotCoreLifecycle:
                 del os.environ["no_proxy"]
             logger.debug("HTTP proxy cleared")
 
+    async def _init_or_reload_subagent_orchestrator(self) -> None:
+        """Create (if needed) and reload the subagent orchestrator from config.
+
+        This keeps lifecycle wiring in one place while allowing the orchestrator
+        to manage enable/disable and tool registration details.
+        """
+        try:
+            if self.subagent_orchestrator is None:
+                self.subagent_orchestrator = SubAgentOrchestrator(
+                    self.provider_manager.llm_tools,
+                    self.persona_mgr,
+                )
+            await self.subagent_orchestrator.reload_from_config(
+                self.astrbot_config.get("subagent_orchestrator", {}),
+            )
+        except Exception as e:
+            logger.error(f"Subagent orchestrator init failed: {e}", exc_info=True)
+
     async def initialize(self) -> None:
         """初始化 AstrBot 核心生命周期管理类.
 
@@ -141,6 +164,12 @@ class AstrBotCoreLifecycle:
         # 初始化知识库管理器
         self.kb_manager = KnowledgeBaseManager(self.provider_manager)
 
+        # 初始化 CronJob 管理器
+        self.cron_manager = CronJobManager(self.db)
+
+        # Dynamic subagents (handoff tools) from config.
+        await self._init_or_reload_subagent_orchestrator()
+
         # 初始化提供给插件的上下文
         self.star_context = Context(
             self.event_queue,
@@ -153,6 +182,8 @@ class AstrBotCoreLifecycle:
             self.persona_mgr,
             self.astrbot_config_mgr,
             self.kb_manager,
+            self.cron_manager,
+            self.subagent_orchestrator,
         )
 
         # 初始化插件管理器
@@ -201,13 +232,21 @@ class AstrBotCoreLifecycle:
             self.event_bus.dispatch(),
             name="event_bus",
         )
+        cron_task = None
+        if self.cron_manager:
+            cron_task = asyncio.create_task(
+                self.cron_manager.start(self.star_context),
+                name="cron_manager",
+            )
 
         # 把插件中注册的所有协程函数注册到事件总线中并执行
         extra_tasks = []
         for task in self.star_context._register_tasks:
             extra_tasks.append(asyncio.create_task(task, name=task.__name__))  # type: ignore
 
-        tasks_ = [event_bus_task, *extra_tasks]
+        tasks_ = [event_bus_task, *(extra_tasks if extra_tasks else [])]
+        if cron_task:
+            tasks_.append(cron_task)
         for task in tasks_:
             self.curr_tasks.append(
                 asyncio.create_task(self._task_wrapper(task), name=task.get_name()),
@@ -263,6 +302,9 @@ class AstrBotCoreLifecycle:
         for task in self.curr_tasks:
             task.cancel()
 
+        if self.cron_manager:
+            await self.cron_manager.shutdown()
+
         for plugin in self.plugin_manager.context.get_all_stars():
             try:
                 await self.plugin_manager._terminate_plugin(plugin)

astrbot/core/cron/__init__.py

@@ -0,0 +1,3 @@
+from .manager import CronJobManager
+
+__all__ = ["CronJobManager"]

astrbot/core/cron/events.py

@@ -0,0 +1,67 @@
+import time
+import uuid
+from typing import Any
+
+from astrbot.core.message.components import Plain
+from astrbot.core.message.message_event_result import MessageChain
+from astrbot.core.platform.astr_message_event import AstrMessageEvent
+from astrbot.core.platform.astrbot_message import AstrBotMessage, MessageMember
+from astrbot.core.platform.message_session import MessageSession
+from astrbot.core.platform.message_type import MessageType
+from astrbot.core.platform.platform_metadata import PlatformMetadata
+
+
+class CronMessageEvent(AstrMessageEvent):
+    """Synthetic event used when a cron job triggers the main agent loop."""
+
+    def __init__(
+        self,
+        *,
+        context,
+        session: MessageSession,
+        message: str,
+        sender_id: str = "astrbot",
+        sender_name: str = "Scheduler",
+        extras: dict[str, Any] | None = None,
+        message_type: MessageType = MessageType.FRIEND_MESSAGE,
+    ):
+        platform_meta = PlatformMetadata(
+            name="cron",
+            description="CronJob",
+            id=session.platform_id,
+        )
+
+        msg_obj = AstrBotMessage()
+        msg_obj.type = message_type
+        msg_obj.self_id = sender_id
+        msg_obj.session_id = session.session_id
+        msg_obj.message_id = uuid.uuid4().hex
+        msg_obj.sender = MessageMember(user_id=session.session_id, nickname=sender_name)
+        msg_obj.message = [Plain(message)]
+        msg_obj.message_str = message
+        msg_obj.raw_message = message
+        msg_obj.timestamp = int(time.time())
+
+        super().__init__(message, msg_obj, platform_meta, session.session_id)
+
+        # Ensure we use the original session for sending messages
+        self.session = session
+        self.context_obj = context
+        self.is_at_or_wake_command = True
+        self.is_wake = True
+
+        if extras:
+            self._extras.update(extras)
+
+    async def send(self, message: MessageChain):
+        if message is None:
+            return
+        await self.context_obj.send_message(self.session, message)
+        await super().send(message)
+
+    async def send_streaming(self, generator, use_fallback: bool = False):
+        async for chain in generator:
+            await self.send(chain)
+
+
+__all__ = ["CronMessageEvent"]