统一运行时环境变量契约，移除 CLAW_* 别名 (v1.0.17)

src/jiangchang_skill_core/media_assets.py

@@ -743,7 +743,7 @@ def probe_background_music(
         if not music_dir.is_dir():
             music_dir = Path(root) if Path(root).is_dir() else None
     else:
-        data_root = (env_map.get("JIANGCHANG_DATA_ROOT") or env_map.get("CLAW_DATA_ROOT") or "").strip()
+        data_root = (env_map.get("JIANGCHANG_DATA_ROOT") or "").strip()
         assets_root = resolve_media_assets_root(data_root or None, env_map)
         status = _inspect_media_assets(assets_root, source="local")
         music_dir = status.music_dir

src/jiangchang_skill_core/runtime_diagnostics.py

@@ -37,7 +37,6 @@ class RuntimeDiagnostics:
     platform_kit_version_ok: bool | None
     jiangchang_skill_core_file: str | None
 
-    claw_data_root: str | None
     jiangchang_data_root: str | None
     resolved_data_root: str | None
 
@@ -66,7 +65,7 @@ def _env_dict(env: Mapping[str, str] | None) -> dict[str, str]:
 
 
 def _resolve_data_root(env: Mapping[str, str]) -> str:
-    root = (env.get("CLAW_DATA_ROOT") or env.get("JIANGCHANG_DATA_ROOT") or "").strip()
+    root = (env.get("JIANGCHANG_DATA_ROOT") or "").strip()
     if root:
         return root
     return platform_default_data_root()
@@ -164,7 +163,6 @@ def collect_runtime_diagnostics(
     env_map = _env_dict(env)
     issues: list[RuntimeIssue] = []
 
-    claw_data_root = env_map.get("CLAW_DATA_ROOT")
     jiangchang_data_root = env_map.get("JIANGCHANG_DATA_ROOT")
     resolved_data_root = _resolve_data_root(env_map)
 
@@ -267,7 +265,6 @@ def collect_runtime_diagnostics(
         platform_kit_min_version=platform_kit_min_version,
         platform_kit_version_ok=platform_ok,
         jiangchang_skill_core_file=core_file,
-        claw_data_root=claw_data_root,
         jiangchang_data_root=jiangchang_data_root,
         resolved_data_root=resolved_data_root,
         media_assets_root=str(media_root_path),
@@ -290,7 +287,6 @@ def format_runtime_health_lines(diagnostics: RuntimeDiagnostics) -> list[str]:
         f"platform_kit_min_version: {diagnostics.platform_kit_min_version or ''}",
         f"platform_kit_version_ok: {diagnostics.platform_kit_version_ok}",
         f"jiangchang_skill_core_file: {diagnostics.jiangchang_skill_core_file or ''}",
-        f"CLAW_DATA_ROOT: {diagnostics.claw_data_root or ''}",
         f"JIANGCHANG_DATA_ROOT: {diagnostics.jiangchang_data_root or ''}",
         f"resolved_data_root: {diagnostics.resolved_data_root or ''}",
         f"media_assets_root: {diagnostics.media_assets_root or ''}",
@@ -315,7 +311,6 @@ def runtime_diagnostics_dict(diagnostics: RuntimeDiagnostics) -> dict[str, Any]:
         "platform_kit_min_version": diagnostics.platform_kit_min_version,
         "platform_kit_version_ok": diagnostics.platform_kit_version_ok,
         "jiangchang_skill_core_file": diagnostics.jiangchang_skill_core_file,
-        "CLAW_DATA_ROOT": diagnostics.claw_data_root,
         "JIANGCHANG_DATA_ROOT": diagnostics.jiangchang_data_root,
         "resolved_data_root": diagnostics.resolved_data_root,
         "media_assets_root": diagnostics.media_assets_root,

src/jiangchang_skill_core/runtime_env.py

@@ -34,22 +34,14 @@ def platform_default_data_root() -> str:
 
 
 def get_data_root() -> str:
-    env = (
-        os.getenv("CLAW_DATA_ROOT")
-        or os.getenv("JIANGCHANG_DATA_ROOT")
-        or ""
-    ).strip()
+    env = (os.getenv("JIANGCHANG_DATA_ROOT") or "").strip()
     if env:
         return env
     return platform_default_data_root()
 
 
 def get_user_id() -> str:
-    return (
-        os.getenv("CLAW_USER_ID")
-        or os.getenv("JIANGCHANG_USER_ID")
-        or ""
-    ).strip() or "_anon"
+    return (os.getenv("JIANGCHANG_USER_ID") or "").strip() or "_anon"
 
 
 def _looks_like_skills_root(path: str) -> bool:
@@ -76,15 +68,13 @@ def get_skills_root() -> str:
 
     优先级：
     1) JIANGCHANG_SKILLS_ROOT
-    2) CLAW_SKILLS_ROOT
-    3) JIANGCHANG_APP_ROOT：若 {APP}/skills 存在且像技能根则用之；否则若 APP 下已有技能子目录则 APP 即根
-    4) Windows：默认 D:\\AI\\jiangchang 同上规则
-    5) 其他平台：~/.openclaw/skills
+    2) JIANGCHANG_APP_ROOT：若 {APP}/skills 存在且像技能根则用之；否则若 APP 下已有技能子目录则 APP 即根
+    3) Windows：默认 D:\\AI\\jiangchang 同上规则
+    4) 其他平台：~/.openclaw/skills
     """
-    for key in ("JIANGCHANG_SKILLS_ROOT", "CLAW_SKILLS_ROOT"):
-        v = (os.getenv(key) or "").strip()
-        if v:
-            return os.path.normpath(v)
+    v = (os.getenv("JIANGCHANG_SKILLS_ROOT") or "").strip()
+    if v:
+        return os.path.normpath(v)
 
     app = (os.getenv("JIANGCHANG_APP_ROOT") or "").strip()
     if sys.platform == "win32" and not app:
@@ -110,8 +100,8 @@ def get_sibling_skills_root(skill_scripts_dir: str | None = None) -> str:
     """
     编排子进程调用兄弟技能时用：先根据本技能 scripts 目录推断并列根；若目录下能识别出兄弟技能
     则用之（开发仓 D:\\OpenClaw 与安装目录 ~/.openclaw/skills 均满足「技能根之上一级 = 并列根」），
-    避免全局 JIANGCHANG_SKILLS_ROOT / CLAW_SKILLS_ROOT 指向与当前检出不一致时错调兄弟进程。
-    推断失败时再读上述环境变量，最后回落 get_skills_root()。
+    避免全局 JIANGCHANG_SKILLS_ROOT 指向与当前检出不一致时错调兄弟进程。
+    推断失败时再读 JIANGCHANG_SKILLS_ROOT，最后回落 get_skills_root()。
     """
     if skill_scripts_dir:
         scripts = os.path.abspath(skill_scripts_dir)
@@ -120,10 +110,9 @@ def get_sibling_skills_root(skill_scripts_dir: str | None = None) -> str:
         if _looks_like_skills_root(inferred):
             return os.path.normpath(inferred)
 
-    for key in ("JIANGCHANG_SKILLS_ROOT", "CLAW_SKILLS_ROOT"):
-        v = (os.getenv(key) or "").strip()
-        if v:
-            return os.path.normpath(v)
+    v = (os.getenv("JIANGCHANG_SKILLS_ROOT") or "").strip()
+    if v:
+        return os.path.normpath(v)
 
     return get_skills_root()
 
@@ -139,21 +128,10 @@ def apply_cli_local_defaults() -> None:
         enabled = v in ("1", "true", "yes", "on")
     if not enabled:
         return
-    if not (
-        os.getenv("CLAW_DATA_ROOT")
-        or os.getenv("JIANGCHANG_DATA_ROOT")
-        or ""
-    ).strip():
-        default_root = platform_default_data_root()
-        os.environ["JIANGCHANG_DATA_ROOT"] = default_root
-        os.environ.setdefault("CLAW_DATA_ROOT", default_root)
-    if not (
-        os.getenv("CLAW_USER_ID")
-        or os.getenv("JIANGCHANG_USER_ID")
-        or ""
-    ).strip():
+    if not (os.getenv("JIANGCHANG_DATA_ROOT") or "").strip():
+        os.environ["JIANGCHANG_DATA_ROOT"] = platform_default_data_root()
+    if not (os.getenv("JIANGCHANG_USER_ID") or "").strip():
         os.environ["JIANGCHANG_USER_ID"] = DEFAULT_LOCAL_USER_ID.strip()
-        os.environ.setdefault("CLAW_USER_ID", DEFAULT_LOCAL_USER_ID.strip())
 def find_chrome_executable() -> "str | None":
     """查找系统已安装的 Chrome 或 Edge 可执行文件路径。