vibego 0.2.42__py3-none-any.whl → 0.2.43__py3-none-any.whl

master.py

@@ -85,6 +85,11 @@ def _get_restart_signal_path() -> Path:
 
 
 RESTART_SIGNAL_PATH = _get_restart_signal_path()
+LEGACY_RESTART_SIGNAL_PATHS: Tuple[Path, ...] = tuple(
+    path
+    for path in (ROOT_DIR / "state/restart_signal.json",)
+    if path != RESTART_SIGNAL_PATH
+)
 RESTART_SIGNAL_TTL = int(os.environ.get("MASTER_RESTART_SIGNAL_TTL", "1800"))  # 默认 30 分钟
 LOCAL_TZ = ZoneInfo(os.environ.get("MASTER_TIMEZONE", "Asia/Shanghai"))
 JUMP_BUTTON_TEXT_WIDTH = 40
@@ -1699,48 +1704,57 @@ def _write_restart_signal(message: Message, *, override_user: Optional[User] = N
     )
 
 
-def _read_restart_signal() -> Optional[dict]:
-    """读取并验证重启 signal，超时会自动清理"""
-    if not RESTART_SIGNAL_PATH.exists():
-        return None
-    try:
-        raw = json.loads(RESTART_SIGNAL_PATH.read_text(encoding="utf-8"))
-        if not isinstance(raw, dict):
-            raise ValueError("signal payload 必须是对象")
-    except Exception as exc:
-        log.error("读取重启信号失败: %s", exc)
-        _safe_remove(RESTART_SIGNAL_PATH)
-        return None
-
-    timestamp_raw = raw.get("timestamp")
-    if timestamp_raw:
+def _read_restart_signal() -> Tuple[Optional[dict], Optional[Path]]:
+    """读取并验证重启 signal，兼容历史路径并处理异常/超时情况"""
+    candidates: Tuple[Path, ...] = (RESTART_SIGNAL_PATH, *LEGACY_RESTART_SIGNAL_PATHS)
+    for path in candidates:
+        if not path.exists():
+            continue
         try:
-            ts = datetime.fromisoformat(timestamp_raw)
-            if ts.tzinfo is None:
-                ts = ts.replace(tzinfo=LOCAL_TZ)
-            ts_utc = ts.astimezone(timezone.utc)
-            age_seconds = (datetime.now(timezone.utc) - ts_utc).total_seconds()
-            if age_seconds > RESTART_SIGNAL_TTL:
-                log.info(
-                    "重启信号超时，忽略",
-                    extra={
-                        "path": str(RESTART_SIGNAL_PATH),
-                        "age_seconds": age_seconds,
-                        "ttl": RESTART_SIGNAL_TTL,
-                    },
-                )
-                _safe_remove(RESTART_SIGNAL_PATH)
-                return None
+            raw = json.loads(path.read_text(encoding="utf-8"))
+            if not isinstance(raw, dict):
+                raise ValueError("signal payload 必须是对象")
         except Exception as exc:
-            log.warning("解析重启信号时间戳失败: %s", exc)
+            log.error("读取重启信号失败: %s", exc, extra={"path": str(path)})
+            _safe_remove(path)
+            continue
 
-    return raw
+        timestamp_raw = raw.get("timestamp")
+        if timestamp_raw:
+            try:
+                ts = datetime.fromisoformat(timestamp_raw)
+                if ts.tzinfo is None:
+                    ts = ts.replace(tzinfo=LOCAL_TZ)
+                ts_utc = ts.astimezone(timezone.utc)
+                age_seconds = (datetime.now(timezone.utc) - ts_utc).total_seconds()
+                if age_seconds > RESTART_SIGNAL_TTL:
+                    log.info(
+                        "重启信号超时，忽略",
+                        extra={
+                            "path": str(path),
+                            "age_seconds": age_seconds,
+                            "ttl": RESTART_SIGNAL_TTL,
+                        },
+                    )
+                    _safe_remove(path)
+                    continue
+            except Exception as exc:
+                log.warning("解析重启信号时间戳失败: %s", exc, extra={"path": str(path)})
+
+        if path != RESTART_SIGNAL_PATH:
+            log.info(
+                "从兼容路径读取重启信号",
+                extra={"path": str(path), "primary": str(RESTART_SIGNAL_PATH)},
+            )
+        return raw, path
+
+    return None, None
 
 
 async def _notify_restart_success(bot: Bot) -> None:
     """在新 master 启动时读取 signal 并通知触发者（改进版：支持超时检测和详细诊断）"""
     restart_expected = os.environ.pop("MASTER_RESTART_EXPECTED", None)
-    payload = _read_restart_signal()
+    payload, signal_path = _read_restart_signal()
 
     # 定义重启健康检查阈值（2 分钟）
     RESTART_HEALTHY_THRESHOLD = 120  # 秒
@@ -1754,7 +1768,7 @@ async def _notify_restart_success(bot: Bot) -> None:
             )
             if targets:
                 # 检查启动日志是否有错误信息
-                error_log_dir = ROOT_DIR / "logs"
+                error_log_dir = LOG_ROOT_PATH
                 error_log_hint = ""
                 try:
                     error_logs = sorted(error_log_dir.glob("master_error_*.log"), key=lambda p: p.stat().st_mtime, reverse=True)
@@ -1775,8 +1789,8 @@ async def _notify_restart_success(bot: Bot) -> None:
                     "4. start.sh 启动失败后被清理",
                     "",
                     "建议检查：",
-                    f"- 启动日志: {ROOT_DIR}/logs/start.log",
-                    f"- 运行日志: {ROOT_DIR}/vibe.log",
+                    f"- 启动日志: {LOG_ROOT_PATH / 'start.log'}",
+                    f"- 运行日志: {LOG_ROOT_PATH / 'vibe.log'}",
                     f"- 信号文件: {RESTART_SIGNAL_PATH}",
                 ]
                 if error_log_hint:
@@ -1798,7 +1812,11 @@ async def _notify_restart_success(bot: Bot) -> None:
         chat_id = int(chat_id_raw)
     except (TypeError, ValueError):
         log.error("重启信号 chat_id 非法: %s", chat_id_raw)
-        _safe_remove(RESTART_SIGNAL_PATH)
+        targets = (signal_path, RESTART_SIGNAL_PATH, *LEGACY_RESTART_SIGNAL_PATHS)
+        for candidate in targets:
+            if candidate is None:
+                continue
+            _safe_remove(candidate)
         return
 
     username = payload.get("username")
@@ -1843,7 +1861,7 @@ async def _notify_restart_success(bot: Bot) -> None:
             details.append("⚠️ 重启耗时过长，建议检查：")
             details.append("  - 网络连接是否正常")
             details.append("  - 依赖安装是否卡住")
-            details.append(f"  - 启动日志: {ROOT_DIR}/logs/start.log")
+            details.append(f"  - 启动日志: {LOG_ROOT_PATH / 'start.log'}")
     else:
         message_lines.append("master 已重新上线 ✅")
 
@@ -1860,7 +1878,11 @@ async def _notify_restart_success(bot: Bot) -> None:
         # 重启成功后不再附带项目列表，避免高频重启时产生额外噪音
         log.info("重启成功通知已发送", extra={"chat": chat_id, "duration": restart_duration})
     finally:
-        _safe_remove(RESTART_SIGNAL_PATH)
+        candidates = (signal_path, RESTART_SIGNAL_PATH, *LEGACY_RESTART_SIGNAL_PATHS)
+        for candidate in candidates:
+            if candidate is None:
+                continue
+            _safe_remove(candidate)
 
 
 async def _ensure_manager() -> MasterManager:

scripts/master_healthcheck.py

@@ -25,11 +25,15 @@ from urllib.error import URLError, HTTPError
 from urllib.request import Request, urlopen
 
 # 导入 master 中的配置与工具，复用项目解析逻辑
+ROOT_DIR = Path(__file__).resolve().parent.parent
+ROOT_DIR_STR = str(ROOT_DIR)
+if ROOT_DIR_STR not in sys.path:
+    # 确保可以从仓库根目录导入 master 模块
+    sys.path.insert(0, ROOT_DIR_STR)
+
 import master  # type: ignore
 from project_repository import ProjectRepository
-
-ROOT_DIR = Path(__file__).resolve().parent.parent
-DEFAULT_MASTER_LOG = ROOT_DIR / "vibe.log"
+DEFAULT_MASTER_LOG = master.LOG_ROOT_PATH / "vibe.log"
 DEFAULT_TIMEOUT_MASTER = 60.0
 DEFAULT_TIMEOUT_PROBE = 15.0
 PROBE_TEXT = "hello"

scripts/start.sh

@@ -2,16 +2,21 @@
 set -eo pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-LOCK_FILE="$ROOT_DIR/state/master_restart.lock"
-LOG_DIR="$ROOT_DIR/logs"
+MASTER_CONFIG_ROOT="${MASTER_CONFIG_ROOT:-$HOME/.config/vibego}"
+STATE_DIR="$MASTER_CONFIG_ROOT/state"
+LOG_DIR="$MASTER_CONFIG_ROOT/logs"
+LOCK_FILE="$STATE_DIR/master_restart.lock"
 START_LOG="$LOG_DIR/start.log"
-CODEX_STAMP_FILE="$ROOT_DIR/state/npm_codex_install.stamp"
+CODEX_STAMP_FILE="$STATE_DIR/npm_codex_install.stamp"
 CODEX_INSTALL_TTL="${CODEX_INSTALL_TTL:-86400}"
 
 # 统一重启信号文件路径：使用配置目录而非代码目录
 # 这样 pipx 安装的 master 和源码运行的 master 可以共享同一个信号文件
-MASTER_CONFIG_ROOT="${MASTER_CONFIG_ROOT:-$HOME/.config/vibego}"
-export MASTER_RESTART_SIGNAL_PATH="$MASTER_CONFIG_ROOT/state/restart_signal.json"
+export MASTER_RESTART_SIGNAL_PATH="$STATE_DIR/restart_signal.json"
+export LOG_ROOT="${LOG_ROOT:-$LOG_DIR}"
+if [[ -z "${LOG_FILE:-}" ]]; then
+  export LOG_FILE="$LOG_DIR/vibe.log"
+fi
 
 log_line() {
   local ts
@@ -191,7 +196,7 @@ cleanup_old_master() {
   local max_wait=10  # 最多等待10秒优雅退出
   local waited=0
   local old_pids=""
-  local master_pid_file="${MASTER_CONFIG_ROOT:-$HOME/.config/vibego}/state/master.pid"
+  local master_pid_file="$STATE_DIR/master.pid"
 
   # 方案1：优先从 PID 文件读取
   if [[ -f "$master_pid_file" ]]; then
@@ -401,7 +406,7 @@ if ! kill -0 "$MASTER_PID" 2>/dev/null; then
   exit 1
 fi
 
-log_info "master 已后台启动，PID=$MASTER_PID，日志写入 vibe.log"
+log_info "master 已后台启动，PID=$MASTER_PID，日志写入 ${LOG_FILE}"
 
 # 健康检查：等待 master 上线并验证关键 worker
 log_info "开始执行健康检查..."
@@ -417,8 +422,8 @@ else
   log_error "⚠️ master 健康检查失败，耗时 ${HEALTHCHECK_DURATION}s"
   log_error "建议检查："
   log_error "  - 进程状态: ps aux | grep 'python.*master.py'"
-  log_error "  - 启动日志: tail -100 $ROOT_DIR/logs/start.log"
-  log_error "  - 运行日志: tail -100 $ROOT_DIR/vibe.log"
+  log_error "  - 启动日志: tail -100 $LOG_DIR/start.log"
+  log_error "  - 运行日志: tail -100 $LOG_FILE"
   log_error "  - 进程 PID: $MASTER_PID"
 
   # 检查进程是否仍在运行

scripts/stop_all.sh

@@ -2,9 +2,13 @@
 set -euo pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-STATE_DIR="$ROOT_DIR/state"
+MASTER_CONFIG_ROOT="${MASTER_CONFIG_ROOT:-$HOME/.config/vibego}"
+STATE_DIR="$MASTER_CONFIG_ROOT/state"
 LOCK_FILE="$STATE_DIR/master_restart.lock"
 RESTART_SIGNAL="$STATE_DIR/restart_signal.json"
+LEGACY_STATE_DIR="$ROOT_DIR/state"
+LEGACY_LOCK_FILE="$LEGACY_STATE_DIR/master_restart.lock"
+LEGACY_RESTART_SIGNAL="$LEGACY_STATE_DIR/restart_signal.json"
 DEFAULT_TMUX_PREFIX="${TMUX_SESSION_PREFIX:-vibe}"
 STOP_BOT_SCRIPT="$ROOT_DIR/scripts/stop_bot.sh"
 
@@ -138,7 +142,7 @@ stop_tmux_sessions() {
 
 cleanup_state_files() {
   local removed=0
-  for file in "$LOCK_FILE" "$RESTART_SIGNAL"; do
+  for file in "$LOCK_FILE" "$RESTART_SIGNAL" "$LEGACY_LOCK_FILE" "$LEGACY_RESTART_SIGNAL"; do
     if [[ -e "$file" ]]; then
       if (( DRY_RUN )); then
         log_info "[dry-run] rm -f $file"

{vibego-0.2.42.dist-info → vibego-0.2.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vibego
-Version: 0.2.42
+Version: 0.2.43
 Summary: vibego CLI：用于初始化与管理 Telegram Master Bot 的工具
 Author: Hypha
 License-Expression: LicenseRef-Proprietary

{vibego-0.2.42.dist-info → vibego-0.2.43.dist-info}/RECORD

@@ -1,17 +1,17 @@
 bot.py,sha256=TthqY_Rvndzd3pgLH6lvPcsDXQbwkuMfB4W9qt_Li8I,273832
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
-master.py,sha256=ZW4A3Gh0MUKFnfZX-VJ7OCNnBzlEcOWkPKYH92OfyKA,112967
+master.py,sha256=uFRhROoRvd93CTRzS6DdlvxMYok7q1jRWZwe8QrTqIY,113997
 project_repository.py,sha256=UcthtSGOJK0cTE5bQCneo3xkomRG-kyc1N1QVqxeHIs,17577
 scripts/__init__.py,sha256=LVrXUkvWKoc6Sb47X5G0gbIxu5aJ2ARW-qJ14vwi5vM,65
 scripts/bump_version.sh,sha256=a4uB8V8Y5LPsoqTCdzQKsEE8HhwpBmqRaQInG52LDig,4089
 scripts/log_writer.py,sha256=8euoMlRo7cbtHApbcEoJnwzLABxti-ovJWFLRN1oDQw,3843
-scripts/master_healthcheck.py,sha256=-X0VVsZ0AXaOb7izxTO_oyu23g_1jsirNdGIcP8nrSI,8321
+scripts/master_healthcheck.py,sha256=kvE6owdqyLmfQ-UYY_jglg86xFzOc87sINxBe5_qWzk,8489
 scripts/publish.sh,sha256=ehLfMedcXuGKJ87jpZy3kuiFszG9Cpavp3zXPfR4h-g,3511
 scripts/requirements.txt,sha256=ukJbFLJyzqnQYMz6j07O-IOrG87IwXg0oikmn1nfJ9M,91
 scripts/run_bot.sh,sha256=rN4K1nz041XBaUJmnBBKHS2cHmQf11vPNX8wf1hbVR4,4596
-scripts/start.sh,sha256=w1Q35NB-9FRZAez5I5veqgYIJ8XnVukGt8TTE_ad248,13608
+scripts/start.sh,sha256=1jmO-UVsLskIMdh_2qn130PZ80bVl3CiFpP6XKaXiJk,13695
 scripts/start_tmux_codex.sh,sha256=xyLv29p924q-ysxvZYAP3T6VrqLPBPMBWo9QP7cuL50,4438
-scripts/stop_all.sh,sha256=FOz07gi2CI9sMHxBb8XkqHtxRYs3jt1RYgGrEi-htVg,4086
+scripts/stop_all.sh,sha256=VbNX4h8g1RcnGmLyutPcSySTHb84eIMbo3Ve9Vh-CDg,4360
 scripts/stop_bot.sh,sha256=ot6Sm0IYoXuRNslUVEflQmJKu5Agm-5xIUXXudJWyTM,5588
 scripts/test_deps_check.sh,sha256=AeSTucbNuNdOPSGvqVp0m31TVFDb0DmU8gSKg-Y5z2I,1696
 scripts/.venv/lib/python3.14/site-packages/pip/__init__.py,sha256=_lgs5Mfp0t7AGtI7sTVwxKWquz_vahWWH9kKO1cJusA,353
@@ -426,14 +426,14 @@ tasks/constants.py,sha256=tS1kZxBIUm3JJUMHm25XI-KHNUZl5NhbbuzjzL_rF-c,299
 tasks/fsm.py,sha256=rKXXLEieQQU4r2z_CZUvn1_70FXiZXBBugF40gpe_tQ,1476
 tasks/models.py,sha256=N_qqRBo9xMSV0vbn4k6bLBXT8C_dp_oTFUxvdx16ZQM,2459
 tasks/service.py,sha256=w_S_aWiVqRXzXEpimLDsuCCCX2lB5uDkff9aKThBw9c,41916
-vibego_cli/__init__.py,sha256=dM5R5cK5kft5hzz0-VxwpKzzUMt5ZpQqfPLQaDyAILg,311
+vibego_cli/__init__.py,sha256=kV9sTUnKB8boKxSGFUxB66yqQiYg2LvSz9Yu-vLd8_0,311
 vibego_cli/__main__.py,sha256=qqTrYmRRLe4361fMzbI3-CqpZ7AhTofIHmfp4ykrrBY,158
 vibego_cli/config.py,sha256=VxkPJMq01tA3h3cOkH-z_tiP7pMgfSGGicRvUnCWkhI,3054
 vibego_cli/deps.py,sha256=1nRXI7Dd-S1hYE8DligzK5fIluQWETRUj4_OKL0DikQ,1419
 vibego_cli/main.py,sha256=X__NXwZnIDIFbdKSTbNyZgZHKcPlN0DQz9sqTI1aQ9E,12158
 vibego_cli/data/worker_requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
-vibego-0.2.42.dist-info/METADATA,sha256=Nw9HJPv7fH0iQmxjRx7wQ_mDoODZ_1hcwmVwJC5TvTI,10519
-vibego-0.2.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.42.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.42.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.42.dist-info/RECORD,,
+vibego-0.2.43.dist-info/METADATA,sha256=dl3SxrEq4PXFbvL7S9NfXaKYvGyA4XZQr89290NTaV8,10519
+vibego-0.2.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.43.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.43.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.43.dist-info/RECORD,,

vibego_cli/__init__.py

@@ -7,6 +7,6 @@ from __future__ import annotations
 
 __all__ = ["main", "__version__"]
 
-__version__ = "0.2.42"
+__version__ = "0.2.43"
 
 from .main import main  # noqa: E402