vibego 0.2.12__py3-none-any.whl → 0.2.13__py3-none-any.whl

bot.py

@@ -1203,6 +1203,118 @@ def _resolve_worker_target_chat_ids() -> List[int]:
     return sorted(targets)
 
 
+def _auto_record_chat_id(chat_id: int) -> None:
+    """首次收到消息时自动将 chat_id 记录到 state 文件。
+
+    仅在以下条件同时满足时写入：
+    1. STATE_FILE 环境变量已配置
+    2. state 文件存在
+    3. 当前项目在 state 中的 chat_id 为空
+    """
+    state_file_env = os.environ.get("STATE_FILE")
+    if not state_file_env:
+        return
+
+    state_path = Path(state_file_env).expanduser()
+    if not state_path.exists():
+        worker_log.debug(
+            "STATE_FILE 不存在，跳过自动记录 chat_id",
+            extra={**_session_extra(), "path": str(state_path)},
+        )
+        return
+
+    # 使用文件锁保证并发安全
+    lock_path = state_path.with_suffix(state_path.suffix + ".lock")
+    import fcntl
+
+    try:
+        with open(lock_path, "w", encoding="utf-8") as lock_file:
+            fcntl.flock(lock_file.fileno(), fcntl.LOCK_EX)
+
+            try:
+                # 读取当前 state
+                raw_state = json.loads(state_path.read_text(encoding="utf-8"))
+                if not isinstance(raw_state, dict):
+                    worker_log.warning(
+                        "STATE_FILE 格式异常，跳过自动记录",
+                        extra=_session_extra(),
+                    )
+                    return
+
+                # 检查当前项目的 chat_id
+                project_key = PROJECT_SLUG or PROJECT_NAME
+                if not project_key:
+                    worker_log.warning(
+                        "PROJECT_SLUG 和 PROJECT_NAME 均未设置，跳过自动记录",
+                        extra=_session_extra(),
+                    )
+                    return
+
+                project_state = raw_state.get(project_key)
+                if not isinstance(project_state, dict):
+                    # 项目不存在，创建新条目
+                    raw_state[project_key] = {
+                        "chat_id": chat_id,
+                        "model": ACTIVE_MODEL or "codex",
+                        "status": "running",
+                    }
+                    need_write = True
+                elif project_state.get("chat_id") is None:
+                    # chat_id 为空，更新
+                    project_state["chat_id"] = chat_id
+                    need_write = True
+                else:
+                    # chat_id 已存在，无需更新
+                    need_write = False
+
+                if need_write:
+                    # 写入更新后的 state
+                    tmp_path = state_path.with_suffix(state_path.suffix + ".tmp")
+                    tmp_path.write_text(
+                        json.dumps(raw_state, ensure_ascii=False, indent=4),
+                        encoding="utf-8",
+                    )
+                    tmp_path.replace(state_path)
+                    worker_log.info(
+                        "已自动记录 chat_id=%s 到 state 文件",
+                        chat_id,
+                        extra={**_session_extra(), "project": project_key},
+                    )
+                else:
+                    worker_log.debug(
+                        "chat_id 已存在，跳过自动记录",
+                        extra={**_session_extra(), "existing_chat_id": project_state.get("chat_id")},
+                    )
+
+            except json.JSONDecodeError as exc:
+                worker_log.error(
+                    "STATE_FILE 解析失败，跳过自动记录：%s",
+                    exc,
+                    extra=_session_extra(),
+                )
+            except Exception as exc:
+                worker_log.error(
+                    "自动记录 chat_id 失败：%s",
+                    exc,
+                    extra={**_session_extra(), "chat": chat_id},
+                )
+            finally:
+                fcntl.flock(lock_file.fileno(), fcntl.LOCK_UN)
+    except Exception as exc:
+        worker_log.error(
+            "获取文件锁失败：%s",
+            exc,
+            extra=_session_extra(),
+        )
+    finally:
+        # 清理锁文件
+        try:
+            if lock_path.exists():
+                lock_path.unlink()
+        except Exception:
+            pass
+
+
 async def _broadcast_worker_keyboard(bot: Bot) -> None:
     """启动时主动推送菜单，确保 Telegram 键盘同步。"""
     targets = _resolve_worker_target_chat_ids()
@@ -2657,7 +2769,8 @@ def _build_summary_prompt(
 ) -> str:
     """构造模型摘要提示词，要求携带请求标识。"""
 
-    task_code = _format_task_command(task.id)
+    # 摘要提示词是发送给模型的，使用纯文本格式，不需要 Markdown 转义
+    task_code = f"/{task.id}" if task.id else "-"
     title = task.title or "-"
     status_label = STATUS_LABELS.get(task.status, task.status)
     note_lines: list[str] = []
@@ -2820,8 +2933,9 @@ def _build_task_history_view(
     if total_items == 0:
         raise ValueError("暂无事件记录")
 
+    # 历史记录会被包裹在代码块中显示，使用纯文本格式，不需要 Markdown 转义
     title_text = normalize_newlines(task.title or "").strip() or "-"
-    title_display = _escape_markdown_text(title_text) if _IS_MARKDOWN_V2 else title_text
+    title_display = title_text
 
     digit_width = len(str(max(total_items, 1)))
     placeholder_page = "9" * digit_width
@@ -3650,7 +3764,19 @@ def _get_delivered_offsets(chat_id: int, session_key: str) -> set[int]:
     return CHAT_DELIVERED_OFFSETS.setdefault(chat_id, {}).setdefault(session_key, set())
 
 
-async def _deliver_pending_messages(chat_id: int, session_path: Path) -> bool:
+async def _deliver_pending_messages(
+    chat_id: int,
+    session_path: Path,
+    *,
+    add_completion_header: bool = True
+) -> bool:
+    """发送待处理的模型消息。
+
+    Args:
+        chat_id: Telegram 聊天 ID
+        session_path: 会话文件路径
+        add_completion_header: 是否添加"✅模型执行完成"前缀（快速轮询阶段为 True，延迟轮询为 False）
+    """
     session_key = str(session_path)
     previous_offset = SESSION_OFFSETS.get(session_key, 0)
     new_offset, events = _read_session_events(session_path)
@@ -3725,7 +3851,8 @@ async def _deliver_pending_messages(chat_id: int, session_path: Path) -> bool:
             last_committed_offset = event_offset
             SESSION_OFFSETS[session_key] = event_offset
             continue
-        formatted_text = _prepend_completion_header(text_to_send)
+        # 根据轮询阶段决定是否添加完成前缀
+        formatted_text = _prepend_completion_header(text_to_send) if add_completion_header else text_to_send
         payload_for_hash = _prepare_model_payload(formatted_text)
         initial_hash = hashlib.sha256(payload_for_hash.encode("utf-8", errors="ignore")).hexdigest()
         if initial_hash in delivered_hashes:
@@ -3836,22 +3963,24 @@ async def _deliver_pending_messages(chat_id: int, session_path: Path) -> bool:
         SESSION_OFFSETS[session_key] = max(last_committed_offset, new_offset)
 
     if delivered_response:
+        # 实际发送了消息，返回 True 表示本次调用成功发送
+        # 这样可以确保延迟轮询机制被正确触发
         if ENABLE_PLAN_PROGRESS and plan_active:
             worker_log.info(
-                "模型输出已发送，但计划仍在更新，继续监听",
+                "模型输出已发送，但计划仍在更新",
+                extra={
+                    **_session_extra(path=session_path),
+                    "chat": chat_id,
+                },
+            )
+        else:
+            worker_log.info(
+                "模型输出已发送且计划完成",
                 extra={
                     **_session_extra(path=session_path),
                     "chat": chat_id,
                 },
             )
-            return False
-        worker_log.info(
-            "模型输出已发送且计划完成",
-            extra={
-                **_session_extra(path=session_path),
-                "chat": chat_id,
-            },
-        )
         return True
 
     if ENABLE_PLAN_PROGRESS and not plan_active and final_response_sent:
@@ -4190,16 +4319,17 @@ async def _watch_and_notify(chat_id: int, session_path: Path,
 
     两阶段轮询机制：
     - 阶段1（快速轮询）：interval 间隔（通常 0.3 秒），直到首次发送成功
-    - 阶段2（延迟轮询）：180 秒间隔，最多 10 次，捕获长时间任务的后续输出
+    - 阶段2（延迟轮询）：3 秒间隔，最多 600 次（持续 30 分钟），捕获长时间任务的后续输出
 
     异常安全：使用 try...finally 确保状态清理。
+    中断机制：收到新 Telegram 消息时会设置 interrupted 标志，轮询自动停止。
     """
     start = time.monotonic()
     first_delivery_done = False
     current_interval = interval  # 初始为快速轮询间隔（0.3 秒）
     long_poll_rounds = 0
-    long_poll_max_rounds = 10
-    long_poll_interval = 180.0  # 3 分钟
+    long_poll_max_rounds = 600  # 30 分钟 / 3 秒 = 600 次
+    long_poll_interval = 3.0  # 3 秒
 
     try:
         while True:
@@ -4233,7 +4363,12 @@ async def _watch_and_notify(chat_id: int, session_path: Path,
                 continue
 
             try:
-                delivered = await _deliver_pending_messages(chat_id, session_path)
+                # 快速轮询阶段添加前缀，延迟轮询阶段不添加
+                delivered = await _deliver_pending_messages(
+                    chat_id,
+                    session_path,
+                    add_completion_header=not first_delivery_done
+                )
             except Exception as exc:
                 worker_log.error(
                     "消息发送时发生未预期异常",
@@ -6918,6 +7053,9 @@ async def on_edit_new_value(message: Message, state: FSMContext) -> None:
 
 @router.message(CommandStart())
 async def on_start(m: Message):
+    # 首次收到消息时自动记录 chat_id 到 state 文件
+    _auto_record_chat_id(m.chat.id)
+
     await m.answer(
         (
             f"Hello, {m.from_user.full_name}！\n"
@@ -6933,6 +7071,9 @@ async def on_start(m: Message):
 
 @router.message(F.text)
 async def on_text(m: Message):
+    # 首次收到消息时自动记录 chat_id 到 state 文件
+    _auto_record_chat_id(m.chat.id)
+
     prompt = (m.text or "").strip()
     if not prompt:
         return await m.answer("请输入非空提示词")

{vibego-0.2.12.dist-info → vibego-0.2.13.dist-info}/METADATA

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

{vibego-0.2.12.dist-info → vibego-0.2.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bot.py,sha256=NPa3-Zb_20O8AjpQTUBDFfTZesh5kVEXRK17SbNpu_0,256916
+bot.py,sha256=YsMdqha8MaJrnDJQwZ0GgQFrnoYKctV5es-RmbL-VeU,262371
 logging_setup.py,sha256=gvxHi8mUwK3IhXJrsGNTDo-DR6ngkyav1X-tvlBF_IE,4613
 master.py,sha256=Qz2NTapUexVvpQz8Y_pVhKd-uXkqp3M6oclzfAzIuGs,106497
 project_repository.py,sha256=UcthtSGOJK0cTE5bQCneo3xkomRG-kyc1N1QVqxeHIs,17577
@@ -425,14 +425,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=qgEUIxQ50ynuK_Dcun8OGqFZe0ICJWheDr1_-6tT9bU,311
+vibego_cli/__init__.py,sha256=HDuRE3BFyJQ0KL0Ozp34-WoYBjtGdy6lzYEt1AS7vyY,311
 vibego_cli/__main__.py,sha256=qqTrYmRRLe4361fMzbI3-CqpZ7AhTofIHmfp4ykrrBY,158
 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.12.dist-info/METADATA,sha256=rqZTvJDLdYpOe_2FY4rEvGfnVVWC543yh0Nn944vCt8,10475
-vibego-0.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-0.2.12.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-0.2.12.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-0.2.12.dist-info/RECORD,,
+vibego-0.2.13.dist-info/METADATA,sha256=eaSYWnC-3iRHcqmq3ewae3njV2s53eWMwS1Rggkqrhg,10475
+vibego-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-0.2.13.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-0.2.13.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-0.2.13.dist-info/RECORD,,

vibego_cli/__init__.py

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