vibego 0.2.9__py3-none-any.whl → 0.2.11__py3-none-any.whl

bot.py

@@ -4450,7 +4450,14 @@ def _extract_codex_payload(data: dict, *, event_timestamp: Optional[str]) -> Opt
     return None
 
 
-def _extract_claudecode_payload(data: dict, *, event_timestamp: Optional[str]) -> Optional[Tuple[str, str, Optional[Dict[str, Any]]]]:
+def _extract_claudecode_payload(
+    data: dict, *, event_timestamp: Optional[str]
+) -> Optional[Tuple[str, str, Optional[Dict[str, Any]]]]:
+    # Claude Code 在启动时会输出 isSidechain=true 的欢迎语，此类事件直接忽略
+    sidechain_flag = data.get("isSidechain")
+    if isinstance(sidechain_flag, bool) and sidechain_flag:
+        return None
+
     event_type = data.get("type")
 
     if event_type == "assistant":
@@ -4463,20 +4470,11 @@ def _extract_claudecode_payload(data: dict, *, event_timestamp: Optional[str]) -
                     if not isinstance(item, dict):
                         continue
                     item_type = item.get("type")
-                    if item_type in {"thinking", "tool_use"}:
-                        continue
-                    if item_type == "tool_result":
-                        tool_output = item.get("output")
-                        if isinstance(tool_output, str) and tool_output.strip():
-                            fragments.append(tool_output.strip())
-                        content_value = item.get("content")
-                        if isinstance(content_value, str) and content_value.strip():
-                            fragments.append(content_value.strip())
+                    if item_type != "text":
                         continue
-                    if item_type in {"text", "output_text", "markdown"}:
-                        text_value = item.get("text") or item.get("markdown")
-                        if isinstance(text_value, str) and text_value.strip():
-                            fragments.append(text_value)
+                    text_value = item.get("text")
+                    if isinstance(text_value, str) and text_value.strip():
+                        fragments.append(text_value)
                 if fragments:
                     combined = "\n\n".join(fragments)
                     metadata: Optional[Dict[str, Any]] = None

master.py

@@ -1716,13 +1716,8 @@ async def _notify_restart_success(bot: Bot) -> None:
     except Exception as exc:
         log.error("发送重启成功通知失败: %s", exc, extra={"chat": chat_id})
     else:
+        # 重启成功后不再附带项目列表，避免高频重启时产生额外噪音
         log.info("重启成功通知已发送", extra={"chat": chat_id})
-        try:
-            manager = await _ensure_manager()
-        except Exception as ensure_exc:
-            log.error("发送项目概览前获取 manager 失败: %s", ensure_exc)
-        else:
-            await _send_projects_overview_to_chat(bot, chat_id, manager)
     finally:
         _safe_remove(RESTART_SIGNAL_PATH)
 

scripts/start.sh

@@ -102,6 +102,84 @@ ensure_codex_installed() {
 
 ensure_codex_installed
 
+select_python_binary() {
+  # 选择满足 CPython <=3.13 的解释器，避免 PyO3 依赖构建失败
+  local candidates=()
+  local chosen=""
+  local name
+  if [[ -n "${VIBEGO_PYTHON:-}" ]]; then
+    candidates+=("$VIBEGO_PYTHON")
+  fi
+  for name in python3.13 python3.12 python3.11 python3.10 python3.9 python3; do
+    if [[ "${VIBEGO_PYTHON:-}" == "$name" ]]; then
+      continue
+    fi
+    candidates+=("$name")
+  done
+
+  for name in "${candidates[@]}"; do
+    if [[ -z "$name" ]]; then
+      continue
+    fi
+    if ! command -v "$name" >/dev/null 2>&1; then
+      continue
+    fi
+    local version_raw
+    version_raw=$("$name" -c 'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")' 2>/dev/null) || continue
+    local major="${version_raw%%.*}"
+    local minor="${version_raw#*.}"
+    if [[ "$major" != "3" ]]; then
+      log_info "跳过 ${name} (版本 ${version_raw})：非 CPython 3.x"
+      continue
+    fi
+    if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor > 13 )); then
+      log_info "跳过 ${name} (版本 ${version_raw})：高于 3.13"
+      continue
+    fi
+    if [[ "$minor" =~ ^[0-9]+$ ]] && (( minor < 9 )); then
+      log_info "跳过 ${name} (版本 ${version_raw})：低于 3.9，可能缺少官方轮子"
+      continue
+    fi
+    chosen="$name"
+    log_info "使用 Python 解释器：${chosen} (版本 ${version_raw})"
+    break
+  done
+
+  if [[ -z "$chosen" ]]; then
+    log_error "未找到满足 <=3.13 的 Python 解释器，可通过设置 VIBEGO_PYTHON 指定路径"
+    exit 1
+  fi
+
+  printf '%s' "$chosen"
+}
+
+# 检查Python依赖是否已安装完整
+check_deps_installed() {
+  # 检查虚拟环境是否存在
+  if [[ ! -d "$ROOT_DIR/.venv" ]]; then
+    log_info "虚拟环境不存在，需要初始化"
+    return 1
+  fi
+
+  # 检查虚拟环境的Python解释器
+  if [[ ! -x "$ROOT_DIR/.venv/bin/python" ]]; then
+    log_info "虚拟环境Python解释器缺失"
+    return 1
+  fi
+
+  # 激活虚拟环境并检查关键依赖包
+  # aiogram: Telegram Bot框架
+  # aiohttp: 异步HTTP客户端
+  # aiosqlite: 异步SQLite数据库
+  if ! "$ROOT_DIR/.venv/bin/python" -c "import aiogram, aiohttp, aiosqlite" 2>/dev/null; then
+    log_info "关键依赖包缺失或损坏"
+    return 1
+  fi
+
+  log_info "依赖检查通过，虚拟环境完整"
+  return 0
+}
+
 if pgrep -f "python.*master.py" >/dev/null 2>&1; then
   log_info "检测到历史 master 实例，正在终止..."
   pkill -f "python.*master.py" || true
@@ -118,24 +196,38 @@ if pgrep -f "python.*master.py" >/dev/null 2>&1; then
   log_info "历史 master 实例已清理"
 fi
 
-# 创建并启用虚拟环境
-python3 -m venv .venv
-source .venv/bin/activate
-
-# 安装依赖
+# 智能依赖管理：仅在必要时安装
 REQUIREMENTS_FILE="${VIBEGO_REQUIREMENTS_PATH:-$ROOT_DIR/scripts/requirements.txt}"
 if [[ ! -f "$REQUIREMENTS_FILE" ]]; then
   log_error "依赖文件缺失: $REQUIREMENTS_FILE"
   exit 1
 fi
-pip install -r "$REQUIREMENTS_FILE"
+
+PYTHON_BIN="$(select_python_binary)"
+
+# 检查是否需要安装依赖
+if check_deps_installed; then
+  log_info "依赖已安装且完整，跳过pip install（加速重启）"
+  source .venv/bin/activate
+else
+  log_info "首次启动或依赖缺失，正在安装依赖..."
+
+  # 创建或重建虚拟环境
+  "$PYTHON_BIN" -m venv .venv
+  source .venv/bin/activate
+
+  # 安装依赖
+  log_info "开始执行 pip install -r $REQUIREMENTS_FILE"
+  pip install -r "$REQUIREMENTS_FILE"
+  log_info "依赖安装完成"
+fi
 
 # 后台启动 master，日志落在 vibe.log
-nohup python3 master.py >> /dev/null 2>&1 &
+nohup python master.py >> /dev/null 2>&1 &
 log_info "master 已后台启动，日志写入 vibe.log"
 
 # 健康检查：等待 master 上线并验证关键 worker
-if ! python3 scripts/master_healthcheck.py --project hyphavibebotbackend; then
+if ! python scripts/master_healthcheck.py --project hyphavibebotbackend; then
   log_error "master 健康检查失败，请查看 logs/start.log / vibe.log"
   exit 1
 fi

scripts/test_deps_check.sh

@@ -0,0 +1,66 @@
+#!/usr/bin/env bash
+# 测试依赖检查函数的逻辑
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+
+echo "=== 测试依赖检查函数 ==="
+echo "ROOT_DIR: $ROOT_DIR"
+echo ""
+
+# 从start.sh提取check_deps_installed函数进行测试
+check_deps_installed() {
+  if [[ ! -d "$ROOT_DIR/.venv" ]]; then
+    echo "❌ 虚拟环境不存在"
+    return 1
+  fi
+
+  if [[ ! -x "$ROOT_DIR/.venv/bin/python" ]]; then
+    echo "❌ 虚拟环境Python解释器缺失"
+    return 1
+  fi
+
+  if ! "$ROOT_DIR/.venv/bin/python" -c "import aiogram, aiohttp, aiosqlite" 2>/dev/null; then
+    echo "❌ 关键依赖包缺失或损坏"
+    return 1
+  fi
+
+  echo "✅ 依赖检查通过"
+  return 0
+}
+
+# 测试1：检查当前环境
+echo "【测试1】检查当前虚拟环境状态："
+if check_deps_installed; then
+  echo "结果：依赖完整，重启时将跳过pip install"
+else
+  echo "结果：依赖缺失，重启时将执行pip install"
+fi
+echo ""
+
+# 测试2：检查虚拟环境目录
+echo "【测试2】虚拟环境目录检查："
+if [[ -d "$ROOT_DIR/.venv" ]]; then
+  echo "✅ .venv 目录存在"
+  ls -lh "$ROOT_DIR/.venv/bin/python" 2>/dev/null || echo "❌ Python解释器不存在"
+else
+  echo "❌ .venv 目录不存在"
+fi
+echo ""
+
+# 测试3：检查关键依赖
+echo "【测试3】关键依赖包检查："
+if [[ -x "$ROOT_DIR/.venv/bin/python" ]]; then
+  for pkg in aiogram aiohttp aiosqlite; do
+    if "$ROOT_DIR/.venv/bin/python" -c "import $pkg" 2>/dev/null; then
+      echo "✅ $pkg 已安装"
+    else
+      echo "❌ $pkg 未安装"
+    fi
+  done
+else
+  echo "⚠️  无法检查（Python解释器不可用）"
+fi
+echo ""
+
+echo "=== 测试完成 ==="

{vibego-0.2.9.dist-info → vibego-0.2.11.dist-info}/METADATA

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

{vibego-0.2.9.dist-info → vibego-0.2.11.dist-info}/RECORD

@@ -1,16 +1,17 @@
-bot.py,sha256=4MV72uB4S_D7A6Akm4isN_NPH9CUOUMQi0EWACiAsbQ,250226
+bot.py,sha256=q_aRgSBen4XThKdExfa-6NeX9R_Mgs0UjXYx32rsGzo,249827
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
-master.py,sha256=q_CNNW8L_N4kp7LRQR16XGhboPk-0ocH28D23f40U7k,106675
+master.py,sha256=Qz2NTapUexVvpQz8Y_pVhKd-uXkqp3M6oclzfAzIuGs,106497
 project_repository.py,sha256=UcthtSGOJK0cTE5bQCneo3xkomRG-kyc1N1QVqxeHIs,17577
 scripts/__init__.py,sha256=LVrXUkvWKoc6Sb47X5G0gbIxu5aJ2ARW-qJ14vwi5vM,65
 scripts/log_writer.py,sha256=8euoMlRo7cbtHApbcEoJnwzLABxti-ovJWFLRN1oDQw,3843
 scripts/master_healthcheck.py,sha256=-X0VVsZ0AXaOb7izxTO_oyu23g_1jsirNdGIcP8nrSI,8321
 scripts/requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
 scripts/run_bot.sh,sha256=rM2Op_l4mP9asT3VoTwGQuHocwaxiGyQp2l1PLegsY4,4481
-scripts/start.sh,sha256=lYCzQcgN_TC1rAhaboKrtnLJQEjBDb3PFQLfaF_j8TA,4047
+scripts/start.sh,sha256=IsNjFWXX3qmFxx_7iiVEidTj9VHBUTkNNbsCPoNSL0E,6782
 scripts/start_tmux_codex.sh,sha256=4ko72SK7EDJmzXVuLBOz1_S1lLEmgIpLAVuD7mZhpdk,4018
 scripts/stop_all.sh,sha256=FOz07gi2CI9sMHxBb8XkqHtxRYs3jt1RYgGrEi-htVg,4086
 scripts/stop_bot.sh,sha256=b9vvrke5jeyO18SEBFZxQD09Gf65BgGzeKtpM8sa60Y,3677
+scripts/test_deps_check.sh,sha256=AeSTucbNuNdOPSGvqVp0m31TVFDb0DmU8gSKg-Y5z2I,1696
 scripts/.venv/lib/python3.14/site-packages/pip/__init__.py,sha256=_lgs5Mfp0t7AGtI7sTVwxKWquz_vahWWH9kKO1cJusA,353
 scripts/.venv/lib/python3.14/site-packages/pip/__main__.py,sha256=WzbhHXTbSE6gBY19mNN9m4s5o_365LOvTYSgqgbdBhE,854
 scripts/.venv/lib/python3.14/site-packages/pip/__pip-runner__.py,sha256=JOoEZTwrtv7jRaXBkgSQKAE04yNyfFmGHxqpHiGHvL0,1450
@@ -429,8 +430,8 @@ vibego_cli/config.py,sha256=33WSORCfUIxrDtgASPEbVqVLBVNHh-RSFLpNy7tfc0s,2992
 vibego_cli/deps.py,sha256=1nRXI7Dd-S1hYE8DligzK5fIluQWETRUj4_OKL0DikQ,1419
 vibego_cli/main.py,sha256=e2W5Pb9U9rfmF-jNX9uIA3222lhM0GgcvSdFTDBZd2s,12086
 vibego_cli/data/worker_requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
-vibego-0.2.9.dist-info/METADATA,sha256=Fkdl2D7I5PvrsV8QDsbnC8Fd2NTm-D6TfkGaLx3T4oA,10474
-vibego-0.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.9.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.9.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.9.dist-info/RECORD,,
+vibego-0.2.11.dist-info/METADATA,sha256=qdYmMPXO440tHnQCLv6SojrTvBsPqj2Pbi1sUrKp9KI,10475
+vibego-0.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.11.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.11.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.11.dist-info/RECORD,,