修改skill目录

This commit is contained in:
朱潮 2026-04-19 00:28:14 +08:00
parent 990f50ed55
commit fd7d838e09
2 changed files with 13 additions and 2 deletions

View File

@ -18,6 +18,7 @@ Skill 系统支持两种来源:官方 skills (`./skills/`) 和用户 skills (`
## 最近重要事项
- 2026-04-19: `create_robot_project` 的 autoload 去重和 stale 清理补强autoload 目录也纳入 managed 清理,避免 `rag-retrieve-only` 场景下旧的 `rag-retrieve` 残留
- 2026-04-18: `create_robot_project` 改为自动加载 `skills/autoload/{SKILLS_SUBDIR}` 下所有 skill并跳过已显式传入的同名 skill
- 2026-04-18: `/api/v1/skill/list` 的官方库改为同时读取 `skills/common``skills/{SKILLS_SUBDIR}`,并按目录顺序去重
- 2026-04-18: `_extract_skills_to_robot` 改为通过环境变量 `SKILLS_SUBDIR` 选择官方 skills 子目录,默认使用 `skills/common`

View File

@ -321,6 +321,14 @@ def create_robot_project(dataset_ids: List[str], bot_id: str, force_rebuild: boo
str: 机器人项目目录路径
"""
def _skill_matches_autoload(skill: str, autoload_skill_name: str) -> bool:
normalized_skill = Path(skill.lstrip("@")).name.lower()
normalized_autoload_skill_name = autoload_skill_name.lower()
if re.search(re.escape(normalized_autoload_skill_name), normalized_skill):
return True
autoload_prefix = normalized_autoload_skill_name.split("-")[0]
return bool(autoload_prefix and re.search(re.escape(autoload_prefix), normalized_skill))
skills = list(skills or [])
if os.path.isabs(settings.SKILLS_DIR):
autoload_skills_dir = Path(settings.SKILLS_DIR) / "autoload" / settings.SKILLS_SUBDIR
@ -329,7 +337,7 @@ def create_robot_project(dataset_ids: List[str], bot_id: str, force_rebuild: boo
if autoload_skills_dir.exists():
for item in sorted(autoload_skills_dir.iterdir()):
if not item.is_dir() or any(re.search(re.escape(item.name), skill) for skill in skills):
if not item.is_dir() or any(_skill_matches_autoload(skill, item.name) for skill in skills):
continue
skill_path = f"@skills/autoload/{settings.SKILLS_SUBDIR}/{item.name}"
skills.append(skill_path)
@ -404,6 +412,7 @@ def _extract_skills_to_robot(bot_id: str, skills: List[str], project_path: Path)
# skills 源目录(按优先级顺序)
repo_root = Path(__file__).resolve().parent.parent
official_skills_dir = repo_root / "skills" / settings.SKILLS_SUBDIR
autoload_skills_dir = repo_root / "skills" / "autoload" / settings.SKILLS_SUBDIR
if not official_skills_dir.exists():
logger.warning(f"Official skills directory does not exist: {official_skills_dir}")
skills_source_dirs = [
@ -411,12 +420,13 @@ def _extract_skills_to_robot(bot_id: str, skills: List[str], project_path: Path)
repo_root / "skills" / "common",
official_skills_dir,
]
managed_skill_dirs = [*skills_source_dirs, autoload_skills_dir]
skills_target_dir = project_path / "robot" / bot_id / "skills"
skills_target_dir.mkdir(parents=True, exist_ok=True)
logger.info(f"Copying skills to {skills_target_dir}")
managed_skill_names = set()
for base_dir in skills_source_dirs:
for base_dir in managed_skill_dirs:
if not base_dir.exists():
continue
for item in base_dir.iterdir():