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

bot.py

@@ -20,6 +20,7 @@ from aiogram.filters import Command, CommandStart
 from aiogram.filters.command import CommandObject
 from aiogram.fsm.context import FSMContext
 from aiogram.fsm.storage.memory import MemoryStorage
+from aiogram.dispatcher.event.bases import SkipHandler
 from aiogram.types import (
     Message,
     BufferedInputFile,
@@ -990,6 +991,22 @@ async def _dispatch_prompt_to_model(
 ) -> tuple[bool, Optional[Path]]:
     """Handle session binding, acknowledgement, and watcher setup after pushing a prompt."""
 
+    if _is_menu_control_message(prompt):
+        worker_log.warning(
+            "Rejected menu control prompt before tmux dispatch",
+            extra={
+                "chat": chat_id,
+                **_session_extra(),
+                "token": _normalize_choice_token(prompt),
+            },
+        )
+        await _reply_to_chat(
+            chat_id,
+            "Skip/Cancel inputs are ignored outside interactive menus. Please send an actual prompt.",
+            reply_to=reply_to,
+        )
+        return False, None
+
     prev_watcher = CHAT_WATCHERS.pop(chat_id, None)
     if prev_watcher is not None:
         if not prev_watcher.done():
@@ -1816,6 +1833,17 @@ async def _enqueue_media_group_message(message: Message, text_part: Optional[str
 async def _handle_prompt_dispatch(message: Message, prompt: str) -> None:
     """Wrapper routine that pushes prompts to the model."""
 
+    if _is_menu_control_message(prompt):
+        worker_log.info(
+            "Dropped menu control prompt during dispatch",
+            extra={
+                **_session_extra(),
+                "chat": getattr(message.chat, "id", None),
+                "token": _normalize_choice_token(prompt),
+            },
+        )
+        return
+
     if ENV_ISSUES:
         message_text = _format_env_issue_message()
         worker_log.warning(
@@ -2299,6 +2327,12 @@ def _is_cancel_message(value: Optional[str]) -> bool:
     return lowered in cancel_tokens
 
 
+def _is_menu_control_message(value: Optional[str]) -> bool:
+    """Return True when the payload represents a generic Skip/Cancel menu action."""
+
+    return _is_skip_message(value) or _is_cancel_message(value)
+
+
 _MARKDOWN_ESCAPE_RE = re.compile(r"([_*\[\]()~`>#+=|{}.!])")
 TASK_REFERENCE_PATTERN = re.compile(r"/?TASK[_]?\d{4,}")
 
@@ -2394,6 +2428,9 @@ MODEL_PUSH_SUPPLEMENT_STATUSES: set[str] = {
     "research",
     "test",
 }
+PUSH_MODEL_SUPPLEMENT_IN_PROGRESS_TEXT = (
+    "A supplementary description prompt is already active. Please respond or tap Skip/Cancel."
+)
 
 SUMMARY_COMMAND_PREFIX = "/task_summary_request_"
 SUMMARY_COMMAND_ALIASES: tuple[str, ...] = (
@@ -6849,6 +6886,10 @@ async def on_task_push_model(callback: CallbackQuery, state: FSMContext) -> None
         await callback.answer("Callback parameter error.", show_alert=True)
         return
     _, _, task_id = parts
+    current_state = await state.get_state()
+    existing_context: Dict[str, Any] = {}
+    if current_state == TaskPushStates.waiting_supplement.state:
+        existing_context = await state.get_data()
     task = await TASK_SERVICE.get_task(task_id)
     if task is None:
         await callback.answer("Task does not exist", show_alert=True)
@@ -6859,10 +6900,20 @@ async def on_task_push_model(callback: CallbackQuery, state: FSMContext) -> None
     actor = _actor_from_callback(callback)
     chat_id = callback.message.chat.id if callback.message else callback.from_user.id
     if task.status in MODEL_PUSH_SUPPLEMENT_STATUSES:
+        origin_message = callback.message
+        origin_message_id = origin_message.message_id if origin_message else None
+        if (
+            current_state == TaskPushStates.waiting_supplement.state
+            and existing_context.get("task_id") == task_id
+            and existing_context.get("origin_message_id") == origin_message_id
+        ):
+            await callback.answer(PUSH_MODEL_SUPPLEMENT_IN_PROGRESS_TEXT)
+            return
         await state.clear()
         await state.update_data(
             task_id=task_id,
-            origin_message=callback.message,
+            origin_message=origin_message,
+            origin_message_id=origin_message_id,
             chat_id=chat_id,
             actor=actor,
         )
@@ -6962,16 +7013,31 @@ async def on_task_push_model_fill(callback: CallbackQuery, state: FSMContext) ->
         await callback.answer("Callback parameter error.", show_alert=True)
         return
     _, _, task_id = parts
+    current_state = await state.get_state()
+    existing_context: Dict[str, Any] = {}
+    if current_state == TaskPushStates.waiting_supplement.state:
+        existing_context = await state.get_data()
     task = await TASK_SERVICE.get_task(task_id)
     if task is None:
         await state.clear()
         await callback.answer("Task does not exist", show_alert=True)
         return
     actor = _actor_from_callback(callback)
+    origin_message = callback.message
+    origin_message_id = origin_message.message_id if origin_message else None
+    if (
+        current_state == TaskPushStates.waiting_supplement.state
+        and existing_context.get("task_id") == task_id
+        and existing_context.get("origin_message_id") == origin_message_id
+    ):
+        await callback.answer(PUSH_MODEL_SUPPLEMENT_IN_PROGRESS_TEXT)
+        return
+    await state.clear()
     await state.update_data(
         task_id=task_id,
-        origin_message=callback.message,
-        chat_id=callback.message.chat.id if callback.message else callback.from_user.id,
+        origin_message=origin_message,
+        origin_message_id=origin_message_id,
+        chat_id=origin_message.chat.id if origin_message else callback.from_user.id,
         actor=actor,
     )
     await state.set_state(TaskPushStates.waiting_supplement)
@@ -6989,18 +7055,18 @@ async def on_task_push_model_supplement(message: Message, state: FSMContext) ->
     if resolved == "Cancel" or trimmed == "Cancel":
         await state.clear()
         await message.answer("Push to the model cancelled.", reply_markup=_build_worker_main_keyboard())
-        return
+        raise SkipHandler()
     data = await state.get_data()
     task_id = data.get("task_id")
     if not task_id:
         await state.clear()
         await message.answer("The push session has expired, please click the button again.", reply_markup=_build_worker_main_keyboard())
-        return
+        raise SkipHandler()
     task = await TASK_SERVICE.get_task(task_id)
     if task is None:
         await state.clear()
         await message.answer("Task not found. Push cancelled.", reply_markup=_build_worker_main_keyboard())
-        return
+        raise SkipHandler()
     supplement: Optional[str] = None
     if trimmed and resolved != SKIP_TEXT:
         if len(trimmed) > DESCRIPTION_MAX_LENGTH:
@@ -7008,7 +7074,7 @@ async def on_task_push_model_supplement(message: Message, state: FSMContext) ->
                 f"Supplementary task description cannot exceed {DESCRIPTION_MAX_LENGTH} characters. Please re-enter:",
                 reply_markup=_build_description_keyboard(),
             )
-            return
+            raise SkipHandler()
         supplement = raw_text.strip()
     chat_id = data.get("chat_id") or message.chat.id
     origin_message = data.get("origin_message")
@@ -7029,11 +7095,11 @@ async def on_task_push_model_supplement(message: Message, state: FSMContext) ->
             extra={"task_id": task_id, "status": task.status if task else None},
         )
         await message.answer("Push failed: missing template configuration.", reply_markup=_build_worker_main_keyboard())
-        return
+        raise SkipHandler()
     await state.clear()
     if not success:
         await message.answer("Push failed: model is not ready. Please retry shortly.", reply_markup=_build_worker_main_keyboard())
-        return
+        raise SkipHandler()
     preview_block, preview_parse_mode = _wrap_text_in_code_block(prompt)
     await _reply_to_chat(
         chat_id,
@@ -7044,6 +7110,7 @@ async def on_task_push_model_supplement(message: Message, state: FSMContext) ->
     )
     if session_path is not None:
         await _send_session_ack(chat_id, session_path, reply_to=origin_message)
+    raise SkipHandler()
 
 
 @router.callback_query(F.data.startswith("task:history:"))
@@ -8141,10 +8208,14 @@ async def on_start(m: Message):
         await m.answer(_format_env_issue_message())
 
 @router.message(F.text)
-async def on_text(m: Message):
+async def on_text(m: Message, state: FSMContext | None = None):
     # Automatically record chat when first received message_id to state document
     _auto_record_chat_id(m.chat.id)
 
+    current_state: Optional[str] = None
+    if state is not None:
+        current_state = await state.get_state()
+
     prompt = (m.text or "").strip()
     if not prompt:
         return await m.answer("Please enter a non-empty prompt word")
@@ -8154,6 +8225,22 @@ async def on_text(m: Message):
         return
     if prompt.startswith("/"):
         return
+    if current_state:
+        worker_log.debug(
+            "Suppressed model dispatch due to active wizard state",
+            extra={**_session_extra(), "chat": m.chat.id, "state": current_state},
+        )
+        return
+    if _is_menu_control_message(prompt):
+        worker_log.info(
+            "Suppressed stray menu control input without active wizard",
+            extra={
+                **_session_extra(),
+                "chat": getattr(m.chat, "id", None),
+                "token": _normalize_choice_token(prompt),
+            },
+        )
+        return
     await _handle_prompt_dispatch(m, prompt)
 
 

{vibego-1.0.10.dist-info → vibego-1.0.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vibego
-Version: 1.0.10
+Version: 1.0.13
 Summary: vibego CLI: tools for bootstrapping and managing the Telegram Master Bot
 Author: DavidChan
 License-Expression: LicenseRef-Proprietary

{vibego-1.0.10.dist-info → vibego-1.0.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bot.py,sha256=bQ-tadaS-CX9699JhO6wtgBeAiXZsbb21GDRAusXJiQ,300928
+bot.py,sha256=CYafcUAWUSm2jiYLQR0B41jeacMcIuIhKyBqU33o7OE,304395
 logging_setup.py,sha256=ViXK11TNVakIbA8QMLKXa6ywpAV_j1ydcws0Hx2QqNo,5084
 master.py,sha256=bpcqGsUpk8kHW8sqD6QG6ss-5LGO1OsQ7zsdvkgDJ3E,132763
 project_repository.py,sha256=fdO3xzvt7eBLvek_3mXjXkFpALwllrNWDWeSjtscW2I,17675
@@ -427,15 +427,15 @@ tasks/constants.py,sha256=BNMxSnswF-PTij-p7paMK0G5Tj6wKN-6qpUlMwo1JQA,318
 tasks/fsm.py,sha256=6n0hdFNF3j6ZUcpdJ_TwZBgkrE8aMYHNLHppdGbXGO4,1494
 tasks/models.py,sha256=3OJL3F3nVZIQIejL6LplZkPQxYJXgOhCNA9Rikg8ihk,2461
 tasks/service.py,sha256=rzd2v3kZaRpTi54cEAg2GJbeg45VTufC8bGSL1nGJWc,40115
-vibego-1.0.10.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-vibego_cli/__init__.py,sha256=FPYqYQIBrm5aP_ujpHbtBhSFUsvBDlKfE0fD-RdZFAo,350
+vibego-1.0.13.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+vibego_cli/__init__.py,sha256=kDTL5x8W9WpwZMorsUDzSw8PmcBEXF5_gcQsTfAPkJM,350
 vibego_cli/__main__.py,sha256=lM_m-i1x3yVNQhzRt8wqvuIYeeo1OlLNAEVoJVD7tmw,155
 vibego_cli/config.py,sha256=W-n5y4CTrRpencadWlmhpdrhUHX6tdXQEGXJG1pRM0U,3149
 vibego_cli/deps.py,sha256=nFT-DMsfAiD1lLFnDotxe6aYfeeD9V5TrIPbIbAMTF4,1478
 vibego_cli/main.py,sha256=CZAUHWr45GzzEfALoLuSrnvG2VUuCexiFuCpIvyH8Jc,12506
 vibego_cli/data/worker_requirements.txt,sha256=QSt30DSSSHtfucTFPpc7twk9kLS5rVLNTcvDiagxrZg,62
-vibego-1.0.10.dist-info/METADATA,sha256=gnkCSgLPXn8SwqS3DpNp4G8rIdrXxXZPvy3kRkVrHLI,11901
-vibego-1.0.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-vibego-1.0.10.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
-vibego-1.0.10.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
-vibego-1.0.10.dist-info/RECORD,,
+vibego-1.0.13.dist-info/METADATA,sha256=LxftGfu-gPYEuPCl4Yt5XgvSBM1USH7xDQsWSoab8-s,11901
+vibego-1.0.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+vibego-1.0.13.dist-info/entry_points.txt,sha256=Lsy_zm-dlyxt8-9DL9blBReIwU2k22c8-kifr46ND1M,48
+vibego-1.0.13.dist-info/top_level.txt,sha256=R56CT3nW5H5v3ce0l3QDN4-C4qxTrNWzRTwrxnkDX4U,69
+vibego-1.0.13.dist-info/RECORD,,

vibego_cli/__init__.py

@@ -8,6 +8,6 @@ from __future__ import annotations
 
 __all__ = ["main", "__version__"]
 
-__version__ = "1.0.10"
+__version__ = "1.0.13"
 
 from .main import main  # noqa: E402