vibego 0.2.28__py3-none-any.whl → 0.2.30__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
@@ -2866,6 +2885,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

@@ -8,6 +8,11 @@ START_LOG="$LOG_DIR/start.log"
 CODEX_STAMP_FILE="$ROOT_DIR/state/npm_codex_install.stamp"
 CODEX_INSTALL_TTL="${CODEX_INSTALL_TTL:-86400}"
 
+# 统一重启信号文件路径：使用配置目录而非代码目录
+# 这样 pipx 安装的 master 和源码运行的 master 可以共享同一个信号文件
+MASTER_CONFIG_ROOT="${MASTER_CONFIG_ROOT:-$HOME/.config/vibego}"
+export MASTER_RESTART_SIGNAL_PATH="$MASTER_CONFIG_ROOT/state/restart_signal.json"
+
 log_line() {
   local ts
   ts=$(date '+%Y-%m-%d %H:%M:%S%z')
@@ -251,7 +256,8 @@ if [[ -n "${MASTER_RESTART_EXPECTED:-}" ]]; then
 fi
 
 log_info "准备启动 master 进程..."
-nohup python master.py >> /dev/null 2>&1 &
+# 显式传递环境变量给 nohup 进程，确保重启信号文件路径正确
+MASTER_RESTART_SIGNAL_PATH="$MASTER_RESTART_SIGNAL_PATH" nohup python master.py >> /dev/null 2>&1 &
 MASTER_PID=$!
 
 # 健壮性检查：确保进程成功启动

{vibego-0.2.28.dist-info → vibego-0.2.30.dist-info}/METADATA

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

{vibego-0.2.28.dist-info → vibego-0.2.30.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=CHCsjOYAhr_gnNb1Yl7NaOsFQTbRL9CdhLLMIlrx3G0,109337
 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=Q-PCySQNFL242ScmbLlpp5e1eHZOq6qssZF6DjWrpdk,9546
+scripts/start.sh,sha256=WxByzBXALfjcjhGPCrLHLkaD8hNYZ2WDQAZ0tpoQSeA,9996
 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=FjSJzaPVdmp1eef3N9aYUXfhaRuM8EqSuIpN6P_L51I,311
+vibego_cli/__init__.py,sha256=cGLGVLdOGT2rC2HZZBaLnLPkoa2ofpzKfDuuMEhgNeY,311
 vibego_cli/__main__.py,sha256=qqTrYmRRLe4361fMzbI3-CqpZ7AhTofIHmfp4ykrrBY,158
-vibego_cli/config.py,sha256=33WSORCfUIxrDtgASPEbVqVLBVNHh-RSFLpNy7tfc0s,2992
+vibego_cli/config.py,sha256=VxkPJMq01tA3h3cOkH-z_tiP7pMgfSGGicRvUnCWkhI,3054
 vibego_cli/deps.py,sha256=1nRXI7Dd-S1hYE8DligzK5fIluQWETRUj4_OKL0DikQ,1419
-vibego_cli/main.py,sha256=e2W5Pb9U9rfmF-jNX9uIA3222lhM0GgcvSdFTDBZd2s,12086
+vibego_cli/main.py,sha256=X__NXwZnIDIFbdKSTbNyZgZHKcPlN0DQz9sqTI1aQ9E,12158
 vibego_cli/data/worker_requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
-vibego-0.2.28.dist-info/METADATA,sha256=amRMMlsJJzx3J-7kO-KTRsOPNakEnRPPd0iMgwykBk4,10475
-vibego-0.2.28.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.28.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.28.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.28.dist-info/RECORD,,
+vibego-0.2.30.dist-info/METADATA,sha256=Ksc_G1L5Gn8gIEDXPTVHhQYXereR6HczAjdfEcsAdRc,10475
+vibego-0.2.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.30.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.30.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.30.dist-info/RECORD,,

vibego_cli/__init__.py

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

vibego_cli/config.py

@@ -39,6 +39,7 @@ PROJECTS_JSON: Path = CONFIG_DIR / "projects.json"
 MASTER_DB: Path = CONFIG_DIR / "master.db"
 MASTER_STATE: Path = STATE_DIR / "master_state.json"
 MASTER_PID_FILE: Path = STATE_DIR / "master.pid"
+RESTART_SIGNAL_PATH: Path = STATE_DIR / "restart_signal.json"
 LOG_FILE: Path = LOG_DIR / "vibe.log"
 
 

vibego_cli/main.py

@@ -148,6 +148,7 @@ def _build_master_env(base_env: Dict[str, str]) -> Dict[str, str]:
     env["MASTER_PROJECTS_PATH"] = str(config.PROJECTS_JSON)
     env["MASTER_PROJECTS_DB_PATH"] = str(config.MASTER_DB)
     env["MASTER_STATE_PATH"] = str(config.MASTER_STATE)
+    env["MASTER_RESTART_SIGNAL_PATH"] = str(config.RESTART_SIGNAL_PATH)
     env["LOG_ROOT"] = str(config.LOG_DIR)
     env["TASKS_DATA_ROOT"] = str(config.DATA_DIR)
     env["LOG_FILE"] = str(config.LOG_FILE)