共享上下文放到system_reminder防止缓存不命中

Author: elecvoid243

astrbot/core/astr_agent_tool_exec.py

@@ -382,6 +382,11 @@ async def _execute_handoff(
             umo, tool, prov_settings
         )
 
+        # 构建子代理的追加内容
+        extra_content_parts = SubAgentManager.build_subagent_extra_content_parts(
+            umo, agent_name
+        )
+
         # 获取子代理的超时时间
         execution_timeout = cls._get_subagent_execution_timeout()
 
@@ -402,6 +407,7 @@ async def _run_subagent():
                 tool_call_timeout=run_context.tool_call_timeout,
                 stream=stream,
                 runner_messages=runner_messages,
+                extra_user_content_parts=extra_content_parts,
             )
 
         # 添加执行超时控制
@@ -871,14 +877,9 @@ def _build_subagent_system_prompt(
         )
         if agent_name:
             runtime = prov_settings.get("computer_use_runtime", "local")
-            static_subagent_prompt = SubAgentManager.build_static_subagent_prompts(
-                umo, agent_name
-            )
-            dynamic_subagent_prompt = SubAgentManager.build_dynamic_subagent_prompts(
+            subagent_system_prompt += SubAgentManager.build_subagent_system_prompt(
                 umo, agent_name, runtime
             )
-            subagent_system_prompt += static_subagent_prompt
-            subagent_system_prompt += dynamic_subagent_prompt
         return subagent_system_prompt
 
     @staticmethod

astrbot/core/star/context.py

@@ -220,6 +220,7 @@ async def tool_loop_agent(
             func_tool=tools,
             contexts=context_,
             system_prompt=system_prompt or "",
+            extra_user_content_parts=kwargs.get("extra_user_content_parts", []),
         )
         if agent_context is None:
             agent_context = AstrAgentContext(

astrbot/core/subagent_manager.py

@@ -330,34 +330,48 @@ def get_subagent_history(cls, session_id: str, agent_name: str) -> list:
         return session.subagent_histories.get(agent_name, [])
 
     @classmethod
-    def build_static_subagent_prompts(cls, session_id: str, agent_name: str) -> str:
-        """构建不会在会话内变化的subagent提示词"""
+    def build_subagent_system_prompt(
+        cls, session_id: str, agent_name: str, runtime: str
+    ) -> str:
         parts = []
         rule = cls._build_rule_prompt()
         workdir = cls._build_workdir_prompt(session_id, agent_name)
         if rule:
             parts.append(rule)
         if workdir:
             parts.append(workdir)
-        return "\n".join(parts)
-
-    @classmethod
-    def build_dynamic_subagent_prompts(
-        cls, session_id: str, agent_name: str, runtime: str
-    ) -> str:
-        """构建会话内可能变化的提示词（每次调用重建）"""
-        parts = []
         skills = cls._build_subagent_skills_prompt(session_id, agent_name, runtime)
         if skills:
             parts.append(skills)
-        shared = cls._build_shared_context_prompt(session_id, agent_name)
-        if shared:
-            parts.append(shared)
-        time_p = cls._build_time_prompt()
-        if time_p:
-            parts.append(time_p)
         return "\n".join(parts)
 
+    @classmethod
+    def build_subagent_extra_content_parts(
+        cls, session_id: str, agent_name: str
+    ) -> list:
+        """构建子代理的追加内容部分（extra_user_content_parts）。
+
+        将共享上下文和时间信息作为追加内容返回，它们将被注入到用户消息中，
+
+        Returns:
+            list[TextPart]: 追加内容部分列表
+        """
+        from astrbot.core.agent.message import TextPart
+
+        parts = []
+
+        # 1. 共享上下文
+        shared_context = cls._build_shared_context_prompt(session_id, agent_name)
+        if shared_context:
+            parts.append(TextPart(text=shared_context).mark_as_temp())
+
+        # 2. 时间信息
+        time_prompt = cls._build_time_prompt()
+        if time_prompt:
+            parts.append(TextPart(text=time_prompt).mark_as_temp())
+
+        return parts
+
     @classmethod
     def _build_subagent_skills_prompt(
         cls, session_id: str, agent_name: str, runtime: str = "local"