vibego 0.2.20__tar.gz → 0.2.22__tar.gz

{vibego-0.2.20 → vibego-0.2.22}/PKG-INFO

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

{vibego-0.2.20 → vibego-0.2.22}/bot.py

@@ -435,6 +435,8 @@ def _escape_markdown_v2(text: str) -> str:
 LEGACY_DOUBLE_BOLD = re.compile(r"\*\*(.+?)\*\*", re.DOTALL)
 LEGACY_DOUBLE_UNDERLINE = re.compile(r"__(.+?)__", re.DOTALL)
 CODE_SEGMENT_RE = re.compile(r"(```.*?```|`[^`]*`)", re.DOTALL)
+# Markdown 标题模式（# - ####）
+MARKDOWN_HEADING = re.compile(r"^(#{1,4})\s+(.+)$", re.MULTILINE)
 
 
 def _normalize_legacy_markdown(text: str) -> str:
@@ -466,6 +468,32 @@ def _normalize_legacy_markdown(text: str) -> str:
     return "".join(pieces)
 
 
+def _normalize_to_telegram_markdown(text: str) -> str:
+    """将标准 Markdown 格式转换为 Telegram MarkdownV2 支持的格式
+
+    转换规则：
+    - **text** → *text* （加粗）
+    - __text__ → _text_ （斜体）
+    - #### 标题 → *标题* （标题转为加粗）
+    """
+    # 先转换加粗和下划线语法
+    text = _normalize_legacy_markdown(text)
+
+    # 转换标题：移除 # 符号，将标题文本转为加粗
+    def _replace_heading(match: re.Match[str]) -> str:
+        # match.group(1) 是 # 符号
+        # match.group(2) 是标题文本
+        heading_text = match.group(2)
+        # 标题转为加粗文本（如果文本已经是加粗的，避免重复）
+        if heading_text.startswith("*") and heading_text.endswith("*"):
+            return heading_text  # 已经是加粗，保持不变
+        return f"*{heading_text}*"
+
+    text = MARKDOWN_HEADING.sub(_replace_heading, text)
+
+    return text
+
+
 # MarkdownV2 转义字符模式（用于检测已转义文本）
 _ESCAPED_MARKDOWN_PATTERN = re.compile(
     r"\\[_*\[\]()~`>#+=|{}.!:-]"  # 添加了冒号
@@ -593,7 +621,10 @@ def _unescape_if_already_escaped(text: str) -> str:
 
 def _prepare_model_payload(text: str) -> str:
     if _IS_MARKDOWN_V2:
-        return _escape_markdown_v2(text)
+        # 先转换标准 Markdown 格式为 Telegram 支持的格式
+        normalized = _normalize_to_telegram_markdown(text)
+        # 再进行 MarkdownV2 转义
+        return _escape_markdown_v2(normalized)
     if _IS_MARKDOWN:
         return _normalize_legacy_markdown(text)
     return text
@@ -663,10 +694,7 @@ async def _send_with_markdown_guard(
         sanitized: Optional[str]
         if _IS_MARKDOWN_V2:
             sanitized = _escape_markdown_v2(text)
-            if "**" in text:
-                sanitized = sanitized.replace(r"\*\*", "**")
-            if "__" in text:
-                sanitized = sanitized.replace(r"\_\_", "__")
+            # 保留代码块标记不转义（它们本身就是 Markdown 语法）
             if "```" in text:
                 sanitized = sanitized.replace(r"\`\`\`", "```")
             if "`" in text:
@@ -2448,8 +2476,9 @@ def _format_history_line(item: TaskHistoryRecord) -> str:
         for line in description.splitlines()
         if line.strip()
     ]
-    # Markdown 列表使用“- ”起始，后续详情以缩进列表呈现，便于聊天端渲染。
-    formatted = [f"- **{summary}** · {timestamp}"]
+    # Markdown 列表使用"- "起始，后续详情以缩进列表呈现，便于聊天端渲染。
+    # MarkdownV2 使用单星号 * 表示加粗
+    formatted = [f"- *{summary}* · {timestamp}"]
     for detail in detail_lines:
         formatted.append(f"  - {detail}")
     formatted.append("")  # 追加空行分隔历史记录
@@ -3076,7 +3105,7 @@ def _build_truncated_history_entry(item: TaskHistoryRecord) -> str:
     summary = _format_history_summary(item)
     return "\n".join(
         [
-            f"- **{summary}** · {timestamp}",
+            f"- *{summary}* · {timestamp}",
             "  - ⚠️ 该记录内容较长，仅展示摘要概要。",
         ]
     )

{vibego-0.2.20 → vibego-0.2.22}/master.py

@@ -65,7 +65,7 @@ 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")
 )
-RESTART_SIGNAL_TTL = int(os.environ.get("MASTER_RESTART_SIGNAL_TTL", "600"))  # 默认 10 分钟
+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
 
@@ -1578,14 +1578,42 @@ def _log_update(message: Message, *, override_user: Optional[User] = None) -> No
     _update_master_env(chat_id, user_id)
 
 
-def _safe_remove(path: Path) -> None:
-    """安全移除文件，忽略不存在的情况"""
-    try:
-        path.unlink()
-    except FileNotFoundError:
+def _safe_remove(path: Path, *, retries: int = 3) -> None:
+    """安全移除文件，支持重试机制
+
+    Args:
+        path: 要删除的文件路径
+        retries: 最大重试次数（默认 3 次）
+    """
+    if not path.exists():
+        log.debug("文件不存在，无需删除", extra={"path": str(path)})
         return
-    except Exception as exc:
-        log.warning("删除文件失败: %s", exc, extra={"path": str(path)})
+
+    for attempt in range(retries):
+        try:
+            path.unlink()
+            log.info("重启信号文件已删除", extra={"path": str(path), "attempt": attempt + 1})
+            return
+        except FileNotFoundError:
+            log.debug("文件已被其他进程删除", extra={"path": str(path)})
+            return
+        except Exception as exc:
+            if attempt < retries - 1:
+                log.warning(
+                    "删除文件失败，将重试 (attempt %d/%d): %s",
+                    attempt + 1,
+                    retries,
+                    exc,
+                    extra={"path": str(path)}
+                )
+                import time
+                time.sleep(0.1)  # 等待 100ms 后重试
+            else:
+                log.error(
+                    "删除文件失败，已达最大重试次数: %s",
+                    exc,
+                    extra={"path": str(path), "retries": retries}
+                )
 
 
 def _write_restart_signal(message: Message, *, override_user: Optional[User] = None) -> None:
@@ -1663,13 +1691,24 @@ async def _notify_restart_success(bot: Bot) -> None:
                 "启动时未检测到重启信号文件，将向管理员发送兜底提醒", extra={"targets": targets}
             )
             if targets:
-                text = (
-                    "Master 已重新上线，但未找到重启触发者信息。"
-                    "可能是重启信号写入失败，请确认服务状态。"
-                )
+                text_lines = [
+                    "⚠️ Master 已重新上线，但未找到重启触发者信息。",
+                    "",
+                    "可能原因：",
+                    "1. 重启信号文件写入失败",
+                    "2. 信号文件已超时被清理（TTL=30分钟）",
+                    "3. 文件系统权限问题",
+                    "",
+                    "建议检查：",
+                    f"- 启动日志: {ROOT_DIR}/logs/start.log",
+                    f"- 运行日志: {ROOT_DIR}/vibe.log",
+                    f"- 信号文件: {RESTART_SIGNAL_PATH}",
+                ]
+                text = "\n".join(text_lines)
                 for chat in targets:
                     try:
                         await bot.send_message(chat_id=chat, text=text)
+                        log.info("兜底重启通知已发送", extra={"chat": chat})
                     except Exception as exc:
                         log.error("发送兜底重启通知失败: %s", exc, extra={"chat": chat})
         else:

{vibego-0.2.20 → vibego-0.2.22}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vibego"
-version = "0.2.20"
+version = "0.2.22"
 description = "vibego CLI：用于初始化与管理 Telegram Master Bot 的工具"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -41,7 +41,7 @@ include = ["vibego_cli", "tasks", "scripts"]
 "scripts" = ["*.sh", "models/*.sh"]
 
 [tool.bumpversion]
-current_version = "0.2.20"
+current_version = "0.2.22"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

vibego-0.2.22/scripts/publish.sh

@@ -0,0 +1,126 @@
+#!/usr/bin/env bash
+# VibeGo 完整发布脚本
+# 使用 keyring 进行 PyPI 认证，无需手动输入 token
+#
+# 前置条件：
+#   1. 已安装 keyring: pip install keyring
+#   2. 已存储 PyPI token 到 keyring:
+#      python3.11 -c "import keyring; keyring.set_password('https://upload.pypi.org/legacy/', '__token__', 'your-token')"
+#
+# 使用方式：
+#   ./scripts/publish.sh           # 发布 patch 版本（默认）
+#   ./scripts/publish.sh minor     # 发布 minor 版本
+#   ./scripts/publish.sh major     # 发布 major 版本
+
+set -e
+
+# 颜色定义
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[0;34m'
+NC='\033[0m' # No Color
+
+# 打印带颜色的消息
+print_info() {
+    echo -e "${BLUE}ℹ️  $1${NC}"
+}
+
+print_success() {
+    echo -e "${GREEN}✅ $1${NC}"
+}
+
+print_warning() {
+    echo -e "${YELLOW}⚠️  $1${NC}"
+}
+
+print_error() {
+    echo -e "${RED}❌ $1${NC}"
+}
+
+# 项目根目录
+PROJECT_ROOT="/Users/david/hypha/tools/vibeBot"
+cd "$PROJECT_ROOT"
+
+print_info "开始 VibeGo 发布流程..."
+echo ""
+
+# 步骤 1: 检查 keyring 中是否存储了 PyPI token
+print_info "检查 keyring 配置..."
+if ! python3.11 -c "import keyring; token = keyring.get_password('https://upload.pypi.org/legacy/', '__token__'); exit(0 if token else 1)" 2>/dev/null; then
+    print_error "未在 keyring 中找到 PyPI token"
+    echo ""
+    echo "请先执行以下命令存储 token："
+    echo "  python3.11 -c \"import keyring; keyring.set_password('https://upload.pypi.org/legacy/', '__token__', 'your-pypi-token')\""
+    echo ""
+    exit 1
+fi
+print_success "Keyring 配置正确"
+echo ""
+
+# 步骤 2: 创建/激活虚拟环境
+print_info "创建构建虚拟环境..."
+python3.11 -m venv ~/.venvs/vibego-build
+source ~/.venvs/vibego-build/bin/activate
+print_success "虚拟环境已激活"
+echo ""
+
+# 步骤 3: 升级 pip 和安装构建工具
+print_info "安装构建依赖..."
+pip install --upgrade pip build twine keyring > /dev/null 2>&1
+print_success "构建依赖已安装"
+echo ""
+
+# 步骤 4: 清理旧的构建产物
+print_info "清理旧的构建产物..."
+rm -rf "$PROJECT_ROOT/dist"
+print_success "构建产物已清理"
+echo ""
+
+# 步骤 5: 递增版本号
+VERSION_TYPE="${1:-patch}"  # 默认为 patch
+print_info "递增版本号（类型：$VERSION_TYPE）..."
+./scripts/bump_version.sh "$VERSION_TYPE"
+echo ""
+
+# 步骤 6: 构建分发包
+print_info "构建 Python 分发包..."
+python3.11 -m build
+print_success "分发包构建完成"
+echo ""
+
+# 步骤 7: 上传到 PyPI（使用 keyring 自动认证）
+print_info "上传到 PyPI（使用 keyring 认证）..."
+twine upload dist/*
+print_success "已成功上传到 PyPI"
+echo ""
+
+# 步骤 8: 清理并重装 pipx 中的 vibego
+print_info "更新本地 pipx 安装..."
+rm -rf ~/.cache/pipx
+rm -rf ~/.local/pipx/venvs/vibego
+pipx install --python python3.11 vibego
+pipx upgrade vibego
+print_success "本地 vibego 已更新"
+echo ""
+
+# 步骤 9: 重启 vibego 服务
+print_info "重启 vibego 服务..."
+vibego stop || true  # 忽略停止失败的错误
+sleep 2
+vibego start
+print_success "vibego 服务已重启"
+echo ""
+
+# 完成
+print_success "========================================="
+print_success "🎉 发布流程完成！"
+print_success "========================================="
+echo ""
+print_info "后续步骤："
+echo "  1. 推送 git 提交和标签："
+echo "     git push && git push --tags"
+echo ""
+echo "  2. 验证 PyPI 页面："
+echo "     https://pypi.org/project/vibego/"
+echo ""

{vibego-0.2.20 → vibego-0.2.22}/scripts/start.sh

@@ -223,12 +223,41 @@ else
 fi
 
 # 后台启动 master，日志落在 vibe.log
+# 显式传递重启标记环境变量（如果存在）
+if [[ -n "${MASTER_RESTART_EXPECTED:-}" ]]; then
+  log_info "检测到重启标记环境变量 MASTER_RESTART_EXPECTED=$MASTER_RESTART_EXPECTED"
+  export MASTER_RESTART_EXPECTED
+fi
+
+log_info "准备启动 master 进程..."
 nohup python master.py >> /dev/null 2>&1 &
-log_info "master 已后台启动，日志写入 vibe.log"
+MASTER_PID=$!
+log_info "master 已后台启动，PID=$MASTER_PID，日志写入 vibe.log"
 
 # 健康检查：等待 master 上线并验证关键 worker
-if ! python scripts/master_healthcheck.py --project hyphavibebotbackend; then
-  log_error "master 健康检查失败，请查看 logs/start.log / vibe.log"
-  exit 1
+log_info "开始执行健康检查..."
+HEALTHCHECK_START=$(date +%s)
+
+if python scripts/master_healthcheck.py --project hyphavibebotbackend; then
+  HEALTHCHECK_END=$(date +%s)
+  HEALTHCHECK_DURATION=$((HEALTHCHECK_END - HEALTHCHECK_START))
+  log_info "✅ master 健康检查通过，耗时 ${HEALTHCHECK_DURATION}s"
+else
+  HEALTHCHECK_END=$(date +%s)
+  HEALTHCHECK_DURATION=$((HEALTHCHECK_END - HEALTHCHECK_START))
+  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 "  - 进程 PID: $MASTER_PID"
+
+  # 检查进程是否仍在运行
+  if kill -0 "$MASTER_PID" 2>/dev/null; then
+    log_info "master 进程仍在运行（PID=$MASTER_PID），允许继续启动"
+    log_info "⚠️ 请手动验证服务是否正常工作"
+  else
+    log_error "❌ master 进程已退出，启动失败"
+    exit 1
+  fi
 fi
-log_info "master 健康检查通过"

{vibego-0.2.20 → vibego-0.2.22}/vibego.egg-info/PKG-INFO

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

{vibego-0.2.20 → vibego-0.2.22}/vibego.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ scripts/__init__.py
 scripts/bump_version.sh
 scripts/log_writer.py
 scripts/master_healthcheck.py
+scripts/publish.sh
 scripts/requirements.txt
 scripts/run_bot.sh
 scripts/start.sh

{vibego-0.2.20 → vibego-0.2.22}/vibego_cli/__init__.py

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