vibego 0.2.8__py3-none-any.whl → 0.2.10__py3-none-any.whl

bot.py

@@ -868,9 +868,9 @@ async def _dispatch_prompt_to_model(
                     session_path,
                     extra=_session_extra(path=session_path),
                 )
-        if session_path is None and _is_claudecode_model():
+        if _is_claudecode_model():
             fallback = _find_latest_claudecode_rollout(pointer_path)
-            if fallback is not None:
+            if fallback is not None and fallback != session_path:
                 _update_pointer(pointer_path, fallback)
                 session_path = fallback
                 worker_log.info(
@@ -3892,18 +3892,6 @@ async def _ensure_session_watcher(chat_id: int) -> Optional[Path]:
                 session_path,
                 extra=_session_extra(path=session_path),
             )
-    if session_path is None and pointer_path is not None and _is_claudecode_model():
-        fallback = _find_latest_claudecode_rollout(pointer_path)
-        if fallback is not None:
-            session_path = fallback
-            _update_pointer(pointer_path, session_path)
-            worker_log.info(
-                "[session-map] chat=%s resumed ClaudeCode session %s",
-                chat_id,
-                session_path,
-                extra=_session_extra(path=session_path),
-            )
-
     if session_path is None and pointer_path is not None:
         latest = _find_latest_rollout_for_cwd(pointer_path, target_cwd)
         if latest is not None:
@@ -3916,10 +3904,20 @@ async def _ensure_session_watcher(chat_id: int) -> Optional[Path]:
                 extra=_session_extra(path=session_path),
             )
 
+    if pointer_path is not None and _is_claudecode_model():
+        fallback = _find_latest_claudecode_rollout(pointer_path)
+        if fallback is not None and fallback != session_path:
+            session_path = fallback
+            _update_pointer(pointer_path, session_path)
+            worker_log.info(
+                "[session-map] chat=%s resume ClaudeCode session %s",
+                chat_id,
+                session_path,
+                extra=_session_extra(path=session_path),
+            )
+
     if session_path is None and pointer_path is not None:
         session_path = await _await_session_path(pointer_path, target_cwd)
-        if session_path is None and _is_claudecode_model():
-            session_path = _find_latest_claudecode_rollout(pointer_path)
         if session_path is not None:
             _update_pointer(pointer_path, session_path)
             worker_log.info(
@@ -3928,6 +3926,17 @@ async def _ensure_session_watcher(chat_id: int) -> Optional[Path]:
                 session_path,
                 extra=_session_extra(path=session_path),
             )
+    if session_path is None and pointer_path is not None and _is_claudecode_model():
+        fallback = _find_latest_claudecode_rollout(pointer_path)
+        if fallback is not None:
+            session_path = fallback
+            _update_pointer(pointer_path, session_path)
+            worker_log.info(
+                "[session-map] chat=%s fallback bind ClaudeCode session %s",
+                chat_id,
+                session_path,
+                extra=_session_extra(path=session_path),
+            )
 
     if session_path is None:
         worker_log.warning(
@@ -4192,43 +4201,54 @@ def _find_latest_claudecode_rollout(pointer: Path) -> Optional[Path]:
     """ClaudeCode 专用：在缺少 cwd 元数据时按更新时间选择最新会话文件。"""
 
     pointer_target = _read_pointer_path(pointer)
+    candidates: List[Path] = []
     if pointer_target is not None:
-        return pointer_target
+        candidates.append(pointer_target)
 
     search_roots: List[Path] = []
     if MODEL_SESSION_ROOT:
         search_roots.append(resolve_path(MODEL_SESSION_ROOT))
+    if pointer_target is not None:
+        search_roots.append(pointer_target.parent)
     search_roots.append(pointer.parent)
     search_roots.append(pointer.parent / "sessions")
 
-    latest_path: Optional[Path] = None
-    latest_mtime = -1.0
-    seen: set[str] = set()
+    seen_roots: set[str] = set()
     pattern = f"**/{MODEL_SESSION_GLOB}"
-
     for root in search_roots:
         try:
             real_root = root.resolve()
         except OSError:
             real_root = root
         key = str(real_root)
-        if key in seen:
+        if key in seen_roots:
             continue
-        seen.add(key)
+        seen_roots.add(key)
         if not real_root.exists():
             continue
-
         for rollout in real_root.glob(pattern):
-            if not rollout.is_file():
-                continue
-            try:
-                mtime = rollout.stat().st_mtime
-            except OSError:
-                continue
-            if mtime <= latest_mtime:
-                continue
+            if rollout.is_file():
+                candidates.append(rollout)
+
+    latest_path: Optional[Path] = None
+    latest_mtime = -1.0
+    seen_files: set[str] = set()
+    for rollout in candidates:
+        try:
+            real_rollout = rollout.resolve()
+        except OSError:
+            real_rollout = rollout
+        key = str(real_rollout)
+        if key in seen_files:
+            continue
+        seen_files.add(key)
+        try:
+            mtime = real_rollout.stat().st_mtime
+        except OSError:
+            continue
+        if mtime > latest_mtime:
             latest_mtime = mtime
-            latest_path = rollout
+            latest_path = Path(real_rollout)
 
     return latest_path
 
@@ -4430,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":
@@ -4443,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)
 
@@ -1802,6 +1797,12 @@ async def cmd_start(message: Message) -> None:
         "使用 /projects 查看状态，/run 或 /stop 控制 worker。",
         reply_markup=_build_master_main_keyboard(),
     )
+    await _send_projects_overview_to_chat(
+        message.bot,
+        message.chat.id,
+        manager,
+        reply_to_message_id=message.message_id,
+    )
 
 
 async def _perform_restart(message: Message, start_script: Path) -> None:
@@ -1901,6 +1902,30 @@ async def _send_projects_overview_to_chat(
         log.info("已发送项目概览，按钮=%s", "无" if markup is None else "有")
 
 
+async def _refresh_project_overview(
+    message: Optional[Message],
+    manager: MasterManager,
+) -> None:
+    """在原消息上刷新项目概览，无法编辑时发送新消息。"""
+
+    if message is None:
+        return
+    manager.refresh_state()
+    try:
+        text, markup = _projects_overview(manager)
+    except Exception as exc:
+        log.exception("刷新项目概览失败: %s", exc)
+        return
+    try:
+        await message.edit_text(text, reply_markup=markup)
+    except TelegramBadRequest as exc:
+        log.warning("编辑项目概览失败，将发送新消息: %s", exc)
+        try:
+            await message.answer(text, reply_markup=markup)
+        except Exception as send_exc:
+            log.exception("发送项目概览失败: %s", send_exc)
+
+
 @router.message(Command("projects"))
 async def cmd_projects(message: Message) -> None:
     """处理 /projects 命令，返回最新项目概览。"""
@@ -2123,6 +2148,7 @@ async def on_project_action(callback: CallbackQuery, state: FSMContext) -> None:
         elif action == "start_all":
             await manager.run_all()
             log.info("按钮操作成功: user=%s 启动全部项目", user_id)
+            await callback.answer("全部项目已启动，正在刷新列表…")
         elif action == "restart_master":
             if callback.message is None:
                 log.error("重启按钮回调缺少 message 对象", extra={"user": user_id})
@@ -2143,6 +2169,7 @@ async def on_project_action(callback: CallbackQuery, state: FSMContext) -> None:
                 chosen,
                 extra={"project": cfg.project_slug, "model": chosen},
             )
+            await callback.answer("项目已启动，正在刷新列表…")
         elif action == "stop":
             await manager.stop_worker(cfg)
             log.info(
@@ -2151,6 +2178,7 @@ async def on_project_action(callback: CallbackQuery, state: FSMContext) -> None:
                 cfg.display_name,
                 extra={"project": cfg.project_slug},
             )
+            await callback.answer("项目已停止，正在刷新列表…")
         elif action == "switch_all_to":
             model_map = dict(SWITCHABLE_MODELS)
             if target_model not in model_map:
@@ -2251,14 +2279,7 @@ async def on_project_action(callback: CallbackQuery, state: FSMContext) -> None:
         await callback.answer("操作失败", show_alert=True)
         return
 
-    manager.refresh_state()
-    text, markup = _projects_overview(manager)
-    if callback.message:
-        try:
-            await callback.message.edit_text(text, reply_markup=_ensure_numbered_markup(markup))
-        except TelegramBadRequest as exc:
-            if "message is not modified" not in str(exc).lower():
-                raise
+    await _refresh_project_overview(callback.message, manager)
 
 
 @router.message(Command("run"))

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.8.dist-info → vibego-0.2.10.dist-info}/METADATA

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

{vibego-0.2.8.dist-info → vibego-0.2.10.dist-info}/RECORD

@@ -1,13 +1,13 @@
-bot.py,sha256=QkDvk3QNkgVPRjEU4hvrrb54vTVZHclbiPOgGzUgNsg,249422
+bot.py,sha256=q_aRgSBen4XThKdExfa-6NeX9R_Mgs0UjXYx32rsGzo,249827
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
-master.py,sha256=Dz3yOew0b04k3eyp3wSfiPMtYujIRemxGXQBxDmtErk,105771
+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=tb_h90-nU4po3asUc3D7YBwvDXmxeWGgPwxTEBpI8Ow,5641
 scripts/start_tmux_codex.sh,sha256=4ko72SK7EDJmzXVuLBOz1_S1lLEmgIpLAVuD7mZhpdk,4018
 scripts/stop_all.sh,sha256=FOz07gi2CI9sMHxBb8XkqHtxRYs3jt1RYgGrEi-htVg,4086
 scripts/stop_bot.sh,sha256=b9vvrke5jeyO18SEBFZxQD09Gf65BgGzeKtpM8sa60Y,3677
@@ -429,8 +429,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.8.dist-info/METADATA,sha256=d4knXRIW7t5Wdi0aa_L-WZgasZbQBehmJGQENoCzDP8,10474
-vibego-0.2.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.8.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.8.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.8.dist-info/RECORD,,
+vibego-0.2.10.dist-info/METADATA,sha256=CzxFnVhczBzeTQ1aK8jjhhoYJT85g6QtQy_rU4aDoaQ,10475
+vibego-0.2.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.10.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.10.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.10.dist-info/RECORD,,