Merge remote-tracking branch 'origin/v3' into v3

# Conflicts:
#	app/api/endpoints/agent.py
#	app/api/endpoints/anthropic.py
#	app/api/endpoints/openai.py
#	app/chain/__init__.py
#	app/chain/message.py
#	app/chain/site.py
#	app/chain/subscribe.py
#	app/chain/transfer.py
#	app/modules/discord/__init__.py
#	app/modules/qqbot/__init__.py
#	app/modules/slack/__init__.py
#	app/modules/telegram/__init__.py
#	app/modules/wechat/__init__.py
#	app/runtime/extensions/module_manager.py
#	app/runtime/extensions/service_registry.py
#	tests/test_agent_interaction.py
#	tests/test_slash_command_interactions.py
#	tests/test_web_agent_stream.py

app/agent/tools/impl/_filter_rule_utils.py

@@ -7,9 +7,9 @@ from typing import Any, Dict, Iterable, Optional
 from app.runtime.events import eventmanager
 from app.db.oper.subscribe import SubscribeOper
 from app.db.oper.systemconfig import SystemConfigOper
-from app.application.filter import RuleHelper
-from app.application.filter_rules import RuleParser
-from app.application.filter_rules import BUILTIN_RULE_SET
+from app.application.rules import RuleHelper
+from app.application.rules import RuleParser
+from app.application.rules import BUILTIN_RULE_SET
 from app.schemas import CustomRule, FilterRuleGroup
 from app.schemas.event import ConfigChangeEventData
 from app.schemas.types import EventType, SystemConfigKey

app/agent/tools/impl/_plugin_tool_utils.py

@@ -70,14 +70,14 @@ def reload_plugin_runtime(plugin_id: str) -> None:
     重载插件并重新注册其命令、定时任务和 API。
     """
     # 这些依赖只在真正执行重载时才导入，避免普通查询工具引入不必要的初始化开销。
-    from app.api.endpoints.plugin import register_plugin_api
-    from app.command import Command
-    from app.scheduler import Scheduler
+    from app.application.plugins import register_plugin_api
+    from app.application.commands import init_commands
+    from app.application.scheduling import update_plugin_job
 
     plugin_manager = PluginManager()
     plugin_manager.reload_plugin(plugin_id)
-    Scheduler().update_plugin_job(plugin_id)
-    Command().init_commands(plugin_id)
+    update_plugin_job(plugin_id)
+    init_commands(plugin_id)
     register_plugin_api(plugin_id)
 
 
@@ -333,8 +333,11 @@ async def uninstall_plugin_runtime(plugin_id: str) -> dict[str, Any]:
     """
     按现有卸载逻辑移除插件，并清理运行态注册与分组信息。
     """
-    from app.api.endpoints.plugin import _remove_plugin_from_folders, remove_plugin_api
-    from app.scheduler import Scheduler
+    from app.application.plugins import (
+        remove_plugin_api,
+        remove_plugin_from_folders,
+    )
+    from app.application.scheduling import remove_plugin_job
 
     config_oper = SystemConfigOper()
     install_plugins = config_oper.get(SystemConfigKey.UserInstalledPlugins) or []
@@ -343,7 +346,7 @@ async def uninstall_plugin_runtime(plugin_id: str) -> dict[str, Any]:
         await config_oper.async_set(SystemConfigKey.UserInstalledPlugins, install_plugins)
 
     remove_plugin_api(plugin_id)
-    Scheduler().remove_plugin_job(plugin_id)
+    remove_plugin_job(plugin_id)
 
     plugin_manager = PluginManager()
     plugin_class = plugin_manager.plugins.get(plugin_id)
@@ -362,7 +365,7 @@ async def uninstall_plugin_runtime(plugin_id: str) -> dict[str, Any]:
             except Exception:
                 clone_files_removed = False
 
-    _remove_plugin_from_folders(plugin_id)
+    remove_plugin_from_folders(plugin_id)
     plugin_manager.remove_plugin(plugin_id)
 
     return {

app/agent/tools/impl/_torrent_search_utils.py

@@ -133,6 +133,7 @@ def simplify_search_result(
     context: Context,
     index: int,
     include_description: bool = False,
+    include_labels: bool = False,
 ) -> dict:
     """
     精简单条搜索结果
@@ -140,6 +141,7 @@ def simplify_search_result(
     :param context: 搜索结果上下文
     :param index: 搜索结果在原始缓存中的序号
     :param include_description: 是否返回种子简介
+    :param include_labels: 是否返回种子标签
     :return: 精简后的搜索结果
     """
     simplified = {}
@@ -162,6 +164,8 @@ def simplify_search_result(
         }
         if include_description:
             simplified["torrent_info"]["description"] = torrent_info.description
+        if include_labels:
+            simplified["torrent_info"]["labels"] = torrent_info.labels or []
 
     if media_info:
         if getattr(media_info, "type", None) == MediaType.MUSIC:

app/agent/tools/impl/create_agent_task.py

@@ -99,7 +99,7 @@ class CreateAgentTaskTool(MoviePilotTool):
 
     def _create_task(self, payload: CreateAgentTaskInput) -> dict:
         """持久化任务并立即注册到运行时调度器。"""
-        from app.scheduler import Scheduler
+        from app.application.scheduling import update_agent_task_job
 
         trigger_value = payload.trigger
         if payload.trigger_type == "date" and payload.delay_minutes is not None:
@@ -130,8 +130,7 @@ class CreateAgentTaskTool(MoviePilotTool):
             source=self._source or (chat.source if chat else None),
             original_chat_id=chat.original_chat_id if chat else None,
         )
-        scheduler = Scheduler()
-        next_run_at = scheduler.update_agent_task_job(task.id)
+        next_run_at = update_agent_task_job(task.id)
         return AgentTaskOper.to_dict(
             task,
             next_run_at=next_run_at,

app/agent/tools/impl/delete_agent_task.py

@@ -31,14 +31,14 @@ class DeleteAgentTaskTool(MoviePilotTool):
 
     def _delete_task(self, task_id: int) -> bool:
         """删除当前用户的任务并移除运行时调度。"""
-        from app.scheduler import Scheduler
+        from app.application.scheduling import remove_agent_task_job
 
         deleted = AgentTaskOper().delete(
             task_id=task_id,
             user_id=str(self._user_id),
         )
         if deleted:
-            Scheduler().remove_agent_task_job(task_id)
+            remove_agent_task_job(task_id)
         return deleted
 
     async def run(self, task_id: int, **kwargs: object) -> str:

app/agent/tools/impl/get_search_results.py

@@ -42,6 +42,10 @@ class GetSearchResultsInput(BaseModel):
         False,
         description="Whether to include torrent descriptions in returned results",
     )
+    include_labels: Optional[bool] = Field(
+        False,
+        description="Whether to include torrent labels in returned results",
+    )
     show_filter_options: Optional[bool] = Field(
         False,
         description="Whether to return only optional filter options for re-checking available conditions",
@@ -79,6 +83,7 @@ class GetSearchResultsTool(MoviePilotTool):
         title_pattern: Optional[str] = None,
         content_pattern: Optional[str] = None,
         include_description: bool = False,
+        include_labels: bool = False,
         show_filter_options: bool = False,
         page: Optional[int] = 1,
         **kwargs,
@@ -96,6 +101,7 @@ class GetSearchResultsTool(MoviePilotTool):
         :param title_pattern: 仅匹配种子标题的正则表达式
         :param content_pattern: 匹配种子标题、简介和标签的正则表达式
         :param include_description: 是否在结果中返回种子简介
+        :param include_labels: 是否在结果中返回种子标签
         :param show_filter_options: 是否只返回可用筛选项
         :param page: 分页页码
         :param kwargs: 工具框架附加参数
@@ -103,7 +109,7 @@ class GetSearchResultsTool(MoviePilotTool):
         """
         page = max(1, page or 1)
         logger.info(
-            f"执行工具: {self.name}, 参数: site={site}, season={season}, free_state={free_state}, video_code={video_code}, edition={edition}, resolution={resolution}, release_group={release_group}, title_pattern={title_pattern}, content_pattern={content_pattern}, include_description={include_description}, show_filter_options={show_filter_options}, page={page}"
+            f"执行工具: {self.name}, 参数: site={site}, season={season}, free_state={free_state}, video_code={video_code}, edition={edition}, resolution={resolution}, release_group={release_group}, title_pattern={title_pattern}, content_pattern={content_pattern}, include_description={include_description}, include_labels={include_labels}, show_filter_options={show_filter_options}, page={page}"
         )
 
         try:
@@ -193,6 +199,7 @@ class GetSearchResultsTool(MoviePilotTool):
                     item,
                     index,
                     include_description=include_description,
+                    include_labels=include_labels,
                 )
                 for item, index in zip(page_items, page_indices)
             ]

app/agent/tools/impl/list_slash_commands.py

@@ -14,7 +14,6 @@ class ListSlashCommandsInput(BaseModel):
     """查询所有可用斜杠命令工具的输入参数模型"""
 
 
-
 class ListSlashCommandsTool(MoviePilotTool):
     name: str = "list_slash_commands"
     tags: list[str] = [
@@ -41,10 +40,9 @@ class ListSlashCommandsTool(MoviePilotTool):
         logger.info(f"执行工具: {self.name}")
 
         try:
-            from app.command import Command
+            from app.application.commands import get_commands
 
-            command_obj = Command()
-            all_commands = command_obj.get_commands()
+            all_commands = get_commands()
 
             if not all_commands:
                 return "当前没有可用的命令"

app/agent/tools/impl/query_agent_tasks.py

@@ -48,7 +48,7 @@ class QueryAgentTasksTool(MoviePilotTool):
             enabled: Optional[bool],
     ) -> list[dict]:
         """读取当前用户的任务及运行时下一次触发时间。"""
-        from app.scheduler import Scheduler
+        from app.application.scheduling import get_agent_task_next_run
 
         oper = AgentTaskOper()
         if task_id:
@@ -56,12 +56,11 @@ class QueryAgentTasksTool(MoviePilotTool):
             tasks = [task] if task else []
         else:
             tasks = oper.list(user_id=str(self._user_id), enabled=enabled)
-        scheduler = Scheduler()
         result = []
         for task in tasks:
             data = oper.to_dict(
                 task,
-                next_run_at=scheduler.get_agent_task_next_run(task.id),
+                next_run_at=get_agent_task_next_run(task.id),
                 timezone=settings.TZ,
             )
             if task_id:

app/agent/tools/impl/query_schedulers.py

@@ -39,13 +39,15 @@ class QuerySchedulersTool(MoviePilotTool):
         """查询非 Agent 自主任务的运行时定时服务。"""
         logger.info(f"执行工具: {self.name}")
         try:
-            from app.scheduler import AGENT_TASK_JOB_PREFIX, Scheduler
+            from app.application.scheduling import (
+                AGENT_TASK_JOB_PREFIX,
+                list_scheduler_jobs,
+            )
 
-            scheduler = Scheduler()
             agent_task_prefix = f"{AGENT_TASK_JOB_PREFIX}-"
             schedulers = [
                 scheduler_item
-                for scheduler_item in scheduler.list()
+                for scheduler_item in list_scheduler_jobs()
                 if not str(scheduler_item.id or "").startswith(agent_task_prefix)
             ]
             if schedulers:

app/agent/tools/impl/run_agent_task.py

@@ -56,7 +56,7 @@ class RunAgentTaskTool(MoviePilotTool):
 
     async def run(self, task_id: int, **kwargs: object) -> str:
         """立即执行当前用户拥有且已启用的 Agent 自主定时任务。"""
-        from app.scheduler import Scheduler
+        from app.application.scheduling import start_agent_task
 
         payload = RunAgentTaskInput(task_id=task_id)
         status, task_name = await self.run_blocking(
@@ -70,7 +70,7 @@ class RunAgentTaskTool(MoviePilotTool):
             return f"Agent 定时任务 {task_id} 已暂停，请先恢复后再执行"
         if status == "running":
             return f"Agent 定时任务 {task_id} 正在执行，请勿重复触发"
-        if not Scheduler().start_agent_task(payload.task_id):
+        if not start_agent_task(payload.task_id):
             return f"Agent 定时任务 {task_id} 尚未注册到运行时调度器，无法立即执行"
         return (
             f"Agent 定时任务 {task_id} 已提交立即执行：{task_name}。"

app/agent/tools/impl/run_scheduler.py

@@ -46,12 +46,14 @@ class RunSchedulerTool(MoviePilotTool):
     @staticmethod
     def _run_scheduler_sync(job_id: str) -> tuple[bool, str]:
         """同步触发定时服务，避免调度器扫描阻塞事件循环。"""
-        from app.scheduler import Scheduler
+        from app.application.scheduling import (
+            list_scheduler_jobs,
+            start_scheduler_job,
+        )
 
-        scheduler = Scheduler()
-        for scheduler_item in scheduler.list():
+        for scheduler_item in list_scheduler_jobs():
             if scheduler_item.id == job_id:
-                scheduler.start(job_id)
+                start_scheduler_job(job_id)
                 return True, scheduler_item.name
         return False, ""
 
@@ -60,7 +62,7 @@ class RunSchedulerTool(MoviePilotTool):
         logger.info(f"执行工具: {self.name}, 参数: job_id={job_id}")
 
         try:
-            from app.scheduler import AGENT_TASK_JOB_PREFIX
+            from app.application.scheduling import AGENT_TASK_JOB_PREFIX
 
             if job_id.startswith(f"{AGENT_TASK_JOB_PREFIX}-"):
                 return (

app/agent/tools/impl/run_slash_command.py

@@ -57,16 +57,15 @@ class RunSlashCommandTool(MoviePilotTool):
             if not command.startswith("/"):
                 command = f"/{command}"
 
-            # 从全局 Command 单例中验证命令是否存在（包含系统预设命令 + 插件命令 + 其他命令）
-            from app.command import Command
+            # 从命令注册表中验证命令是否存在（包含系统预设命令 + 插件命令 + 其他命令）
+            from app.application.commands import get_command, get_commands
 
             cmd_name = command.split()[0]
-            command_obj = Command()
-            matched_command = command_obj.get(cmd_name)
+            matched_command = get_command(cmd_name)
 
             if not matched_command:
                 # 列出所有可用命令帮助用户
-                all_commands = command_obj.get_commands()
+                all_commands = get_commands()
                 available_cmds = [
                     f"{cmd} - {info.get('description', '无描述')}"
                     for cmd, info in all_commands.items()

app/agent/tools/impl/update_agent_task.py

@@ -100,7 +100,7 @@ class UpdateAgentTaskTool(MoviePilotTool):
 
     def _update_task(self, payload: UpdateAgentTaskInput) -> Optional[dict]:
         """更新当前用户的任务并刷新运行时调度。"""
-        from app.scheduler import Scheduler
+        from app.application.scheduling import update_agent_task_job
 
         oper = AgentTaskOper()
         task = oper.get(task_id=payload.task_id, user_id=str(self._user_id))
@@ -174,8 +174,7 @@ class UpdateAgentTaskTool(MoviePilotTool):
             if current and current.last_status == "running":
                 return {"error": f"Agent 定时任务 {payload.task_id} 正在执行，请稍后再修改"}
             return None
-        scheduler = Scheduler()
-        next_run_at = scheduler.update_agent_task_job(payload.task_id)
+        next_run_at = update_agent_task_job(payload.task_id)
         updated_task = oper.get(task_id=payload.task_id, user_id=str(self._user_id))
         return oper.to_dict(
             updated_task,