Skip to content

Agent Zero AI framework

fixing skill roots

frdel84c06592c76a
diff --git a/python/helpers/projects.py b/python/helpers/projects.py
index 0eef45871..154e1a392 100644
--- a/python/helpers/projects.py
+++ b/python/helpers/projects.py
@@ -1,5 +1,5 @@
import os
-from typing import Literal, TypedDict, TYPE_CHECKING
+from typing import Literal, TypedDict, TYPE_CHECKING, cast
from python.helpers import files, dirty_json, persist_chat, file_tree
from python.helpers.print_style import PrintStyle
@@ -106,7 +106,7 @@ def clone_git_project(name: str, git_url: str, git_token: str, data: BasicProjec
meta_path = os.path.join(abs_path, PROJECT_META_DIR, PROJECT_HEADER_FILE)
if os.path.exists(meta_path):
# Merge: keep cloned content, override only user-specified fields
- cloned_header = dirty_json.parse(files.read_file(meta_path))
+ cloned_header: BasicProjectData = dirty_json.parse(files.read_file(meta_path)) # type: ignore
cloned_header["title"] = data.get("title") or cloned_header.get("title", "")
cloned_header["color"] = data.get("color") or cloned_header.get("color", "")
cloned_header["git_url"] = clean_url
@@ -151,48 +151,63 @@ def _default_file_structure_settings():
)
-def _normalizeBasicData(data: BasicProjectData):
- return BasicProjectData(
- title=data.get("title", ""),
- description=data.get("description", ""),
- instructions=data.get("instructions", ""),
- color=data.get("color", ""),
- git_url=data.get("git_url", ""),
- memory=data.get("memory", "own"),
- file_structure=data.get(
+def _normalizeBasicData(data: BasicProjectData) -> BasicProjectData:
+ return {
+ "title": data.get("title", ""),
+ "description": data.get("description", ""),
+ "instructions": data.get("instructions", ""),
+ "color": data.get("color", ""),
+ "git_url": data.get("git_url", ""),
+ "memory": data.get("memory", "own"),
+ "file_structure": data.get(
"file_structure",
_default_file_structure_settings(),
),
- )
+ }
-def _normalizeEditData(data: EditProjectData):
- return EditProjectData(
- name=data.get("name", ""),
- title=data.get("title", ""),
- description=data.get("description", ""),
- instructions=data.get("instructions", ""),
- variables=data.get("variables", ""),
- color=data.get("color", ""),
- git_status=data.get("git_status", {"is_git_repo": False}),
- instruction_files_count=data.get("instruction_files_count", 0),
- knowledge_files_count=data.get("knowledge_files_count", 0),
- secrets=data.get("secrets", ""),
- memory=data.get("memory", "own"),
- file_structure=data.get(
+def _normalizeEditData(data: EditProjectData) -> EditProjectData:
+ normalized: EditProjectData = {
+ "name": data.get("name", ""),
+ "title": data.get("title", ""),
+ "description": data.get("description", ""),
+ "instructions": data.get("instructions", ""),
+ "variables": data.get("variables", ""),
+ "color": data.get("color", ""),
+ "git_url": data.get("git_url", ""),
+ "git_status": data.get("git_status", {"is_git_repo": False}),
+ "instruction_files_count": data.get("instruction_files_count", 0),
+ "knowledge_files_count": data.get("knowledge_files_count", 0),
+ "secrets": data.get("secrets", ""),
+ "memory": data.get("memory", "own"),
+ "file_structure": data.get(
"file_structure",
_default_file_structure_settings(),
),
- subagents=data.get("subagents", {}),
- )
+ "subagents": data.get("subagents", {}),
+ }
+ return normalized
def _edit_data_to_basic_data(data: EditProjectData):
return _normalizeBasicData(data)
-def _basic_data_to_edit_data(data: BasicProjectData):
- return _normalizeEditData(data) # type: ignore
+def _basic_data_to_edit_data(data: BasicProjectData) -> EditProjectData:
+ base: EditProjectData = cast(
+ EditProjectData,
+ {
+ **data,
+ "name": "",
+ "instruction_files_count": 0,
+ "knowledge_files_count": 0,
+ "variables": "",
+ "secrets": "",
+ "subagents": {},
+ "git_status": {"is_git_repo": False},
+ },
+ )
+ return _normalizeEditData(base)
def update_project(name: str, data: EditProjectData):
@@ -215,7 +230,7 @@ def update_project(name: str, data: EditProjectData):
def load_basic_project_data(name: str) -> BasicProjectData:
- data = BasicProjectData(**load_project_header(name))
+ data = cast(BasicProjectData, load_project_header(name))
normalized = _normalizeBasicData(data)
return normalized
@@ -229,17 +244,20 @@ def load_edit_project_data(name: str) -> EditProjectData:
secrets = load_project_secrets_masked(name)
subagents = load_project_subagents(name)
knowledge_files_count = get_knowledge_files_count(name)
- git_status = git.get_repo_status(get_project_folder(name))
+ git_status = cast(GitStatusData, git.get_repo_status(get_project_folder(name)))
- data = EditProjectData(
- **data,
- name=name,
- instruction_files_count=len(additional_instructions),
- knowledge_files_count=knowledge_files_count,
- variables=variables,
- secrets=secrets,
- subagents=subagents,
- git_status=git_status,
+ data = cast(
+ EditProjectData,
+ {
+ **data,
+ "name": name,
+ "instruction_files_count": len(additional_instructions),
+ "knowledge_files_count": knowledge_files_count,
+ "variables": variables,
+ "secrets": secrets,
+ "subagents": subagents,
+ "git_status": git_status,
+ },
)
data = _normalizeEditData(data)
return data
diff --git a/python/helpers/skills.py b/python/helpers/skills.py
index f7c899482..f6b4fcd46 100644
--- a/python/helpers/skills.py
+++ b/python/helpers/skills.py
@@ -50,11 +50,18 @@ def get_skill_roots(
paths = subagents.get_paths(agent, "skills")
else:
# skill roots available globally
- pr_ag = files.find_existing_paths_by_pattern("projects/*/.a0proj/agents/*/skills") # agents in projects
- projects = files.find_existing_paths_by_pattern("projects/*/.a0proj/skills") # projects
+ project_agents = files.find_existing_paths_by_pattern("usr/projects/*/.a0proj/agents/*/skills") # agents in projects
+ projects = files.find_existing_paths_by_pattern("usr/projects/*/.a0proj/skills") # projects
+ usr_agents = files.find_existing_paths_by_pattern("usr/agents/*/skills") # agents
agents = files.find_existing_paths_by_pattern("agents/*/skills") # agents
- paths = [files.get_abs_path("skills"), files.get_abs_path("usr/skills")] + pr_ag + projects + agents # full scope
-
+ paths = [
+ files.get_abs_path("skills"),
+ files.get_abs_path("usr/skills"),
+ *project_agents,
+ *projects,
+ *usr_agents,
+ *agents
+ ]
return paths
@@ -364,10 +371,9 @@ def load_skill_for_agent(
return f"Error: skill '{skill_name}' not found"
# Get runtime path
- if agent and agent.config.code_exec_ssh_enabled:
+ runtime_path = str(skill.path)
+ if runtime.is_development():
runtime_path = files.normalize_a0_path(str(skill.path))
- else:
- runtime_path = str(skill.path)
lines = [f"Skill: {skill.name}", f"Path: {runtime_path}"]
diff --git a/webui/components/settings/skills/list.html b/webui/components/settings/skills/list.html
index 3e93c8eb9..46cc94556 100644
--- a/webui/components/settings/skills/list.html
+++ b/webui/components/settings/skills/list.html
@@ -18,10 +18,10 @@
<div class="skills-list-controls">
<div class="field">
<div class="field-label">
- <div class="field-title">Project scope</div>
- <div class="field-description">
+ <div class="field-title">Filter by project</div>
+ <!-- <div class="field-description">
Includes global skills plus the selected project.
- </div>
+ </div> -->
</div>
<div class="field-control">
<select x-model="$store.skillsListStore.projectName"