vibego 0.2.29__py3-none-any.whl → 0.2.31__py3-none-any.whl

bot.py

@@ -623,8 +623,10 @@ def _unescape_if_already_escaped(text: str) -> str:
 
 def _prepare_model_payload(text: str) -> str:
     if _IS_MARKDOWN_V2:
-        # 先转换标准 Markdown 格式为 Telegram 支持的格式
-        normalized = _normalize_to_telegram_markdown(text)
+        # 先反转义已转义的内容，避免双重转义
+        cleaned = _unescape_if_already_escaped(text)
+        # 转换标准 Markdown 格式为 Telegram 支持的格式
+        normalized = _normalize_to_telegram_markdown(cleaned)
         # 再进行 MarkdownV2 转义
         return _escape_markdown_v2(normalized)
     if _IS_MARKDOWN:

master.py

@@ -62,9 +62,28 @@ CONFIG_DB_PATH = Path(os.environ.get("MASTER_PROJECTS_DB_PATH", ROOT_DIR / "conf
 STATE_PATH = Path(os.environ.get("MASTER_STATE_PATH", ROOT_DIR / "state/state.json"))
 RUN_SCRIPT = ROOT_DIR / "scripts/run_bot.sh"
 STOP_SCRIPT = ROOT_DIR / "scripts/stop_bot.sh"
-RESTART_SIGNAL_PATH = Path(
-    os.environ.get("MASTER_RESTART_SIGNAL_PATH", ROOT_DIR / "state/restart_signal.json")
-)
+
+
+def _get_restart_signal_path() -> Path:
+    """
+    获取重启信号文件路径，使用健壮的默认值逻辑。
+
+    优先级：
+    1. 环境变量 MASTER_RESTART_SIGNAL_PATH
+    2. 配置目录 $MASTER_CONFIG_ROOT/state/restart_signal.json
+    3. 代码目录 ROOT_DIR/state/restart_signal.json（兜底）
+
+    这样可以确保 pipx 安装的版本和源码运行的版本使用同一个信号文件。
+    """
+    if env_path := os.environ.get("MASTER_RESTART_SIGNAL_PATH"):
+        return Path(env_path)
+
+    # 默认使用配置目录而非代码目录，确保跨安装方式的一致性
+    config_root = Path(os.environ.get("MASTER_CONFIG_ROOT", Path.home() / ".config/vibego"))
+    return config_root / "state/restart_signal.json"
+
+
+RESTART_SIGNAL_PATH = _get_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
@@ -1681,9 +1700,14 @@ def _read_restart_signal() -> Optional[dict]:
 
 
 async def _notify_restart_success(bot: Bot) -> None:
-    """在新 master 启动时读取 signal 并通知触发者"""
+    """在新 master 启动时读取 signal 并通知触发者（改进版：支持超时检测和详细诊断）"""
     restart_expected = os.environ.pop("MASTER_RESTART_EXPECTED", None)
     payload = _read_restart_signal()
+
+    # 定义重启健康检查阈值（2 分钟）
+    RESTART_HEALTHY_THRESHOLD = 120  # 秒
+    RESTART_WARNING_THRESHOLD = 60   # 超过 1 分钟发出警告
+
     if not payload:
         if restart_expected:
             targets = _collect_admin_targets()
@@ -1691,6 +1715,18 @@ async def _notify_restart_success(bot: Bot) -> None:
                 "启动时未检测到重启信号文件，将向管理员发送兜底提醒", extra={"targets": targets}
             )
             if targets:
+                # 检查启动日志是否有错误信息
+                error_log_dir = ROOT_DIR / "logs"
+                error_log_hint = ""
+                try:
+                    error_logs = sorted(error_log_dir.glob("master_error_*.log"), key=lambda p: p.stat().st_mtime, reverse=True)
+                    if error_logs:
+                        latest_error_log = error_logs[0]
+                        if latest_error_log.stat().st_size > 0:
+                            error_log_hint = f"\n⚠️ 发现错误日志：{latest_error_log}"
+                except Exception:
+                    pass
+
                 text_lines = [
                     "⚠️ Master 已重新上线，但未找到重启触发者信息。",
                     "",
@@ -1698,12 +1734,16 @@ async def _notify_restart_success(bot: Bot) -> None:
                     "1. 重启信号文件写入失败",
                     "2. 信号文件已超时被清理（TTL=30分钟）",
                     "3. 文件系统权限问题",
+                    "4. start.sh 启动失败后被清理",
                     "",
                     "建议检查：",
                     f"- 启动日志: {ROOT_DIR}/logs/start.log",
                     f"- 运行日志: {ROOT_DIR}/vibe.log",
                     f"- 信号文件: {RESTART_SIGNAL_PATH}",
                 ]
+                if error_log_hint:
+                    text_lines.append(error_log_hint)
+
                 text = "\n".join(text_lines)
                 for chat in targets:
                     try:
@@ -1727,6 +1767,9 @@ async def _notify_restart_success(bot: Bot) -> None:
     user_id = payload.get("user_id")
     timestamp = payload.get("timestamp")
     timestamp_fmt: Optional[str] = None
+    restart_duration: Optional[int] = None
+
+    # 计算重启耗时
     if timestamp:
         try:
             ts = datetime.fromisoformat(timestamp)
@@ -1734,6 +1777,10 @@ async def _notify_restart_success(bot: Bot) -> None:
                 ts = ts.replace(tzinfo=LOCAL_TZ)
             ts_local = ts.astimezone(LOCAL_TZ)
             timestamp_fmt = ts_local.strftime("%Y-%m-%d %H:%M:%S %Z")
+
+            # 计算重启耗时（秒）
+            now = datetime.now(LOCAL_TZ)
+            restart_duration = int((now - ts_local).total_seconds())
         except Exception as exc:
             log.warning("解析重启时间失败: %s", exc)
 
@@ -1745,7 +1792,23 @@ async def _notify_restart_success(bot: Bot) -> None:
     if timestamp_fmt:
         details.append(f"请求时间：{timestamp_fmt}")
 
-    message_lines = ["master 已重新上线 ✅"]
+    # 添加重启耗时信息和健康状态
+    message_lines = []
+    if restart_duration is not None:
+        if restart_duration <= RESTART_WARNING_THRESHOLD:
+            message_lines.append(f"master 已重新上线 ✅（耗时 {restart_duration}秒）")
+        elif restart_duration <= RESTART_HEALTHY_THRESHOLD:
+            message_lines.append(f"⚠️ master 已重新上线（耗时 {restart_duration}秒，略慢）")
+            details.append("💡 建议：检查依赖安装是否触发了重新下载")
+        else:
+            message_lines.append(f"⚠️ master 已重新上线（耗时 {restart_duration}秒，异常缓慢）")
+            details.append("⚠️ 重启耗时过长，建议检查：")
+            details.append("  - 网络连接是否正常")
+            details.append("  - 依赖安装是否卡住")
+            details.append(f"  - 启动日志: {ROOT_DIR}/logs/start.log")
+    else:
+        message_lines.append("master 已重新上线 ✅")
+
     if details:
         message_lines.extend(details)
 
@@ -1757,7 +1820,7 @@ async def _notify_restart_success(bot: Bot) -> None:
         log.error("发送重启成功通知失败: %s", exc, extra={"chat": chat_id})
     else:
         # 重启成功后不再附带项目列表，避免高频重启时产生额外噪音
-        log.info("重启成功通知已发送", extra={"chat": chat_id})
+        log.info("重启成功通知已发送", extra={"chat": chat_id, "duration": restart_duration})
     finally:
         _safe_remove(RESTART_SIGNAL_PATH)
 
@@ -2866,6 +2929,18 @@ async def main() -> None:
 
     manager = await bootstrap_manager()
 
+    # 诊断日志：记录重启信号文件路径，便于排查问题
+    log.info(
+        "重启信号文件路径: %s (存在: %s)",
+        RESTART_SIGNAL_PATH,
+        RESTART_SIGNAL_PATH.exists(),
+        extra={
+            "signal_path": str(RESTART_SIGNAL_PATH),
+            "signal_exists": RESTART_SIGNAL_PATH.exists(),
+            "env_override": os.environ.get("MASTER_RESTART_SIGNAL_PATH"),
+        },
+    )
+
     master_token = os.environ.get("MASTER_BOT_TOKEN")
     if not master_token:
         log.error("MASTER_BOT_TOKEN 未设置")

scripts/start.sh

@@ -186,21 +186,105 @@ check_deps_installed() {
   return 0
 }
 
-if pgrep -f "python.*master.py" >/dev/null 2>&1; then
-  log_info "检测到历史 master 实例，正在终止..."
-  pkill -f "python.*master.py" || true
-  sleep 1
-  if pgrep -f "python.*master.py" >/dev/null 2>&1; then
-    log_info "残留 master 进程仍在，执行强制结束"
-    pkill -9 -f "python.*master.py" || true
-    sleep 1
+# 清理旧 master 进程的健壮函数（改进版：支持 PID 文件 + pgrep 双保险）
+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"
+
+  # 方案1：优先从 PID 文件读取
+  if [[ -f "$master_pid_file" ]]; then
+    local pid_from_file
+    pid_from_file=$(cat "$master_pid_file" 2>/dev/null || true)
+    if [[ "$pid_from_file" =~ ^[0-9]+$ ]]; then
+      if kill -0 "$pid_from_file" 2>/dev/null; then
+        old_pids="$pid_from_file"
+        log_info "从 PID 文件检测到旧 master 实例（PID: $old_pids）"
+      else
+        log_info "PID 文件存在但进程已不在，清理过期 PID 文件"
+        rm -f "$master_pid_file"
+      fi
+    fi
+  fi
+
+  # 方案2：使用 pgrep 查找（支持多种运行方式）
+  if [[ -z "$old_pids" ]]; then
+    # 匹配模式：支持源码运行和 pipx 安装的方式
+    # - python.*master.py（源码运行）
+    # - Python.*master.py（macOS 上的 Python.app）
+    # - bot.py（pipx 安装的 master 别名）
+    local pgrep_pids
+    pgrep_pids=$(pgrep -f "master\.py$" 2>/dev/null || true)
+    if [[ -n "$pgrep_pids" ]]; then
+      old_pids="$pgrep_pids"
+      log_info "通过 pgrep 检测到旧 master 实例（PID: $old_pids）"
+    fi
   fi
-  if pgrep -f "python.*master.py" >/dev/null 2>&1; then
-    log_error "仍存在 master 进程，请手动检查后再启动"
+
+  # 如果两种方式都没找到，说明没有旧进程
+  if [[ -z "$old_pids" ]]; then
+    log_info "未检测到旧 master 实例"
+    return 0
+  fi
+
+  # 开始清理旧进程
+  log_info "正在优雅终止旧 master 实例（PID: $old_pids）..."
+
+  # 发送 SIGTERM 信号优雅终止
+  for pid in $old_pids; do
+    kill -15 "$pid" 2>/dev/null || true
+  done
+
+  # 循环等待进程退出
+  while (( waited < max_wait )); do
+    sleep 1
+    ((waited++))
+
+    # 检查所有 PID 是否都已退出
+    local all_exited=1
+    for pid in $old_pids; do
+      if kill -0 "$pid" 2>/dev/null; then
+        all_exited=0
+        break
+      fi
+    done
+
+    if (( all_exited )); then
+      log_info "✅ 旧 master 已优雅退出（耗时 ${waited}秒）"
+      rm -f "$master_pid_file"
+      return 0
+    fi
+  done
+
+  # 优雅终止超时，执行强制结束
+  log_info "优雅终止超时（${max_wait}秒），执行强制结束..."
+  for pid in $old_pids; do
+    kill -9 "$pid" 2>/dev/null || true
+  done
+  sleep 2
+
+  # 最后检查
+  local remaining_pids=""
+  for pid in $old_pids; do
+    if kill -0 "$pid" 2>/dev/null; then
+      remaining_pids="$remaining_pids $pid"
+    fi
+  done
+
+  if [[ -n "$remaining_pids" ]]; then
+    log_error "❌ 无法清理旧 master 进程（残留 PID:$remaining_pids）"
+    log_error "请手动执行: kill -9$remaining_pids"
     exit 1
   fi
-  log_info "历史 master 实例已清理"
-fi
+
+  log_info "✅ 旧 master 实例已强制清理"
+  rm -f "$master_pid_file"
+  return 0
+}
+
+# 调用清理函数
+cleanup_old_master
 
 # 智能依赖管理：仅在必要时安装
 REQUIREMENTS_FILE="${VIBEGO_REQUIREMENTS_PATH:-$ROOT_DIR/scripts/requirements.txt}"
@@ -256,7 +340,34 @@ if [[ -n "${MASTER_RESTART_EXPECTED:-}" ]]; then
 fi
 
 log_info "准备启动 master 进程..."
-nohup python master.py >> /dev/null 2>&1 &
+
+# 清理旧的错误日志（保留最近 10 次）
+cleanup_old_error_logs() {
+  local error_log_pattern="$LOG_DIR/master_error_*.log"
+  local error_logs
+  error_logs=$(ls -t $error_log_pattern 2>/dev/null || true)
+  if [[ -n "$error_logs" ]]; then
+    local count=0
+    while IFS= read -r logfile; do
+      ((count++))
+      if (( count > 10 )); then
+        rm -f "$logfile"
+        log_info "已清理旧错误日志: $logfile"
+      fi
+    done <<< "$error_logs"
+  fi
+}
+
+cleanup_old_error_logs
+
+# 创建带时间戳的错误日志文件
+MASTER_ERROR_LOG="$LOG_DIR/master_error_$(date +%Y%m%d_%H%M%S).log"
+MASTER_STDOUT_LOG="$LOG_DIR/master_stdout.log"
+
+# 显式传递环境变量给 nohup 进程，确保重启信号文件路径正确
+# 使用虚拟环境的 Python 解释器，避免版本不匹配导致依赖加载失败
+# 重要：将 stderr 保存到日志文件，方便排查启动失败问题
+MASTER_RESTART_SIGNAL_PATH="$MASTER_RESTART_SIGNAL_PATH" nohup "$ROOT_DIR/.venv/bin/python" master.py > "$MASTER_STDOUT_LOG" 2> "$MASTER_ERROR_LOG" &
 MASTER_PID=$!
 
 # 健壮性检查：确保进程成功启动
@@ -273,7 +384,20 @@ if ! kill -0 "$MASTER_PID" 2>/dev/null; then
   log_error "请检查："
   log_error "  - master.py 是否有语法错误: python master.py"
   log_error "  - 依赖是否完整: pip list | grep aiogram"
-  log_error "  - 最近的错误日志: tail -50 $ROOT_DIR/vibe.log"
+  log_error "  - 错误日志: $MASTER_ERROR_LOG"
+
+  # 输出错误日志的最后 20 行，帮助快速定位问题
+  if [[ -s "$MASTER_ERROR_LOG" ]]; then
+    log_error ""
+    log_error "=== 错误日志最后 20 行 ==="
+    tail -20 "$MASTER_ERROR_LOG" | while IFS= read -r line; do
+      log_error "  $line"
+    done
+    log_error "=========================="
+  else
+    log_error "错误日志文件为空，可能是环境变量或路径问题"
+  fi
+
   exit 1
 fi
 

{vibego-0.2.29.dist-info → vibego-0.2.31.dist-info}/METADATA

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

{vibego-0.2.29.dist-info → vibego-0.2.31.dist-info}/RECORD

@@ -1,6 +1,6 @@
-bot.py,sha256=2CYEIkjH4DKxqa26WEYdFfYc6DttFRLX7buh3acSrKE,271931
+bot.py,sha256=uJcmMJmj5SlpwUXSgtnIEeNiUGkBg-lG5g6kM9BobP4,272046
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
-master.py,sha256=mA8eXtTGHrtqZ3MB4u56unHnq8NEMm3HZ2GikxRFeYY,108225
+master.py,sha256=2GxQh0rL7A_cEaH0RzO8DSwtau9T2cSJzOkhZ8ezHfs,111498
 project_repository.py,sha256=UcthtSGOJK0cTE5bQCneo3xkomRG-kyc1N1QVqxeHIs,17577
 scripts/__init__.py,sha256=LVrXUkvWKoc6Sb47X5G0gbIxu5aJ2ARW-qJ14vwi5vM,65
 scripts/bump_version.sh,sha256=a4uB8V8Y5LPsoqTCdzQKsEE8HhwpBmqRaQInG52LDig,4089
@@ -9,7 +9,7 @@ scripts/master_healthcheck.py,sha256=-X0VVsZ0AXaOb7izxTO_oyu23g_1jsirNdGIcP8nrSI
 scripts/publish.sh,sha256=ehLfMedcXuGKJ87jpZy3kuiFszG9Cpavp3zXPfR4h-g,3511
 scripts/requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
 scripts/run_bot.sh,sha256=rN4K1nz041XBaUJmnBBKHS2cHmQf11vPNX8wf1hbVR4,4596
-scripts/start.sh,sha256=b9YXd3pxCdSO8Ij1utCHfA897nhNK5Fcd4jsSW0tMPU,9857
+scripts/start.sh,sha256=w1Q35NB-9FRZAez5I5veqgYIJ8XnVukGt8TTE_ad248,13608
 scripts/start_tmux_codex.sh,sha256=xyLv29p924q-ysxvZYAP3T6VrqLPBPMBWo9QP7cuL50,4438
 scripts/stop_all.sh,sha256=FOz07gi2CI9sMHxBb8XkqHtxRYs3jt1RYgGrEi-htVg,4086
 scripts/stop_bot.sh,sha256=ot6Sm0IYoXuRNslUVEflQmJKu5Agm-5xIUXXudJWyTM,5588
@@ -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=61buX089vb0PZ-RiczZ0GC5cWtW3UF8Rzrbtz2jaCeA,311
+vibego_cli/__init__.py,sha256=QzEfWJBe5TQPIDo6c_5ayKnmn-2c3RHN0kZoHHPwiCQ,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.29.dist-info/METADATA,sha256=pdMyS37l5cTSjvT3VDskVou0t_8f64wP1SQ6qwiDszk,10475
-vibego-0.2.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.29.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.29.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.29.dist-info/RECORD,,
+vibego-0.2.31.dist-info/METADATA,sha256=hDq9uQe4YmG7kgon0jsy4lnurmqMD6PIZdXW41FSh4Y,10475
+vibego-0.2.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.31.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.31.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.31.dist-info/RECORD,,

vibego_cli/__init__.py

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