refactor: unify skill source model

skiff/project.py

@@ -7,7 +7,7 @@ from typing import Any
 
 from skiff import yaml_io
 from skiff.paths import PROJECT_MANIFEST
-from skiff.skills import resolve_skill_source
+from skiff.skills import normalize_source, resolve_skill_source
 
 
 def load_manifest(path: Path | None = None) -> tuple[Path, dict[str, Any]]:
@@ -31,11 +31,13 @@ def save_manifest(path: Path, data: dict[str, Any]) -> None:
 
 def normalize_skill_entry(entry: str | dict[str, Any]) -> dict[str, Any]:
     if isinstance(entry, str):
-        return {"name": entry, "source": "owned"}
+        return {"name": entry, "source": "builtin"}
     name = entry.get("name")
     if not name:
         raise SystemExit(f".skills.yaml 条目缺少 name: {entry}")
-    source = entry.get("source", "owned")
+    source = normalize_source(str(entry.get("source", "builtin")))
+    if source == "catalog" and entry.get("registry"):
+        source = f"catalog:{entry['registry']}"
     return {"name": name, "source": source, **{k: v for k, v in entry.items() if k not in ("name", "source")}}
 
 
@@ -44,8 +46,6 @@ def manifest_skill_names(data: dict[str, Any]) -> list[str]:
 
 
 def _entry_to_yaml(entry: dict[str, Any]) -> str | dict[str, Any]:
-    if entry.get("source", "owned") == "owned" and set(entry.keys()) <= {"name", "source"}:
-        return entry["name"]
     return entry
 
 
@@ -53,7 +53,7 @@ def add_skill_to_manifest(
     manifest_path: Path,
     name: str,
     *,
-    source: str = "owned",
+    source: str = "builtin",
     extra: dict[str, Any] | None = None,
 ) -> None:
     path = manifest_path
@@ -100,7 +100,7 @@ def iter_manifest_skills(data: dict[str, Any]) -> list[dict[str, Any]]:
 
 def resolve_manifest_skill(entry: dict[str, Any]) -> tuple[Path, str]:
     name = entry["name"]
-    source = entry.get("source", "owned")
-    if source == "registry" and entry.get("registry"):
-        source = f"registry:{entry['registry']}"
+    source = normalize_source(entry.get("source", "builtin"))
+    if source == "catalog" and entry.get("registry"):
+        source = f"catalog:{entry['registry']}"
     return resolve_skill_source(name, source=source)