Add run-scoped skill and prompt asset management

backend/agents/analyst.py

@@ -11,9 +11,7 @@ from agentscope.message import Msg
 
 from ..config.constants import ANALYST_TYPES
 from ..utils.progress import progress
-from .prompt_loader import PromptLoader
-
-_prompt_loader = PromptLoader()
+from .prompt_factory import build_agent_system_prompt, clear_prompt_factory_cache
 
 
 class AnalystAgent(ReActAgent):
@@ -55,9 +53,10 @@ class AnalystAgent(ReActAgent):
 
         if agent_id is None:
             agent_id = analyst_type
+        self.agent_id = agent_id
 
         self.config = config or {}
-
+        self.toolkit = toolkit
         sys_prompt = self._load_system_prompt()
 
         kwargs = {
@@ -77,27 +76,11 @@ class AnalystAgent(ReActAgent):
 
     def _load_system_prompt(self) -> str:
         """Load system prompt for analyst"""
-        personas_config = _prompt_loader.load_yaml_config(
-            "analyst",
-            "personas",
-        )
-        persona = personas_config.get(self.analyst_type_key, {})
-
-        # Get focus items and format as bullet points
-        focus_items = persona.get("focus", [])
-        focus_text = "\n".join(f"- {item}" for item in focus_items)
-
-        # Get description
-        description = persona.get("description", "").strip()
-
-        return _prompt_loader.load_prompt(
-            "analyst",
-            "system",
-            variables={
-                "analyst_type": self.analyst_persona,
-                "focus": focus_text,
-                "description": description,
-            },
+        return build_agent_system_prompt(
+            agent_id=self.agent_id,
+            config_name=self.config.get("config_name", "default"),
+            toolkit=self.toolkit,
+            analyst_type=self.analyst_type_key,
         )
 
     async def reply(self, x: Msg = None) -> Msg:
@@ -131,3 +114,15 @@ class AnalystAgent(ReActAgent):
             )
 
         return result
+
+    def reload_runtime_assets(self, active_skill_dirs: Optional[list] = None) -> None:
+        """Reload toolkit and system prompt from current run assets."""
+        from .toolkit_factory import create_agent_toolkit
+
+        clear_prompt_factory_cache()
+        self.toolkit = create_agent_toolkit(
+            self.agent_id,
+            self.config.get("config_name", "default"),
+            active_skill_dirs=active_skill_dirs,
+        )
+        self.sys_prompt = self._load_system_prompt()