vibego 0.2.9__tar.gz → 0.2.10__tar.gz

{vibego-0.2.9 → vibego-0.2.10}/PKG-INFO

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

{vibego-0.2.9 → vibego-0.2.10}/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

{vibego-0.2.9 → vibego-0.2.10}/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)
 

{vibego-0.2.9 → vibego-0.2.10}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vibego"
-version = "0.2.9"
+version = "0.2.10"
 description = "vibego CLI：用于初始化与管理 Telegram Master Bot 的工具"
 readme = "README.md"
 requires-python = ">=3.11"

{vibego-0.2.9 → vibego-0.2.10}/scripts/start.sh

@@ -102,6 +102,57 @@ 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"
+}
+
 if pgrep -f "python.*master.py" >/dev/null 2>&1; then
   log_info "检测到历史 master 实例，正在终止..."
   pkill -f "python.*master.py" || true
@@ -119,7 +170,8 @@ if pgrep -f "python.*master.py" >/dev/null 2>&1; then
 fi
 
 # 创建并启用虚拟环境
-python3 -m venv .venv
+PYTHON_BIN="$(select_python_binary)"
+"$PYTHON_BIN" -m venv .venv
 source .venv/bin/activate
 
 # 安装依赖
@@ -131,11 +183,11 @@ fi
 pip install -r "$REQUIREMENTS_FILE"
 
 # 后台启动 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

{vibego-0.2.9 → vibego-0.2.10}/tests/test_claudecode_jsonl.py

@@ -1,17 +1,32 @@
-import importlib
 import os
+import pytest
+import sys
 import time
 from pathlib import Path
 
-os.environ.setdefault("BOT_TOKEN", "test-token")
-os.environ.setdefault("MODE", "B")
-os.environ.setdefault("ACTIVE_MODEL", "claudecode")
+ROOT = Path(__file__).resolve().parents[1]
+if str(ROOT) not in sys.path:
+    sys.path.insert(0, str(ROOT))
 
-bot = importlib.import_module("bot")
+os.environ["BOT_TOKEN"] = "test-token"
+os.environ["MODE"] = "B"
+os.environ["ACTIVE_MODEL"] = "claudecode"
+
+import bot
+
+
+@pytest.fixture(autouse=True)
+def _force_claudecode(monkeypatch):
+    """确保测试始终走 ClaudeCode 分支。"""
+
+    monkeypatch.setattr(bot, "ACTIVE_MODEL", "claudecode")
+    monkeypatch.setattr(bot, "MODEL_CANONICAL_NAME", "claudecode")
+    return
 
 
 def test_extract_claudecode_assistant_message():
     event = {
+        "isSidechain": False,
         "type": "assistant",
         "message": {
             "id": "msg_test",
@@ -20,6 +35,11 @@ def test_extract_claudecode_assistant_message():
                 {"type": "text", "text": "第一段输出"},
                 {"type": "tool_use", "name": "Bash", "input": {"command": "pwd"}},
                 {"type": "text", "text": "第二段输出"},
+                {
+                    "type": "tool_result",
+                    "output": "command result",
+                    "content": "command result",
+                },
             ],
         },
     }
@@ -33,6 +53,7 @@ def test_extract_claudecode_assistant_message():
 
 def test_extract_claudecode_assistant_tool_result():
     event = {
+        "isSidechain": False,
         "type": "assistant",
         "message": {
             "id": "msg_tool",
@@ -47,11 +68,39 @@ def test_extract_claudecode_assistant_tool_result():
         },
     }
     result = bot._extract_deliverable_payload(event, event_timestamp=None)
+    assert result is None
+
+
+def test_extract_claudecode_sidechain_message_ignored():
+    event = {
+        "isSidechain": True,
+        "type": "assistant",
+        "message": {
+            "id": "msg_side",
+            "content": [
+                {"type": "text", "text": "欢迎语"},
+            ],
+        },
+    }
+    result = bot._extract_deliverable_payload(event, event_timestamp=None)
+    assert result is None
+
+
+def test_extract_claudecode_fallback_text():
+    event = {
+        "isSidechain": False,
+        "type": "assistant",
+        "message": {
+            "id": "msg_fallback",
+            "text": "直接文本",
+        },
+    }
+    result = bot._extract_deliverable_payload(event, event_timestamp=None)
     assert result is not None
     kind, text, metadata = result
     assert kind == bot.DELIVERABLE_KIND_MESSAGE
-    assert "/Users/david/project" in text
-    assert metadata == {"message_id": "msg_tool"}
+    assert text == "直接文本"
+    assert metadata == {"message_id": "msg_fallback"}
 
 
 def test_claudecode_fallback_selects_latest(tmp_path):

{vibego-0.2.9 → vibego-0.2.10}/vibego.egg-info/PKG-INFO

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