Merge branch 'AstrBotDevs:master' into Sjshi763/issue4409

Author: Sjshi763

ASYNC_TASK_new.md

@@ -1 +1 @@
-__version__ = "4.14.1"
+__version__ = "4.14.4"

astrbot/cli/__init__.py

@@ -213,6 +213,8 @@ async def step(self):
             if not llm_response.is_chunk and llm_response.usage:
                 # only count the token usage of the final response for computation purpose
                 self.stats.token_usage += llm_response.usage
+                if self.req.conversation:
+                    self.req.conversation.token_usage = llm_response.usage.total
             break  # got final response
 
         if not llm_resp_result:

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -7,6 +7,7 @@
 import json
 import os
 import zoneinfo
+from collections.abc import Coroutine
 from dataclasses import dataclass, field
 
 from astrbot.api import sp
@@ -114,6 +115,7 @@ class MainAgentBuildResult:
     agent_runner: AgentRunner
     provider_request: ProviderRequest
     provider: Provider
+    reset_coro: Coroutine | None = None
 
 
 def _select_provider(
@@ -837,8 +839,12 @@ async def build_main_agent(
     config: MainAgentBuildConfig,
     provider: Provider | None = None,
     req: ProviderRequest | None = None,
+    apply_reset: bool = True,
 ) -> MainAgentBuildResult | None:
-    """构建主对话代理（Main Agent），并且自动 reset。"""
+    """构建主对话代理（Main Agent），并且自动 reset。
+
+    If apply_reset is False, will not call reset on the agent runner.
+    """
     provider = provider or _select_provider(event, plugin_context)
     if provider is None:
         logger.info("未找到任何对话模型（提供商），跳过 LLM 请求处理。")
@@ -955,7 +961,7 @@ async def build_main_agent(
     if action_type == "live":
         req.system_prompt += f"\n{LIVE_MODE_SYSTEM_PROMPT}\n"
 
-    await agent_runner.reset(
+    reset_coro = agent_runner.reset(
         provider=provider,
         request=req,
         run_context=AgentContextWrapper(
@@ -973,8 +979,12 @@ async def build_main_agent(
         tool_schema_mode=config.tool_schema_mode,
     )
 
+    if apply_reset:
+        await reset_coro
+
     return MainAgentBuildResult(
         agent_runner=agent_runner,
         provider_request=req,
         provider=provider,
+        reset_coro=reset_coro if not apply_reset else None,
     )

astrbot/core/astr_main_agent.py

@@ -5,7 +5,7 @@
 
 from astrbot.core.utils.astrbot_path import get_astrbot_data_path
 
-VERSION = "4.14.1"
+VERSION = "4.14.4"
 DB_PATH = os.path.join(get_astrbot_data_path(), "data_v4.db")
 
 WEBHOOK_SUPPORTED_PLATFORMS = [

astrbot/core/config/default.py

@@ -310,6 +310,7 @@ async def _woke_main_agent(
         config = MainAgentBuildConfig(
             tool_call_timeout=3600,
             llm_safety_mode=False,
+            streaming_response=False,
         )
         req = ProviderRequest()
         conv = await _get_session_conv(event=cron_event, plugin_context=self.ctx)

astrbot/core/cron/manager.py

@@ -164,6 +164,7 @@ async def process(
                     event=event,
                     plugin_context=self.ctx.plugin_manager.context,
                     config=build_cfg,
+                    apply_reset=False,
                 )
 
                 if build_result is None:
@@ -172,6 +173,7 @@ async def process(
                 agent_runner = build_result.agent_runner
                 req = build_result.provider_request
                 provider = build_result.provider
+                reset_coro = build_result.reset_coro
 
                 api_base = provider.provider_config.get("api_base", "")
                 for host in decoded_blocked:
@@ -190,6 +192,10 @@ async def process(
                 if await call_event_hook(event, EventType.OnLLMRequestEvent, req):
                     return
 
+                # apply reset
+                if reset_coro:
+                    await reset_coro
+
                 action_type = event.get_extra("action_type")
 
                 event.trace.record(
@@ -357,7 +363,8 @@ async def _save_to_history(
 
         token_usage = None
         if runner_stats:
-            token_usage = runner_stats.token_usage.total
+            # token_usage = runner_stats.token_usage.total
+            token_usage = llm_response.usage.total if llm_response.usage else None
 
         await self.conv_manager.update_conversation(
             event.unified_msg_origin,

astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py

@@ -0,0 +1,23 @@
+## What's Changed
+
+### 新增
+- 控制台页面新增调试提示和本地化文件 ([#4852](https://github.com/AstrBotDevs/AstrBot/pull/4852))
+
+### 修复
+- 修复插件热重载时平台适配器未清理导致注册冲突的问题 ([#4859](https://github.com/AstrBotDevs/AstrBot/pull/4859))
+
+### 其他
+- 更新 ruff 版本至 0.15.0
+- 新增 robots.txt ([#4847](https://github.com/AstrBotDevs/AstrBot/pull/4847))
+
+## What's Changed (EN)
+
+### New Features
+- Add debug hint to console page and localization files ([#4852](https://github.com/AstrBotDevs/AstrBot/pull/4852))
+
+### Bug Fixes
+- Fix platform adapter not being cleaned up during plugin hot reload, causing registration conflicts ([#4859](https://github.com/AstrBotDevs/AstrBot/pull/4859))
+
+### Others
+- Update ruff version to 0.15.0
+- Add robots.txt ([#4847](https://github.com/AstrBotDevs/AstrBot/pull/4847))

changelogs/v4.14.2.md

@@ -0,0 +1,4 @@
+## What's Changed
+
+### 修复
+- 修复 `on_llm_request` 钩子可能无法应用效果的问题

changelogs/v4.14.3.md

@@ -0,0 +1,4 @@
+## What's Changed
+
+### 修复
+- 修复 token 统计错误的问题，修复在多轮 tool call 情况下或者其他极端情况下可能造成 tool 无限调用的问题。