Agent Zero AI framework
store skill path, simplify metadata logic
3clyp50ee6707df59ea
diff --git a/prompts/agent.system.skill.loaded.md b/prompts/agent.system.skill.loaded.mdnew file mode 100644index 000000000..b36a45249--- /dev/null+++ b/prompts/agent.system.skill.loaded.md@@ -0,0 +1,4 @@+# Loaded skill+- Explicitly loaded via skills_tool, persists each turn++{{skill}}diff --git a/python/extensions/message_loop_prompts_after/_65_include_loaded_skill.py b/python/extensions/message_loop_prompts_after/_65_include_loaded_skill.pynew file mode 100644index 000000000..eb36b281d--- /dev/null+++ b/python/extensions/message_loop_prompts_after/_65_include_loaded_skill.py@@ -0,0 +1,91 @@+from pathlib import Path+from python.helpers.extension import Extension+from python.helpers import skills, files, file_tree, runtime+from agent import LoopData+++DATA_NAME_LOADED_SKILL = "loaded_skill"+++class IncludeLoadedSkill(Extension):+ async def execute(self, loop_data: LoopData = LoopData(), **kwargs):+ skill_name = self.agent.data.get(DATA_NAME_LOADED_SKILL)+ if not skill_name:+ return++ # Load skill fresh each turn+ skill = skills.find_skill(skill_name, include_content=True, agent=self.agent)+ if not skill:+ return++ # Build skill block+ skill_block = self._build_skill_block(skill)++ # Add to persistent extras+ loop_data.extras_persistent["loaded_skill"] = self.agent.read_prompt(+ "agent.system.skill.loaded.md",+ skill=skill_block,+ )++ def _build_skill_block(self, skill: skills.Skill) -> str:+ """Build complete skill content with metadata, description, body, and files."""+ runtime_path = (+ files.normalize_a0_path(str(skill.path))+ if self.agent.config.code_exec_ssh_enabled+ else str(skill.path)+ )++ lines = [f"Skill: {skill.name}", f"Path: {runtime_path}"]++ # Metadata+ metadata = [+ ("Version", skill.version),+ ("Author", skill.author),+ ("License", skill.license),+ ("Compatibility", skill.compatibility),+ ("Tags", ", ".join(skill.tags) if skill.tags else None),+ ("Allowed tools", ", ".join(skill.allowed_tools) if skill.allowed_tools else None),+ ("Triggers", ", ".join(skill.triggers) if skill.triggers else None),+ ]+ lines.extend(f"{label}: {value}" for label, value in metadata if value)++ # Description and content+ if skill.description:+ lines.extend(["", "Description:", skill.description.strip()])++ lines.extend(["", "Content (SKILL.md body):", skill.content.strip() or "(empty)"])++ # File tree+ files_tree = self._get_skill_files(skill.path)+ lines.append("")+ if files_tree:+ lines.append("Files (use skills_tool method=read_file to open):")+ lines.append(files_tree)+ else:+ lines.append("No additional files found.")++ return "\n".join(lines)++ def _get_skill_files(self, skill_dir: Path) -> str:+ """Get file tree for skill directory."""+ if not skill_dir.exists():+ return ""++ tree = str(+ file_tree.file_tree(+ str(skill_dir),+ max_depth=10,+ folders_first=True,+ max_files=100,+ max_folders=100,+ output_mode="string",+ max_lines=300,+ ignore=files.read_file("conf/skill.default.gitignore"),+ )+ )++ if tree and runtime.is_development():+ runtime_path = files.normalize_a0_path(str(skill_dir))+ tree = tree.replace(str(skill_dir), runtime_path)++ return str(tree)diff --git a/python/tools/skills_tool.py b/python/tools/skills_tool.pyindex d059e8af9..97d7f4f26 100644--- a/python/tools/skills_tool.py+++ b/python/tools/skills_tool.py@@ -8,6 +8,9 @@ from python.helpers import projects, files, file_treefrom python.helpers import skills as skills_helper, runtime+DATA_NAME_LOADED_SKILL = "loaded_skill"++class SkillsTool(Tool):"""Manage and use SKILL.md-based Skills (Anthropic open standard).@@ -106,70 +109,25 @@ class SkillsTool(Tool):return "\n".join(lines)def _load(self, skill_name: str) -> str:-skill_name = skill_name.strip()if skill_name.startswith("**") and skill_name.endswith("**"):- skill_name = skill_name[- 2:-2- ] # remove markdown bold markers if used by agent+ skill_name = skill_name[2:-2]if not skill_name:return "Error: 'skill_name' is required for method=load."skill = skills_helper.find_skill(skill_name,- include_content=True,+ include_content=False,agent=self.agent,)if not skill:return f"Error: skill not found: {skill_name!r}. Try skills_tool method=list or method=search."- # Enumerate files under the skill directory for progressive disclosure- referenced_files = self._list_skill_files(skill.path, max_files=80)- rel_skill_dir = Path(files.deabsolute_path(str(skill.path)))- if self.agent.config.code_exec_ssh_enabled:- runtime_path = files.normalize_a0_path(str(skill.path))- else:- runtime_path = str(skill.path)+ # Store skill name for fresh loading each turn+ self.agent.data[DATA_NAME_LOADED_SKILL] = skill.name- lines: List[str] = []- lines.append(f"Skill: {skill.name}")- # lines.append(f"Path: {rel_skill_dir}")- lines.append(f"Path: {runtime_path}")- if skill.version:- lines.append(f"Version: {skill.version}")- if skill.author:- lines.append(f"Author: {skill.author}")- if skill.license:- lines.append(f"License: {skill.license}")- if skill.compatibility:- lines.append(f"Compatibility: {skill.compatibility}")- if skill.tags:- lines.append(f"Tags: {', '.join(skill.tags)}")- if skill.allowed_tools:- lines.append(f"Allowed tools: {', '.join(skill.allowed_tools)}")- if skill.triggers:- lines.append(f"Triggers: {', '.join(skill.triggers)}")-- lines.append("")- if skill.description:- lines.append("Description:")- lines.append(skill.description.strip())- lines.append("")-- lines.append("Content (SKILL.md body):")- lines.append(skill.content.strip() or "(empty)")- lines.append("")-- if referenced_files:- lines.append(- "Files in skill directory (use skills_tool method=read_file to open):"- )- lines.append(referenced_files)- else:- lines.append("No additional files found in skill directory.")-- return "\n".join(lines)+ return f"Loaded skill '{skill.name}' into persistent extras."def _read_file(self, skill_name: str, file_path: str) -> str:if not skill_name: