fix: reconstruct veadk skills from the tool level to the agent level

Author: BhAem

veadk/agent.py

@@ -15,7 +15,7 @@
 from __future__ import annotations
 
 import os
-from typing import Optional, Union
+from typing import Dict, Optional, Union
 
 # If user didn't set LITELLM_LOCAL_MODEL_COST_MAP, set it to True
 # to enable local model cost map.
@@ -297,26 +297,45 @@ def update_model(self, model_name: str):
 
     def load_skills(self):
         from pathlib import Path
+        from veadk.skills.skill import Skill
+        from veadk.skills.utils import (
+            load_skills_from_directory,
+            load_skills_from_cloud,
+        )
+        from veadk.tools.builtin_tools.playwright import playwright_tools
+        from veadk.tools.skills_tools import (
+            SkillsTool,
+            read_file_tool,
+            write_file_tool,
+            edit_file_tool,
+            bash_tool,
+        )
 
-        from veadk.skills.utils import load_skills_from_directory
+        skills: Dict[str, Skill] = {}
 
-        skills = []
-        for skill in self.skills:
-            path = Path(skill)
-            if path.is_dir():
-                skills.extend(load_skills_from_directory(path))
+        for item in self.skills:
+            path = Path(item)
+            if path.exists() and path.is_dir():
+                for skill in load_skills_from_directory(path):
+                    skills[skill.name] = skill
             else:
-                logger.error(
-                    f"Skill {skill} is not a directory, skip. Loading skills from cloud is WIP."
-                )
+                for skill in load_skills_from_cloud(item):
+                    skills[skill.name] = skill
         if skills:
             self.instruction += "\nYou have the following skills:\n"
 
-            for skill in skills:
+            for skill in skills.values():
                 self.instruction += (
                     f"- name: {skill.name}\n- description: {skill.description}\n\n"
                 )
 
+            self.tools.append(SkillsTool(skills))
+            self.tools.append(read_file_tool)
+            self.tools.append(write_file_tool)
+            self.tools.append(edit_file_tool)
+            self.tools.append(bash_tool)
+            self.tools.append(playwright_tools)
+
     async def _run(
         self,
         runner,

veadk/runner.py

@@ -472,6 +472,11 @@ async def run(
             )
         logger.info(f"Run config: {run_config}")
 
+        if self.agent.skills:
+            from veadk.tools.skills_tools.session_path import initialize_session_path
+
+            initialize_session_path(session_id)
+
         user_id = user_id or self.user_id
 
         converted_messages: list = _convert_messages(

veadk/skills/skill.py

@@ -13,9 +13,12 @@
 # limitations under the License.
 
 from pydantic import BaseModel
+from typing import Optional
 
 
 class Skill(BaseModel):
     name: str
     description: str
-    path: str
+    path: str  # local path or tos path
+    skill_space_id: Optional[str] = None
+    bucket_name: Optional[str] = None

veadk/skills/skills_plugin.py

@@ -12,19 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import json
 from pathlib import Path
-
+import os
 import frontmatter
 
 from veadk.skills.skill import Skill
 from veadk.utils.logger import get_logger
+from veadk.utils.volcengine_sign import ve_request
 
 logger = get_logger(__name__)
 
 
 def load_skill_from_directory(skill_directory: Path) -> Skill:
     logger.info(f"Load skill from {skill_directory}")
     skill_readme = skill_directory / "SKILL.md"
+    if not skill_readme.exists():
+        logger.error(f"Skill '{skill_directory}' has no SKILL.md file.")
+        raise ValueError(f"Skill '{skill_directory}' has no SKILL.md file")
+
     skill = frontmatter.load(str(skill_readme))
 
     skill_name = skill.get("name", "")
@@ -39,7 +45,7 @@ def load_skill_from_directory(skill_directory: Path) -> Skill:
         )
 
     logger.info(
-        f"Successfully loaded skill from {skill_readme}, name={skill['name']}, description={skill['description']}"
+        f"Successfully loaded skill {skill_name} locally from {skill_readme}, name={skill_name}, description={skill_description}"
     )
     return Skill(
         name=skill_name,  # type: ignore
@@ -58,4 +64,76 @@ def load_skills_from_directory(skills_directory: Path) -> list[Skill]:
     return skills
 
 
-def load_skills_from_cloud(space_name: str) -> list[Skill]: ...
+def load_skills_from_cloud(skill_space_ids: str) -> list[Skill]:
+    skill_space_ids_list = [x.strip() for x in skill_space_ids.split(",")]
+    logger.info(f"Load skills from skill spaces: {skill_space_ids_list}")
+
+    from veadk.auth.veauth.utils import get_credential_from_vefaas_iam
+
+    skills = []
+
+    for skill_space_id in skill_space_ids_list:
+        try:
+            service = os.getenv("AGENTKIT_TOOL_SERVICE_CODE", "agentkit")
+            region = os.getenv("AGENTKIT_TOOL_REGION", "cn-beijing")
+            host = os.getenv("AGENTKIT_SKILL_HOST", "open.volcengineapi.com")
+
+            access_key = os.getenv("VOLCENGINE_ACCESS_KEY")
+            secret_key = os.getenv("VOLCENGINE_SECRET_KEY")
+            session_token = ""
+
+            if not (access_key and secret_key):
+                # Try to get from vefaas iam
+                cred = get_credential_from_vefaas_iam()
+                access_key = cred.access_key_id
+                secret_key = cred.secret_access_key
+                session_token = cred.session_token
+
+            response = ve_request(
+                request_body={
+                    "SkillSpaceId": skill_space_id,
+                    "InnerTags": {"source": "sandbox"},
+                },
+                action="ListSkillsBySpaceId",
+                ak=access_key,
+                sk=secret_key,
+                service=service,
+                version="2025-10-30",
+                region=region,
+                host=host,
+                header={"X-Security-Token": session_token},
+            )
+
+            if isinstance(response, str):
+                response = json.loads(response)
+
+            list_skills_result = response.get("Result")
+            items = list_skills_result.get("Items")
+
+            for item in items:
+                if not isinstance(item, dict):
+                    continue
+                skill_name = item.get("Name")
+                skill_description = item.get("Description")
+                tos_bucket = item.get("BucketName")
+                tos_path = item.get("TosPath")
+                if not skill_name:
+                    continue
+
+                skill = Skill(
+                    name=skill_name,  # type: ignore
+                    description=skill_description,  # type: ignore
+                    path=tos_path,
+                    skill_space_id=skill_space_id,
+                    bucket_name=tos_bucket,
+                )
+
+                skills.append(skill)
+
+                logger.info(
+                    f"Successfully loaded skill {skill_name} from skill space={skill_space_id}, name={skill_name}, description={skill_description}"
+                )
+        except Exception as e:
+            logger.error(f"Failed to load skill from skill space: {e}")
+
+    return skills

veadk/skills/utils.py

@@ -15,7 +15,6 @@
 from .bash_tool import bash_tool
 from .file_tool import edit_file_tool, read_file_tool, write_file_tool
 from .skills_tool import SkillsTool
-from .skills_toolset import SkillsToolset
 from .session_path import initialize_session_path, get_session_path, clear_session_cache
 
 
@@ -25,7 +24,6 @@
     "read_file_tool",
     "write_file_tool",
     "SkillsTool",
-    "SkillsToolset",
     "initialize_session_path",
     "get_session_path",
     "clear_session_cache",

veadk/tools/skills_tools/__init__.py

@@ -38,7 +38,11 @@ async def bash_tool(command: str, description: str, tool_context: ToolContext):
     Execute bash commands in the skills environment with local shell.
     Working Directory & Structure:
     - Commands run in a temporary session directory: /tmp/veadk/{session_id}/
-    - skills_directory -> All skills are available here (read-only).
+    - Working directory structure:
+        /tmp/veadk/{session_id}/
+        ├── skills/     -> all skills are available here (read-only).
+        ├── uploads/    -> staged user files (temporary)
+        └── outputs/    -> generated files for return
     - Your current working directory is added to PYTHONPATH.
 
     Python Imports (CRITICAL):

veadk/tools/skills_tools/bash_tool.py

@@ -28,6 +28,13 @@ def read_file_tool(file_path: str, offset: int, limit: int, tool_context: ToolCo
     """Read files with line numbers for precise editing.
 
     Reads a file from the filesystem with line numbers.
+
+    Working directory structure:
+        /tmp/veadk/{session_id}/
+        ├── skills/     -> all skills are available here (read-only).
+        ├── uploads/    -> staged user files (temporary)
+        └── outputs/    -> generated files for return
+
     Usage:
     - Provide a path to the file (absolute or relative to your working directory)
     - Returns content with line numbers (format: LINE_NUMBER|CONTENT)
@@ -88,6 +95,13 @@ def write_file_tool(file_path: str, content: str, tool_context: ToolContext):
     """Write content to files (overwrites existing files).
 
     Writes content to a file on the filesystem.
+
+    Working directory structure:
+        /tmp/veadk/{session_id}/
+        ├── skills/     -> all skills are available here (read-only).
+        ├── uploads/    -> staged user files (temporary)
+        └── outputs/    -> generated files for return
+
     Usage:
     - Provide a path (absolute or relative to working directory) and content to write
     - Overwrites existing files
@@ -136,6 +150,12 @@ def edit_file_tool(
 ):
     """Edit files by replacing exact string matches.
 
+    Working directory structure:
+        /tmp/veadk/{session_id}/
+        ├── skills/     -> all skills are available here (read-only).
+        ├── uploads/    -> staged user files (temporary)
+        └── outputs/    -> generated files for return
+
     Performs exact string replacements in files.
     Usage:
     - You must read the file first using read_file