vibego 0.2.58__py3-none-any.whl → 1.0.10__py3-none-any.whl

scripts/master_healthcheck.py

@@ -1,147 +1,75 @@
 #!/usr/bin/env python3
-"""Master 启动后的健康检查脚本。
+"""Master post-startup health check.
 
-流程：
-1. 等待 master 日志出现启动标记。
-2. 调用 MasterManager 启动指定 worker（默认 hyphavibebotbackend）。
-3. 自动发现该 worker 的 chat_id（优先 state 文件，其次读取最新日志）。
-4. 通过 Telegram Bot API 向该 chat 发送探针消息，确认发送成功。
-5. 任何步骤失败则抛出异常，并尝试通知管理员。
-
-注意：本脚本不会自动重试重启，仅返回非零退出码供外层脚本处理。
+This lightweight variant only verifies that the master process has emitted the
+readiness marker in its log file. Worker bootstrap and Telegram probes are no
+longer executed because master restart confirmation is now limited to the
+controller process itself.
 """
 from __future__ import annotations
 
 import argparse
-import asyncio
 import json
 import os
-import re
 import sys
 import time
 from pathlib import Path
-from typing import Optional
-from urllib.error import URLError, HTTPError
 from urllib.request import Request, urlopen
 
-# 导入 master 中的配置与工具，复用项目解析逻辑
+# Make sure the master module can be imported from the repository root
 ROOT_DIR = Path(__file__).resolve().parent.parent
 ROOT_DIR_STR = str(ROOT_DIR)
 if ROOT_DIR_STR not in sys.path:
-    # 确保可以从仓库根目录导入 master 模块
     sys.path.insert(0, ROOT_DIR_STR)
 
 import master  # type: ignore
-from project_repository import ProjectRepository
+
 DEFAULT_MASTER_LOG = master.LOG_ROOT_PATH / "vibe.log"
 DEFAULT_TIMEOUT_MASTER = 60.0
-DEFAULT_TIMEOUT_PROBE = 15.0
-PROBE_TEXT = "hello"
-REPOSITORY = ProjectRepository(master.CONFIG_DB_PATH, master.CONFIG_PATH)
-
-
-def _load_project(project_id: str) -> master.ProjectConfig:
-    """根据 slug 或 bot 名获取项目配置，失败时列出可选项。"""
-
-    record = REPOSITORY.get_by_slug(project_id)
-    if record is None:
-        record = REPOSITORY.get_by_bot_name(project_id)
-    if record is None:
-        available = [r.project_slug for r in REPOSITORY.list_projects()]
-        raise RuntimeError(f"未找到项目 {project_id}，可选项目: {available}")
-    return master.ProjectConfig.from_dict(record.to_dict())
+MASTER_READY_MARKER = "Master Started, listening for administrator commands."
 
 
 def _wait_for_log_flag(path: Path, pattern: str, timeout: float) -> None:
-    """在超时时间内等待日志出现特定标记。"""
+    """Poll the master log until the readiness marker is detected or timeout."""
 
     deadline = time.monotonic() + timeout
-    position = 0
+    if path.exists():
+        position = path.stat().st_size
+        initialized = True
+    else:
+        position = 0
+        initialized = False
     while time.monotonic() < deadline:
         if path.exists():
-            if position == 0:
-                position = path.stat().st_size
+            if not initialized:
+                position = 0
+                initialized = True
             with path.open("r", encoding="utf-8", errors="ignore") as fh:
                 fh.seek(position)
                 while time.monotonic() < deadline:
                     line = fh.readline()
                     if not line:
                         time.sleep(0.5)
-                        continue
+                        break
                     position = fh.tell()
                     if pattern in line:
                         return
         time.sleep(0.5)
-    raise TimeoutError(f"在 {timeout:.0f} 秒内未检测到日志标记: {pattern}")
-
-
-def _extract_chat_id_from_logs(log_path: Path) -> Optional[int]:
-    """从日志文件倒序查找最近的 chat_id。"""
-
-    if not log_path.exists():
-        return None
-    pattern = re.compile(r"chat=(-?\d+)")
-    try:
-        lines = log_path.read_text(encoding="utf-8", errors="ignore").splitlines()
-    except Exception:
-        return None
-    for line in reversed(lines[-200:]):  # 反向查找最近的记录
-        match = pattern.search(line)
-        if match:
-            try:
-                return int(match.group(1))
-            except ValueError:
-                continue
-    return None
-
-
-def _ensure_chat_id(cfg: master.ProjectConfig, manager: master.MasterManager) -> int:
-    """确保任务分配有 chat_id，必要时从日志回填并写回 state。"""
-
-    state = manager.state_store.data.get(cfg.project_slug)
-    if state and state.chat_id:
-        return int(state.chat_id)
-    # 回落到日志查找
-    log_dir = master.LOG_ROOT_PATH / (cfg.default_model.lower()) / cfg.project_slug
-    chat_id = _extract_chat_id_from_logs(log_dir / "run_bot.log")
-    if chat_id is None:
-        raise RuntimeError(
-            "无法自动获取 chat_id，请先手动与该 bot 发生一次对话以写入 state/log"
-        )
-    # 将发现的 chat_id 写回 state，便于下次复用
-    manager.state_store.update(cfg.project_slug, chat_id=chat_id)
-    return chat_id
-
-
-def _send_probe(bot_token: str, chat_id: int, text: str, timeout: float) -> None:
-    """向指定 chat 发送探针消息，验证 Telegram API 可用。"""
-
-    url = f"https://api.telegram.org/bot{bot_token}/sendMessage"
-    payload = json.dumps({"chat_id": chat_id, "text": text, "disable_notification": True}).encode("utf-8")
-    request = Request(url, data=payload, headers={"Content-Type": "application/json"}, method="POST")
-    try:
-        with urlopen(request, timeout=timeout) as resp:
-            data = json.loads(resp.read().decode("utf-8"))
-    except HTTPError as exc:  # pragma: no cover - 网络异常时抛出
-        raise RuntimeError(f"发送探针消息失败，HTTP {exc.code}: {exc.reason}") from exc
-    except URLError as exc:  # pragma: no cover - 网络异常时抛出
-        raise RuntimeError(f"发送探针消息失败: {exc}") from exc
-    if not data.get("ok"):
-        raise RuntimeError(f"发送探针消息失败: {data}")
+    raise TimeoutError(f"No log markers detected within {timeout:.0f}s: {pattern}")
 
 
 def _format_admin_notice(reason: str) -> str:
-    """生成通知管理员的告警文本。"""
+    """Compose the notification text for administrator alerts."""
 
     return (
-        "Master 重启健康检查失败\n"
-        f"原因：{reason}\n"
-        "请尽快登录服务器排查（start.log / vibe.log）。"
+        "Master Restart health check failed\n"
+        f"reason:{reason}\n"
+        "Please log in to the server as soon as possible to troubleshoot (start.log / vibe.log)."
     )
 
 
 def _notify_admins(reason: str) -> None:
-    """如果 master token 可用，则向管理员列表广播失败原因。"""
+    """Broadcast the failure reason to administrators if the master token exists."""
 
     master_token = os.environ.get("MASTER_BOT_TOKEN")
     if not master_token:
@@ -163,58 +91,30 @@ def _notify_admins(reason: str) -> None:
             continue
 
 
-def _ensure_worker(cfg: master.ProjectConfig) -> master.MasterManager:
-    """启动指定项目 worker，并返回临时构造的 MasterManager。"""
-
-    records = REPOSITORY.list_projects()
-    configs = [master.ProjectConfig.from_dict(record.to_dict()) for record in records]
-    state_store = master.StateStore(
-        master.STATE_PATH, {item.project_slug: item for item in configs}
-    )
-    manager = master.MasterManager(configs, state_store=state_store)
-
-    async def _run() -> None:
-        """协程执行实际的 stop/start 流程。"""
-        # 确保先停止旧实例（若存在）
-        try:
-            await manager.stop_worker(cfg)
-        except Exception:
-            pass
-        await manager.run_worker(cfg)
-
-    asyncio.run(_run())
-    return manager
-
-
 def main() -> int:
-    """命令行入口，执行 master 健康检查并返回退出码。"""
-
-    parser = argparse.ArgumentParser(description="Master 启动后的健康检查")
-    parser.add_argument("--project", default="hyphavibebotbackend", help="项目 slug 或 bot 名称")
-    parser.add_argument("--master-log", default=str(DEFAULT_MASTER_LOG), help="master 日志路径")
-    parser.add_argument("--master-timeout", type=float, default=DEFAULT_TIMEOUT_MASTER, help="master 日志等待超时时间 (秒)")
-    parser.add_argument("--probe-timeout", type=float, default=DEFAULT_TIMEOUT_PROBE, help="Telegram 探针超时时间 (秒)")
+    """Command line entry point, only validates master readiness."""
+
+    parser = argparse.ArgumentParser(description="Master post-launch health check (master only)")
+    parser.add_argument("--master-log", default=str(DEFAULT_MASTER_LOG), help="Master log path")
+    parser.add_argument(
+        "--master-timeout",
+        type=float,
+        default=DEFAULT_TIMEOUT_MASTER,
+        help="Master log wait timeout (seconds)",
+    )
     args = parser.parse_args()
 
-    project_id = master._sanitize_slug(args.project)
     master_log = Path(args.master_log)
 
     try:
-        _wait_for_log_flag(master_log, "Master 已启动，监听管理员指令。", args.master_timeout)
-        cfg = _load_project(project_id)
-        manager = _ensure_worker(cfg)
-        chat_id = _ensure_chat_id(cfg, manager)
-        _send_probe(cfg.bot_token, chat_id, PROBE_TEXT, args.probe_timeout)
+        _wait_for_log_flag(master_log, MASTER_READY_MARKER, args.master_timeout)
     except Exception as exc:
         reason = str(exc)
         _notify_admins(reason)
-        print(f"[healthcheck] 失败: {reason}", file=sys.stderr)
+        print(f"[healthcheck] fail: {reason}", file=sys.stderr)
         return 1
     else:
-        print(
-            "[healthcheck] 成功: master 已就绪，"
-            f"worker={cfg.display_name} 启动完成，chat_id={chat_id}，已发送探针消息"
-        )
+        print("[healthcheck] success: master ready, worker checks skipped by configuration")
         return 0
 
 

scripts/models/claudecode.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-# ClaudeCode 模型配置
+# ClaudeCode Model configuration
 
-# 将工作目录转换为 Claude CLI 默认的 project key。
-# Claude 官方实现是简单地把绝对路径中的斜杠替换成连字符，并保留大小写。
+# Convert the working directory to Claude CLI default project key.
+# Claude The official implementation simply replaces slashes in absolute paths with hyphens, and preserve case.
 claude_project_key_from_workdir() {
   local path="$1"
   if [[ -z "$path" ]]; then
@@ -20,7 +20,7 @@ claude_project_key_from_workdir() {
 model_configure() {
   MODEL_NAME="ClaudeCode"
   MODEL_WORKDIR="${CLAUDE_WORKDIR:-${MODEL_WORKDIR:-$ROOT_DIR}}"
-  # 默认关闭文件快照，避免孤儿 CLI 持续写入 jsonl
+  # File snapshot is turned off by default, avoid orphans CLI Continuous writing jsonl
   CLAUDE_DISABLE_FILE_CHECKPOINTING="${CLAUDE_DISABLE_FILE_CHECKPOINTING:-1}"
   CLAUDE_CODE_DISABLE_FILE_CHECKPOINTING="${CLAUDE_CODE_DISABLE_FILE_CHECKPOINTING:-$CLAUDE_DISABLE_FILE_CHECKPOINTING}"
   export CLAUDE_CODE_DISABLE_FILE_CHECKPOINTING

scripts/models/codex.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Codex 模型配置
+# Codex Model configuration
 
 model_configure() {
   MODEL_NAME="codex"

scripts/models/common.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
-# 公共工具：模型脚本/运行脚本/停止脚本共享
+# Public Tools: Model Scripts/run script/Stop script sharing
 
-# 避免重复定义时覆盖
+# Avoid overwriting when repeating definitions
 if [[ -n "${_MODEL_COMMON_LOADED:-}" ]]; then
   return
 fi
@@ -9,10 +9,29 @@ _MODEL_COMMON_LOADED=1
 
 COMMON_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ROOT_DIR="${ROOT_DIR:-$(cd "$COMMON_DIR/.." && pwd)}"
-LOG_ROOT="${LOG_ROOT:-$ROOT_DIR/logs}"
+resolve_config_root() {
+  local raw=""
+  if [[ -n "${MASTER_CONFIG_ROOT:-}" ]]; then
+    raw="$MASTER_CONFIG_ROOT"
+  elif [[ -n "${VIBEGO_CONFIG_DIR:-}" ]]; then
+    raw="$VIBEGO_CONFIG_DIR"
+  elif [[ -n "${XDG_CONFIG_HOME:-}" ]]; then
+    raw="${XDG_CONFIG_HOME%/}/vibego"
+  else
+    raw="$HOME/.config/vibego"
+  fi
+  if [[ "$raw" == ~* ]]; then
+    printf '%s' "${raw/#\~/$HOME}"
+  else
+    printf '%s' "$raw"
+  fi
+}
+
+CONFIG_ROOT="${CONFIG_ROOT:-$(resolve_config_root)}"
+LOG_ROOT="${LOG_ROOT:-$CONFIG_ROOT/logs}"
 TMUX_SESSION_PREFIX="${TMUX_SESSION_PREFIX:-vibe}"
 
-# 将任意路径/名称转换为 tmux/session 等安全的 slug
+# Change any path/Name converted to tmux/session Wait for a safe slug
 sanitize_slug() {
   local input="$1"
   if [[ -z "$input" ]]; then
@@ -34,7 +53,7 @@ project_slug_from_workdir() {
     printf 'project'
     return
   fi
-  # 将绝对路径改写为与 Claude 类似的 -Users-... 形式
+  # Rewrite the absolute path to something similar to Claude -Users-... form
   local replaced
   replaced=$(printf '%s' "$path" | sed 's#/#-#g')
   replaced="${replaced#-}"
@@ -87,4 +106,3 @@ find_latest_with_pattern() {
   done < <(find "$root" -type f -name "$pattern" -print0 2>/dev/null)
   [[ -n "$latest" ]] && printf '%s\n' "$latest"
 }
-

scripts/models/gemini.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-# Gemini 模型占位配置（待实现）
+# Gemini Model placeholder configuration (to be implemented)
 
 model_configure() {
   MODEL_NAME="gemini"
   MODEL_WORKDIR="${GEMINI_WORKDIR:-${MODEL_WORKDIR:-$ROOT_DIR}}"
-  MODEL_CMD="${GEMINI_CMD:-echo 'gemini CLI 尚未配置'; sleep 1}" 
+  MODEL_CMD="${GEMINI_CMD:-echo 'gemini CLI Not configured yet'; sleep 1}" 
   MODEL_SESSION_ROOT="${GEMINI_SESSION_ROOT:-$LOG_ROOT/gemini-placeholder}"
   MODEL_SESSION_GLOB="${GEMINI_SESSION_GLOB:-*.jsonl}"
   MODEL_POINTER_BASENAME="${MODEL_POINTER_BASENAME:-current_session.txt}"

scripts/publish.sh

@@ -1,33 +1,33 @@
 #!/usr/bin/env bash
-# VibeGo 完整发布脚本
-# 使用 keyring 进行 PyPI 认证，无需手动输入 token
+# VibeGo Full release script
+# Use keyring for PyPI authentication without manually entering tokens
 #
-# 前置条件：
-#   1. 已安装 keyring: pip install keyring
-#   2. 已存储 PyPI token 到 keyring:
+# Prerequisites:
+#   1. keyring installed: pip install keyring
+#   2. PyPI token stored in 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 版本
+# How to use:
+#   ./scripts/publish.sh           # Publish patch version (default)
+#   ./scripts/publish.sh minor     # Release minor version
+#   ./scripts/publish.sh major     # Release major version
 
 set -e
 
-# 颜色定义
+# color definition
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
 BLUE='\033[0;34m'
 NC='\033[0m' # No Color
 
-# 打印带颜色的消息
+# Print colored messages
 print_info() {
     echo -e "${BLUE}ℹ️  $1${NC}"
 }
 
 print_success() {
-    echo -e "${GREEN}✅ $1${NC}"
+    echo -e "${GREEN}OK: $1${NC}"
 }
 
 print_warning() {
@@ -35,92 +35,92 @@ print_warning() {
 }
 
 print_error() {
-    echo -e "${RED}❌ $1${NC}"
+    echo -e "${RED}ERROR: $1${NC}"
 }
 
-# 项目根目录
+# Project root directory
 PROJECT_ROOT="/Users/david/hypha/tools/vibeBot"
 cd "$PROJECT_ROOT"
 
-print_info "开始 VibeGo 发布流程..."
+print_info "Start the VibeGo publishing process..."
 echo ""
 
-# 步骤 1: 检查 keyring 中是否存储了 PyPI token
-print_info "检查 keyring 配置..."
+# Step 1: Check if PyPI token is stored in keyring
+print_info "Check keyring configuration..."
 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"
+    print_error "PyPI token not found in keyring"
     echo ""
-    echo "请先执行以下命令存储 token："
+    echo "Please execute the following command to store the token first:"
     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 配置正确"
+print_success "Keyring Configured correctly"
 echo ""
 
-# 步骤 2: 创建/激活虚拟环境
-print_info "创建构建虚拟环境..."
+# Step 2: create/Activate virtual environment
+print_info "createBuild a virtual environment..."
 python3.11 -m venv ~/.venvs/vibego-build
 source ~/.venvs/vibego-build/bin/activate
-print_success "虚拟环境已激活"
+print_success "Virtual environment is activated"
 echo ""
 
-# 步骤 3: 升级 pip 和安装构建工具
-print_info "安装构建依赖..."
+# Step 3: Upgrade pip and install build tools
+print_info "Install build dependencies..."
 pip install --upgrade pip build twine keyring > /dev/null 2>&1
-print_success "构建依赖已安装"
+print_success "Build dependencies installed"
 echo ""
 
-# 步骤 4: 清理旧的构建产物
-print_info "清理旧的构建产物..."
+# Step 4: Clean up old build artifacts
+print_info "Clean up old build artifacts..."
 rm -rf "$PROJECT_ROOT/dist"
-print_success "构建产物已清理"
+print_success "Build artifacts cleaned"
 echo ""
 
-# 步骤 5: 递增版本号
-VERSION_TYPE="${1:-patch}"  # 默认为 patch
-print_info "递增版本号（类型：$VERSION_TYPE）..."
+# Step 5: Increment version number
+VERSION_TYPE="${1:-patch}"  # Default is patch
+print_info "Increment version number (type:$VERSION_TYPE)..."
 ./scripts/bump_version.sh "$VERSION_TYPE"
 echo ""
 
-# 步骤 6: 构建分发包
-print_info "构建 Python 分发包..."
+# Step 6: Build distribution package
+print_info "Build the Python distribution..."
 python3.11 -m build
-print_success "分发包构建完成"
+print_success "The distribution package is built"
 echo ""
 
-# 步骤 7: 上传到 PyPI（使用 keyring 自动认证）
-print_info "上传到 PyPI（使用 keyring 认证）..."
+# Step 7: Upload to PyPI (automatic authentication using keyring)
+print_info "Upload to PyPI (using keyring authentication)..."
 twine upload dist/*
-print_success "已成功上传到 PyPI"
+print_success "Successfully uploaded to PyPI"
 echo ""
 
-# 步骤 8: 清理并重装 pipx 中的 vibego
-print_info "更新本地 pipx 安装..."
+# Step 8: Clean and reinstall vibego in pipx
+print_info "Update local pipx installation..."
 rm -rf ~/.cache/pipx
 rm -rf ~/.local/pipx/venvs/vibego
 pipx install --python python3.11 vibego
 pipx upgrade vibego
-print_success "本地 vibego 已更新"
+print_success "local vibego updated"
 echo ""
 
-# 步骤 9: 重启 vibego 服务
-print_info "重启 vibego 服务..."
-vibego stop || true  # 忽略停止失败的错误
+# Step 9: Restart vibego service
+print_info "Restart vibego service..."
+vibego stop || true  # Ignore stop failure errors
 sleep 2
 vibego start
-print_success "vibego 服务已重启"
+print_success "vibego Service has been restarted"
 echo ""
 
-# 完成
+# Complete
 print_success "========================================="
-print_success "🎉 发布流程完成！"
+print_success "🎉 The publishing process is complete!"
 print_success "========================================="
 echo ""
-print_info "后续步骤："
-echo "  1. 推送 git 提交和标签："
+print_info "Next steps:"
+echo "  1. Push git commits and tags:"
 echo "     git push && git push --tags"
 echo ""
-echo "  2. 验证 PyPI 页面："
+echo "  2. Verify PyPI page:"
 echo "     https://pypi.org/project/vibego/"
 echo ""

scripts/requirements.txt

@@ -2,3 +2,4 @@ aiogram>=3.0.0,<4.0.0
 aiohttp-socks>=0.10.0
 aiosqlite>=0.19.0
 markdown-it-py>=3.0.0,<4.0.0
+watchdog>=4.0.0

scripts/run_bot.sh

@@ -1,11 +1,32 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
+# shellcheck disable=SC2155
 SOURCE_ROOT="${VIBEGO_PACKAGE_ROOT:-$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)}"
-RUNTIME_ROOT="${VIBEGO_RUNTIME_ROOT:-$SOURCE_ROOT}"
+
+resolve_config_root() {
+  local raw=""
+  if [[ -n "${MASTER_CONFIG_ROOT:-}" ]]; then
+    raw="$MASTER_CONFIG_ROOT"
+  elif [[ -n "${VIBEGO_CONFIG_DIR:-}" ]]; then
+    raw="$VIBEGO_CONFIG_DIR"
+  elif [[ -n "${XDG_CONFIG_HOME:-}" ]]; then
+    raw="${XDG_CONFIG_HOME%/}/vibego"
+  else
+    raw="$HOME/.config/vibego"
+  fi
+  if [[ "$raw" == ~* ]]; then
+    printf '%s' "${raw/#\~/$HOME}"
+  else
+    printf '%s' "$raw"
+  fi
+}
+
+CONFIG_ROOT="$(resolve_config_root)"
+RUNTIME_ROOT="${VIBEGO_RUNTIME_ROOT:-$CONFIG_ROOT/runtime}"
 VENV_DIR="$RUNTIME_ROOT/.venv"
 MODELS_DIR="$SOURCE_ROOT/scripts/models"
-LOG_ROOT="${LOG_ROOT:-$RUNTIME_ROOT/logs}"
+LOG_ROOT="${LOG_ROOT:-$CONFIG_ROOT/logs}"
 DEFAULT_LOG_FILE="$LOG_ROOT/run_bot.log"
 LOG_FILE="${LOG_FILE:-$DEFAULT_LOG_FILE}"
 MODEL_DEFAULT="${MODEL_DEFAULT:-codex}"
@@ -13,11 +34,11 @@ PROJECT_DEFAULT="${PROJECT_NAME:-}"
 
 usage() {
   cat <<USAGE
-用法：${0##*/} [--model 名称] [--project 名称] [--foreground] [--no-stop]
-  --model        启动指定模型 (codex|claudecode|gemini)，默认: $MODEL_DEFAULT
-  --project      指定项目别名，用于日志/会话区分
-  --foreground   在前台运行（调试用），默认后台
-  --no-stop      启动前不执行 stop_bot.sh（默认会先停旧实例）
+usage:${0##*/} [--model name] [--project name] [--foreground] [--no-stop]
+  --model        Start the specified model (codex|claudecode|gemini), default: $MODEL_DEFAULT
+  --project      Specify project alias for logging/Conversation distinction
+  --foreground   Run in foreground(for debugging), defaultBackstage
+  --no-stop      Not executed before startup stop_bot.sh(defaultOld instances will be stopped first)
 USAGE
 }
 
@@ -39,7 +60,7 @@ while [[ $# -gt 0 ]]; do
     -h|--help)
       usage; exit 0 ;;
     *)
-      echo "未知参数: $1" >&2
+      echo "unknown parameters: $1" >&2
       usage
       exit 1 ;;
   esac
@@ -47,14 +68,14 @@ done
 
 MODEL_SCRIPT="$MODELS_DIR/$MODEL.sh"
 if [[ ! -f "$MODEL_SCRIPT" ]]; then
-  echo "[run-bot] 不支持的模型: $MODEL" >&2
+  echo "[run-bot] Unsupported model: $MODEL" >&2
   exit 1
 fi
 
-# 加载公共函数 + 模型配置
+# Load public functions + Model configuration
 # shellcheck disable=SC1090
 source "$MODELS_DIR/common.sh"
-# 允许模型脚本重用环境变量
+# Allow model scripts to reuse environment variables
 MODEL_WORKDIR="${MODEL_WORKDIR:-}" 
 # shellcheck disable=SC1090
 source "$MODEL_SCRIPT"
@@ -69,6 +90,7 @@ LOG_DIR="$(log_dir_for "$MODEL" "$PROJECT_NAME")"
 MODEL_LOG="$LOG_DIR/model.log"
 RUN_LOG="$LOG_DIR/run_bot.log"
 POINTER_FILE="$LOG_DIR/${MODEL_POINTER_BASENAME:-current_session.txt}"
+LOCK_FILE="${SESSION_LOCK_FILE:-$LOG_DIR/${MODEL_POINTER_LOCK_BASENAME:-session_lock.json}}"
 TMUX_SESSION="$(tmux_session_for "$PROJECT_NAME")"
 
 expand_model_workdir() {
@@ -83,24 +105,24 @@ expand_model_workdir() {
 MODEL_WORKDIR="$(expand_model_workdir "$MODEL_WORKDIR")"
 
 if [[ -z "$MODEL_WORKDIR" ]]; then
-  echo "[run-bot] 配置缺少 MODEL_WORKDIR，请检查 config/projects.json" >&2
+  echo "[run-bot] Configuration is missing MODEL_WORKDIR, Please check config/projects.json" >&2
   exit 1
 fi
 
 if [[ ! -d "$MODEL_WORKDIR" ]]; then
-  echo "[run-bot] 工作目录不存在: $MODEL_WORKDIR" >&2
+  echo "[run-bot] Working directory does not exist: $MODEL_WORKDIR" >&2
   exit 1
 fi
 
 if ! command -v tmux >/dev/null 2>&1; then
-  echo "[run-bot] 未检测到 tmux，可通过 'brew install tmux' 安装" >&2
+  echo "[run-bot] tmux not detected, pass 'brew install tmux' Install" >&2
   exit 1
 fi
 
 if [[ -n "$MODEL_CMD" ]]; then
   IFS=' ' read -r MODEL_CMD_BIN _ <<<"$MODEL_CMD"
   if [[ -n "$MODEL_CMD_BIN" ]] && ! command -v "$MODEL_CMD_BIN" >/dev/null 2>&1; then
-    echo "[run-bot] 未检测到模型命令: $MODEL_CMD_BIN" >&2
+    echo "[run-bot] Model command not detected: $MODEL_CMD_BIN" >&2
     exit 1
   fi
 fi
@@ -112,7 +134,7 @@ if (( FOREGROUND == 0 )); then
   CMD=("$0" --model "$MODEL" --project "$PROJECT_NAME" --foreground)
   (( NO_STOP )) && CMD+=(--no-stop)
   nohup "${CMD[@]}" >>"$RUN_LOG" 2>&1 &
-  echo "[run-bot] 后台启动 (model=$MODEL project=$PROJECT_NAME) 日志: $RUN_LOG"
+  echo "[run-bot] Start in background (model=$MODEL project=$PROJECT_NAME) log: $RUN_LOG"
   exit 0
 fi
 
@@ -129,7 +151,7 @@ fi
 source "$VENV_DIR/bin/activate"
 REQUIREMENTS_PATH="${VIBEGO_REQUIREMENTS_PATH:-$SOURCE_ROOT/scripts/requirements.txt}"
 if [[ ! -f "$REQUIREMENTS_PATH" ]]; then
-  echo "[run-bot] 未找到依赖清单: $REQUIREMENTS_PATH" >&2
+  echo "[run-bot] Dependency list not found: $REQUIREMENTS_PATH" >&2
   exit 1
 fi
 if [[ ! -f "$VENV_DIR/.requirements.installed" ]] || [[ "$REQUIREMENTS_PATH" -nt "$VENV_DIR/.requirements.installed" ]]; then
@@ -146,6 +168,8 @@ export MODEL_SESSION_ROOT
 export MODEL_SESSION_GLOB
 export SESSION_POINTER_FILE="$POINTER_FILE"
 export CODEX_SESSION_FILE_PATH="$POINTER_FILE"
+export SESSION_LOCK_FILE="$LOCK_FILE"
+export SESSION_LOCK_FILE_PATH="$LOCK_FILE"
 export TMUX_SESSION="$TMUX_SESSION"
 export TMUX_LOG="$MODEL_LOG"
 export PROJECT_NAME="$PROJECT_NAME"