vibego 0.2.27__py3-none-any.whl → 0.2.29__py3-none-any.whl

scripts/start.sh

@@ -3,10 +3,16 @@ set -eo pipefail
 
 ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 LOCK_FILE="$ROOT_DIR/state/master_restart.lock"
-START_LOG="$ROOT_DIR/logs/start.log"
+LOG_DIR="$ROOT_DIR/logs"
+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')
@@ -217,9 +223,29 @@ else
   source .venv/bin/activate
 
   # 安装依赖
+  # 将 pip 输出重定向到日志文件，避免 BrokenPipe 错误
   log_info "开始执行 pip install -r $REQUIREMENTS_FILE"
-  pip install -r "$REQUIREMENTS_FILE"
-  log_info "依赖安装完成"
+  PIP_LOG_FILE="$LOG_DIR/pip_install_$(date +%Y%m%d_%H%M%S).log"
+  if pip install -r "$REQUIREMENTS_FILE" > "$PIP_LOG_FILE" 2>&1; then
+    log_info "依赖安装完成"
+  else
+    PIP_EXIT_CODE=$?
+    log_error "pip install 失败，退出码=$PIP_EXIT_CODE，详见 $PIP_LOG_FILE"
+    # 如果是 BrokenPipe (退出码 141)，验证依赖是否实际已安装
+    if [[ $PIP_EXIT_CODE -eq 141 ]]; then
+      log_info "检测到 BrokenPipe 错误，验证依赖完整性..."
+      # 验证关键依赖包是否可导入
+      if "$ROOT_DIR/.venv/bin/python" -c "import aiogram, aiohttp, aiosqlite" 2>/dev/null; then
+        log_info "依赖验证通过，BrokenPipe 可忽略，继续执行"
+      else
+        log_error "依赖验证失败，虽然是 BrokenPipe 但依赖未完整安装"
+        exit 1
+      fi
+    else
+      # 其他错误直接退出
+      exit $PIP_EXIT_CODE
+    fi
+  fi
 fi
 
 # 后台启动 master，日志落在 vibe.log

{vibego-0.2.27.dist-info → vibego-0.2.29.dist-info}/METADATA

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

{vibego-0.2.27.dist-info → vibego-0.2.29.dist-info}/RECORD

@@ -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=dS18-vTIb7BE_9_UEhDXWkYtIygLCU2Pj2k6Zmxe7QI,8633
+scripts/start.sh,sha256=b9YXd3pxCdSO8Ij1utCHfA897nhNK5Fcd4jsSW0tMPU,9857
 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=JRH5O_PqUsvb2Fp5C04XkdBun5Ieqx8MCx39Ktx1qpU,311
+vibego_cli/__init__.py,sha256=61buX089vb0PZ-RiczZ0GC5cWtW3UF8Rzrbtz2jaCeA,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.27.dist-info/METADATA,sha256=o10irhxjDgq2c2hvcicdUuRxKQ3-KFRIo1ueu-WDzqo,10475
-vibego-0.2.27.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.27.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.27.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.27.dist-info/RECORD,,
+vibego-0.2.29.dist-info/METADATA,sha256=pdMyS37l5cTSjvT3VDskVou0t_8f64wP1SQ6qwiDszk,10475
+vibego-0.2.29.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.29.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.29.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.29.dist-info/RECORD,,

vibego_cli/__init__.py

@@ -7,6 +7,6 @@ from __future__ import annotations
 
 __all__ = ["main", "__version__"]
 
-__version__ = "0.2.27"
+__version__ = "0.2.29"
 
 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)