chore: auto release commit (2026-04-06 16:44:58)

scripts/util/constants.py

@@ -1,4 +1,4 @@
-"""技能级常量与本地 CLI 调试环境注入（仅 CLI 入口显式调用 _apply_cli_local_dev_env 时生效）。"""
+"""技能级常量。本地 CLI 默认值见 jiangchang_skill_core.runtime_env（main.py 最早调用 apply_cli_local_defaults）。"""
 import os
 
 # scripts/util/constants.py -> skill root = parents[2]
@@ -7,29 +7,3 @@ BASE_DIR = _BASE
 SKILL_SLUG = "account-manager"
 # 与其它 OpenClaw 技能对齐：openclaw.skill.<slug_下划线>
 LOG_LOGGER_NAME = "openclaw.skill.account_manager"
-
-# ---------------------------------------------------------------------------
-# 本地 CLI 调试：直接运行 python main.py 时，若未设置 JIANGCHANG_*，可自动注入下面默认值。
-# - 仅当 CLI 里调用了 _apply_cli_local_dev_env() 时生效；被其它脚本 import 不会改 os.environ。
-# - 不会覆盖宿主/终端已设置的 JIANGCHANG_DATA_ROOT、JIANGCHANG_USER_ID。
-# - 开启方式（二选一）：
-#   1) 将 _ACCOUNT_MANAGER_CLI_LOCAL_DEV 改为 True；
-#   2) 或设置环境变量 JIANGCHANG_ACCOUNT_CLI_LOCAL_DEV=1（无需改代码）。
-# 合并/发版前请关闭开关，避免把个人机器路径带进生产制品。
-# ---------------------------------------------------------------------------
-_ACCOUNT_MANAGER_CLI_LOCAL_DEV = True
-_ACCOUNT_MANAGER_CLI_LOCAL_DATA_ROOT = r"D:\jiangchang-data"
-_ACCOUNT_MANAGER_CLI_LOCAL_USER_ID = "10032"
-
-
-def _apply_cli_local_dev_env() -> None:
-    enabled = _ACCOUNT_MANAGER_CLI_LOCAL_DEV
-    if not enabled:
-        v = (os.getenv("JIANGCHANG_ACCOUNT_CLI_LOCAL_DEV") or "").strip().lower()
-        enabled = v in ("1", "true", "yes", "on")
-    if not enabled:
-        return
-    if not (os.getenv("JIANGCHANG_DATA_ROOT") or "").strip():
-        os.environ["JIANGCHANG_DATA_ROOT"] = _ACCOUNT_MANAGER_CLI_LOCAL_DATA_ROOT.strip()
-    if not (os.getenv("JIANGCHANG_USER_ID") or "").strip():
-        os.environ["JIANGCHANG_USER_ID"] = _ACCOUNT_MANAGER_CLI_LOCAL_USER_ID.strip()

scripts/util/logging_config.py

@@ -1,69 +1,21 @@
-"""技能级文件日志。"""
-import logging
-import os
-import sys
-from logging.handlers import TimedRotatingFileHandler
+"""Re-export unified logging (implementation: jiangchang_skill_core.unified_logging)."""
 
-from util.constants import LOG_LOGGER_NAME, SKILL_SLUG
-from util.runtime_paths import get_skill_logs_dir
+from jiangchang_skill_core.unified_logging import (
+    attach_unified_file_handler,
+    ensure_trace_for_process,
+    get_skill_log_file_path,
+    get_skill_logger,
+    get_unified_logs_dir,
+    setup_skill_logging,
+    subprocess_env_with_trace,
+)
 
-
-def _skill_log_file_path() -> str:
-    """主日志文件路径；可由 JIANGCHANG_ACCOUNT_MANAGER_LOG_FILE 覆盖为绝对路径。"""
-    override = (os.getenv("JIANGCHANG_ACCOUNT_MANAGER_LOG_FILE") or "").strip()
-    if override:
-        parent = os.path.dirname(os.path.abspath(override))
-        if parent:
-            os.makedirs(parent, exist_ok=True)
-        return os.path.abspath(override)
-    return os.path.join(get_skill_logs_dir(), f"{SKILL_SLUG}.log")
-
-
-def _log_level_from_env() -> int:
-    v = (os.getenv("JIANGCHANG_LOG_LEVEL") or "INFO").strip().upper()
-    return getattr(logging, v, None) or logging.INFO
-
-
-def get_skill_log_file_path() -> str:
-    """主日志文件绝对路径（与 get_skill_logger 写入文件一致）。"""
-    return _skill_log_file_path()
-
-
-def get_skill_logger() -> logging.Logger:
-    """
-    技能级日志：单文件按日切分（TimedRotatingFileHandler midnight），UTF-8。
-    环境变量：JIANGCHANG_LOG_LEVEL（默认 INFO）、JIANGCHANG_LOG_TO_STDERR=1 时 WARNING+ 同步 stderr、
-    JIANGCHANG_ACCOUNT_MANAGER_LOG_FILE 覆盖日志文件路径。
-    """
-    log = logging.getLogger(LOG_LOGGER_NAME)
-    if log.handlers:
-        return log
-    log.setLevel(_log_level_from_env())
-    path = _skill_log_file_path()
-    fh = TimedRotatingFileHandler(
-        path,
-        when="midnight",
-        interval=1,
-        backupCount=30,
-        encoding="utf-8",
-        delay=True,
-    )
-    fh.setFormatter(
-        logging.Formatter(
-            "%(asctime)s | %(levelname)-8s | %(name)s | %(message)s",
-            datefmt="%Y-%m-%dT%H:%M:%S",
-        )
-    )
-    log.addHandler(fh)
-    if (os.getenv("JIANGCHANG_LOG_TO_STDERR") or "").strip().lower() in (
-        "1",
-        "true",
-        "yes",
-        "on",
-    ):
-        sh = logging.StreamHandler(sys.stderr)
-        sh.setLevel(logging.WARNING)
-        sh.setFormatter(fh.formatter)
-        log.addHandler(sh)
-    log.propagate = False
-    return log
+__all__ = [
+    "attach_unified_file_handler",
+    "ensure_trace_for_process",
+    "get_skill_log_file_path",
+    "get_skill_logger",
+    "get_unified_logs_dir",
+    "setup_skill_logging",
+    "subprocess_env_with_trace",
+]

scripts/util/runtime_paths.py

@@ -4,37 +4,17 @@ import re
 import sys
 from typing import Optional
 
+from jiangchang_skill_core.runtime_env import get_data_root, get_user_id
 from util.constants import SKILL_SLUG
 from util.platforms import _PLATFORM_PRIMARY_CN
 
 
-def get_data_root():
-    env = (os.getenv("JIANGCHANG_DATA_ROOT") or "").strip()
-    if env:
-        return env
-    if sys.platform == "win32":
-        return r"D:\jiangchang-data"
-    return os.path.join(os.path.expanduser("~"), ".jiangchang-data")
-
-
-def get_user_id():
-    uid = (os.getenv("JIANGCHANG_USER_ID") or "").strip()
-    return uid or "_anon"
-
-
 def get_skill_data_dir():
     path = os.path.join(get_data_root(), get_user_id(), SKILL_SLUG)
     os.makedirs(path, exist_ok=True)
     return path
 
 
-def get_skill_logs_dir() -> str:
-    """{DATA_ROOT}/{USER_ID}/account-manager/logs/"""
-    path = os.path.join(get_skill_data_dir(), "logs")
-    os.makedirs(path, exist_ok=True)
-    return path
-
-
 def get_db_path():
     return os.path.join(get_skill_data_dir(), "account-manager.db")