vibego 0.2.34__tar.gz → 0.2.36__tar.gz

{vibego-0.2.34 → vibego-0.2.36}/PKG-INFO

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

{vibego-0.2.34 → vibego-0.2.36}/bot.py

@@ -534,68 +534,46 @@ def _unescape_markdown_v2(text: str) -> str:
     return re.sub(r"\\([_*\[\]()~`>#+=|{}.!:-])", r"\1", text)
 
 
-def _unescape_if_already_escaped(text: str) -> str:
-    """智能检测并清理预转义文本，特别保护代码块。
-
-    改进的分段处理策略：
-    1. 先识别已转义的代码块（\`\`\`...\`\`\` 和 \`...\`）
-    2. 对这些代码块先反转义边界反引号，变成正常代码块
-    3. 然后用正常的 CODE_SEGMENT_RE 识别代码块
-    4. 只对非代码块的普通文本进行反转义
-    5. 代码块内容保持转义状态（因为是代码本身）
-    6. 重新组合所有段落
-
-    Args:
-        text: 待处理的文本
-
-    Returns:
-        处理后的文本（如未检测到预转义，返回原文本）
-    """
+def _force_unescape_markdown(text: str) -> str:
+    """强制移除 MarkdownV2 转义，同时保护代码块语法不被破坏。"""
     if not text:
         return text
 
-    # 快速检测：如果没有任何转义字符，直接返回
-    if not _is_already_escaped(text):
-        return text
-
-    # 第一步：处理已转义的代码块，将边界反引号反转义
-    # 这样后续可以用正常的 CODE_SEGMENT_RE 识别它们
     processed = text
-
-    # 先标记所有已转义的代码块，用占位符替换
     code_blocks: list[str] = []
 
     def _preserve_code_block(match: re.Match[str]) -> str:
-        """保存代码块并返回占位符"""
+        """临时替换代码块，防止内部字符被错误反转义。"""
         block = match.group(0)
-        # 代码块边界的反引号需要反转义，但内容保持不变
-        # 例如：\`\`\`bash\npython -m vibego\_cli\`\`\`
-        #    -> ```bash\npython -m vibego\_cli```
         if block.startswith(r"\`\`\`"):
-            # 多行代码块
-            unescaped_block = block.replace(r"\`", "`", 6)  # 只替换前后各3个反引号
+            # 多行代码块保留内容，只修复边界反引号
+            unescaped_block = block.replace(r"\`", "`", 6)
         else:
-            # 单行代码块
-            unescaped_block = block.replace(r"\`", "`", 2)  # 只替换前后各1个反引号
+            # 单行代码块同理处理首尾反引号
+            unescaped_block = block.replace(r"\`", "`", 2)
 
         placeholder = f"__CODE_BLOCK_{len(code_blocks)}__"
         code_blocks.append(unescaped_block)
         return placeholder
 
     processed = _ESCAPED_CODE_BLOCK_PATTERN.sub(_preserve_code_block, processed)
+    processed = _unescape_markdown_v2(processed)
 
-    # 第二步：对非代码块部分进行反转义
-    if _is_already_escaped(processed):
-        processed = _unescape_markdown_v2(processed)
-
-    # 第三步：恢复代码块
-    for i, block in enumerate(code_blocks):
-        placeholder = f"__CODE_BLOCK_{i}__"
-        processed = processed.replace(placeholder, block)
+    for index, block in enumerate(code_blocks):
+        processed = processed.replace(f"__CODE_BLOCK_{index}__", block)
 
     return processed
 
 
+def _unescape_if_already_escaped(text: str) -> str:
+    """智能检测并清理预转义文本，必要时触发强制反转义。"""
+    if not text:
+        return text
+    if not _is_already_escaped(text):
+        return text
+    return _force_unescape_markdown(text)
+
+
 def _prepare_model_payload(text: str) -> str:
     if _IS_MARKDOWN_V2:
         cleaned = _unescape_if_already_escaped(text)
@@ -694,12 +672,20 @@ async def _send_with_markdown_guard(
         if raw_sender is None:
             raise
 
+        # Markdown 彻底失败时退回纯文本发送，需要先清理 MarkdownV2 转义符号
+        fallback_payload = _force_unescape_markdown(text)
+        if fallback_payload != text:
+            worker_log.debug(
+                "Markdown 降级为纯文本发送，已移除转义符号",
+                extra={"original_length": len(text), "fallback_length": len(fallback_payload)},
+            )
+
         worker_log.warning(
             "Markdown 解析仍失败，将以纯文本发送",
             extra={"length": len(text)},
         )
-        await raw_sender(text)
-        return text
+        await raw_sender(fallback_payload)
+        return fallback_payload
 
 
 async def _notify_send_failure_message(chat_id: int) -> None:

{vibego-0.2.34 → vibego-0.2.36}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "vibego"
-version = "0.2.34"
+version = "0.2.36"
 description = "vibego CLI：用于初始化与管理 Telegram Master Bot 的工具"
 readme = "README.md"
 requires-python = ">=3.11"
@@ -42,7 +42,7 @@ include = ["vibego_cli", "tasks", "scripts", "telegram_markdown"]
 "scripts" = ["*.sh", "models/*.sh"]
 
 [tool.bumpversion]
-current_version = "0.2.34"
+current_version = "0.2.36"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = ["{major}.{minor}.{patch}"]
 search = "{current_version}"

vibego-0.2.36/tests/test_markdown_guard.py

@@ -0,0 +1,92 @@
+"""验证 Markdown 降级为纯文本时的反转义逻辑。"""
+
+from __future__ import annotations
+
+import pytest
+from aiogram.exceptions import TelegramBadRequest
+from aiogram.methods.base import TelegramMethod
+
+import bot
+
+
+@pytest.mark.asyncio()
+async def test_markdown_guard_plain_fallback_removes_escapes() -> None:
+    """确保回退纯文本时不会残留 MarkdownV2 转义反斜杠。"""
+
+    delivered: list[str] = []
+
+    class _DummyMethod(TelegramMethod):
+        """构造最小化的 TelegramMethod 以便创建异常对象。"""
+
+        __returning__ = bool
+
+        @property
+        def __api_method__(self) -> str:
+            return "testMethod"
+
+        def build_response(self, data, bot):  # pragma: no cover - 测试不会触发
+            return True
+
+        def build_request(self, bot):  # pragma: no cover - 测试不会触发
+            return "testMethod", {}
+
+    async def _failing_sender(_: str) -> None:
+        raise TelegramBadRequest(_DummyMethod(), "Bad Request: can't parse entities")
+
+    async def _raw_sender(payload: str) -> None:
+        delivered.append(payload)
+
+    original = "测试 \\_Markdown\\_ 转义"
+    result = await bot._send_with_markdown_guard(original, _failing_sender, raw_sender=_raw_sender)
+
+    assert delivered and delivered[0] == "测试 _Markdown_ 转义"
+    assert result == "测试 _Markdown_ 转义"
+
+
+@pytest.mark.asyncio()
+@pytest.mark.parametrize(
+    ("original", "expected"),
+    [
+        ("条目 A\\)", "条目 A)"),
+        ("任务编码：/TASK\\_0022", "任务编码：/TASK_0022"),
+        ("配置文件 config\\.json", "配置文件 config.json"),
+        ("版本号 3\\.11\\.4", "版本号 3.11.4"),
+        ("保留连字符 use\\-case", "保留连字符 use-case"),
+        ("强调 \\*重要\\*", "强调 *重要*"),
+        ("变量 \\_value\\_", "变量 _value_"),
+        ("选项 A\\|B", "选项 A|B"),
+        ("集合 \\{a, b\\}", "集合 {a, b}"),
+        ("说明 test\\.", "说明 test."),
+    ],
+)
+async def test_markdown_guard_plain_fallback_force_unescape(
+    original: str,
+    expected: str,
+) -> None:
+    """验证强制反转义可处理只有单个转义符的场景。"""
+
+    delivered: list[str] = []
+
+    class _DummyMethod(TelegramMethod):
+        __returning__ = bool
+
+        @property
+        def __api_method__(self) -> str:
+            return "testMethod"
+
+        def build_response(self, data, bot):  # pragma: no cover - 测试不会触发
+            return True
+
+        def build_request(self, bot):  # pragma: no cover - 测试不会触发
+            return "testMethod", {}
+
+    async def _failing_sender(_: str) -> None:
+        raise TelegramBadRequest(_DummyMethod(), "Bad Request: can't parse entities")
+
+    async def _raw_sender(payload: str) -> None:
+        delivered.append(payload)
+
+    result = await bot._send_with_markdown_guard(original, _failing_sender, raw_sender=_raw_sender)
+
+    assert delivered and delivered[0] == expected
+    assert result == expected

{vibego-0.2.34 → vibego-0.2.36}/tests/test_task_list_entry.py

@@ -419,8 +419,11 @@ def test_task_list_search_flow(monkeypatch):
         user_message = DummyMessage(text="登录")
         await bot.on_task_list_search_keyword(user_message, state)
         assert await state.get_state() is None
-        # 在 MarkdownV2 模式下 * 会被转义
-        assert message.edits and ("*任务搜索结果*" in message.edits[-1]["text"] or "\\*任务搜索结果\\*" in message.edits[-1]["text"])
+        # 在 MarkdownV2 模式下会出现 * 或 _ 的格式化占位
+        assert message.edits
+        header_text = message.edits[-1]["text"]
+        expected_headers = ("*任务搜索结果*", "\\*任务搜索结果\\*", "_任务搜索结果_")
+        assert any(header in header_text for header in expected_headers)
         assert "- 🛠️ 修复登录问题" not in message.edits[-1]["text"]
         assert "- ⚪ 修复登录问题" not in message.edits[-1]["text"]
         assert user_message.calls and "搜索完成" in user_message.calls[-1]["text"]
@@ -457,8 +460,11 @@ def test_task_list_search_cancel_restores_list(monkeypatch):
         cancel_message = DummyMessage(text="取消")
         await bot.on_task_list_search_keyword(cancel_message, state)
         assert await state.get_state() is None
-        # 在 MarkdownV2 模式下 * 会被转义
-        assert message.edits and ("*任务列表*" in message.edits[-1]["text"] or "\\*任务列表\\*" in message.edits[-1]["text"])
+        # 在 MarkdownV2 模式下会出现 * 或 _ 的格式化占位
+        assert message.edits
+        header_text = message.edits[-1]["text"]
+        expected_headers = ("*任务列表*", "\\*任务列表\\*", "_任务列表_")
+        assert any(header in header_text for header in expected_headers)
         assert cancel_message.calls and "已返回任务列表" in cancel_message.calls[-1]["text"]
 
     asyncio.run(_scenario())

{vibego-0.2.34 → vibego-0.2.36}/vibego.egg-info/PKG-INFO

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

{vibego-0.2.34 → vibego-0.2.36}/vibego.egg-info/SOURCES.txt

@@ -435,6 +435,7 @@ tests/test_auto_compact.py
 tests/test_chat_menu_buttons.py
 tests/test_claudecode_jsonl.py
 tests/test_long_poll_mechanism.py
+tests/test_markdown_guard.py
 tests/test_master_project_management.py
 tests/test_master_restart.py
 tests/test_numbered_reply_inputs.py

{vibego-0.2.34 → vibego-0.2.36}/vibego_cli/__init__.py

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