vibego 0.2.14__tar.gz → 0.2.16__tar.gz

{vibego-0.2.14 → vibego-0.2.16}/PKG-INFO

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

{vibego-0.2.14 → vibego-0.2.16}/bot.py

@@ -1986,8 +1986,11 @@ def _build_status_filter_row(current_status: Optional[str], limit: int) -> list[
 def _format_task_list_entry(task: TaskRecord) -> str:
     indent = "  " * max(task.depth, 0)
     title_raw = (task.title or "").strip()
+    # 修复：避免双重转义
     if not title_raw:
         title = "-"
+    elif _IS_MARKDOWN_V2:
+        title = title_raw
     else:
         title = _escape_markdown_text(title_raw)
     type_icon = TASK_TYPE_EMOJIS.get(task.task_type)
@@ -2037,8 +2040,14 @@ def _format_task_detail(
         *,
         notes: Sequence[TaskNoteRecord],
     ) -> str:
+    # 修复：仅在非 MarkdownV2 模式下手动转义，避免双重转义
+    # MarkdownV2 模式下由 _prepare_model_payload() 统一处理转义
     title_raw = (task.title or "").strip()
-    title_text = _escape_markdown_text(title_raw) if title_raw else "-"
+    if _IS_MARKDOWN_V2:
+        title_text = title_raw if title_raw else "-"
+    else:
+        title_text = _escape_markdown_text(title_raw) if title_raw else "-"
+
     task_id_text = _format_task_command(task.id)
     lines: list[str] = [
         f"📝 标题：{title_text}",
@@ -2047,12 +2056,24 @@ def _format_task_detail(
         f"🚦 优先级：{_format_priority(task.priority)}",
         f"📂 类型：{_format_task_type(task.task_type)}",
     ]
-    description_text = _escape_markdown_text(task.description or "暂无")
+
+    # 修复：描述字段也避免双重转义
+    description_raw = task.description or "暂无"
+    if _IS_MARKDOWN_V2:
+        description_text = description_raw
+    else:
+        description_text = _escape_markdown_text(description_raw)
+
     lines.append(f"🖊️ 描述：{description_text}")
     lines.append(f"📅 创建时间：{_format_local_time(task.created_at)}")
     lines.append(f"🔁 更新时间：{_format_local_time(task.updated_at)}")
+
+    # 修复：父任务ID字段也避免双重转义
     if task.parent_id:
-        parent_text = _escape_markdown_text(task.parent_id)
+        if _IS_MARKDOWN_V2:
+            parent_text = task.parent_id
+        else:
+            parent_text = _escape_markdown_text(task.parent_id)
         lines.append(f"👪 父任务：{parent_text}")
 
     return "\n".join(lines)
@@ -5023,7 +5044,11 @@ async def _build_task_search_view(
     sanitized_keyword = keyword.replace("\n", " ").strip()
     if not sanitized_keyword:
         sanitized_keyword = "-"
-    escaped_keyword = _escape_markdown_text(sanitized_keyword)
+    # 修复：避免双重转义
+    if _IS_MARKDOWN_V2:
+        escaped_keyword = sanitized_keyword
+    else:
+        escaped_keyword = _escape_markdown_text(sanitized_keyword)
     lines = [
         "*任务搜索结果*",
         f"搜索关键词：{escaped_keyword}",
@@ -6748,6 +6773,11 @@ async def on_task_detail_callback(callback: CallbackQuery) -> None:
         sent = await _answer_with_markdown(message, detail_text, reply_markup=markup)
         if sent is not None:
             _init_task_view_context(sent, detail_state)
+        else:
+            # 修复：消息发送失败时给用户反馈
+            await message.answer(
+                f"⚠️ 任务详情显示失败，可能包含特殊字符。\n任务ID: {task_id}\n请联系管理员检查任务内容。"
+            )
         return
     if await _try_edit_message(message, detail_text, reply_markup=markup):
         _push_detail_view(message, task_id)
@@ -6755,6 +6785,11 @@ async def on_task_detail_callback(callback: CallbackQuery) -> None:
     sent = await _answer_with_markdown(message, detail_text, reply_markup=markup)
     if sent is not None:
         _init_task_view_context(sent, detail_state)
+    else:
+        # 修复：消息发送失败时给用户反馈
+        await message.answer(
+            f"⚠️ 任务详情显示失败，可能包含特殊字符。\n任务ID: {task_id}\n请联系管理员检查任务内容。"
+        )
 
 
 async def _fallback_task_detail_back(callback: CallbackQuery) -> None:

{vibego-0.2.14 → vibego-0.2.16}/pyproject.toml

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

{vibego-0.2.14 → vibego-0.2.16}/tests/test_task_list_entry.py

@@ -419,7 +419,8 @@ 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
-        assert message.edits and "*任务搜索结果*" in message.edits[-1]["text"]
+        # 在 MarkdownV2 模式下 * 会被转义
+        assert message.edits and ("*任务搜索结果*" in message.edits[-1]["text"] or "\\*任务搜索结果\\*" in message.edits[-1]["text"])
         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"]
@@ -456,7 +457,8 @@ 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
-        assert message.edits and "*任务列表*" in message.edits[-1]["text"]
+        # 在 MarkdownV2 模式下 * 会被转义
+        assert message.edits and ("*任务列表*" in message.edits[-1]["text"] or "\\*任务列表\\*" in message.edits[-1]["text"])
         assert cancel_message.calls and "已返回任务列表" in cancel_message.calls[-1]["text"]
 
     asyncio.run(_scenario())
@@ -508,3 +510,119 @@ def test_task_service_search_tasks_empty_keyword(tmp_path):
     assert results == []
     assert pages == 0
     assert total == 0
+
+
+def test_format_task_detail_with_special_chars_markdown_v2(monkeypatch):
+    """测试修复：在 MarkdownV2 模式下避免双重转义特殊字符"""
+    # 模拟 MarkdownV2 模式
+    monkeypatch.setattr(bot, "_IS_MARKDOWN_V2", True)
+    monkeypatch.setattr(bot, "_IS_MARKDOWN", False)
+
+    # 创建包含特殊字符的任务
+    task = TaskRecord(
+        id="TASK_0001",
+        project_slug="demo",
+        title="修复登录-问题 (v2.0) [紧急]",
+        status="research",
+        priority=3,
+        task_type="defect",
+        tags=(),
+        due_date=None,
+        description="登录接口异常! 需要修复 test_case.example",
+        parent_id="TASK_0000",
+        root_id="TASK_0001",
+        depth=0,
+        lineage="0001",
+        created_at="2025-01-01T00:00:00+08:00",
+        updated_at="2025-01-01T00:00:00+08:00",
+        archived=False,
+    )
+
+    detail_text = bot._format_task_detail(task, notes=[])
+
+    # 在 MarkdownV2 模式下，特殊字符应该保持原样（不手动转义）
+    # 后续由 _prepare_model_payload() 统一转义
+    assert "修复登录-问题 (v2.0) [紧急]" in detail_text
+    assert "登录接口异常! 需要修复 test_case.example" in detail_text
+    assert "TASK_0000" in detail_text
+
+    # 确保没有双重转义（例如 \\- 或 \\( ）
+    assert "\\-" not in detail_text  # 避免 \- 再次被转义
+    assert "\\(" not in detail_text
+    assert "\\[" not in detail_text
+    assert "\\!" not in detail_text
+
+
+def test_format_task_detail_with_special_chars_legacy_markdown(monkeypatch):
+    """测试向后兼容：在传统 Markdown 模式下保持手动转义"""
+    # 模拟传统 Markdown 模式
+    monkeypatch.setattr(bot, "_IS_MARKDOWN_V2", False)
+    monkeypatch.setattr(bot, "_IS_MARKDOWN", True)
+
+    task = TaskRecord(
+        id="TASK_0002",
+        project_slug="demo",
+        title="修复_登录问题",
+        status="test",
+        priority=2,
+        task_type="task",
+        tags=(),
+        due_date=None,
+        description="测试*描述*",
+        parent_id=None,
+        root_id="TASK_0002",
+        depth=0,
+        lineage="0002",
+        created_at="2025-01-01T00:00:00+08:00",
+        updated_at="2025-01-01T00:00:00+08:00",
+        archived=False,
+    )
+
+    detail_text = bot._format_task_detail(task, notes=[])
+
+    # 在传统 Markdown 模式下，应该手动转义特殊字符
+    # _ 和 * 在 _MARKDOWN_ESCAPE_RE 中会被转义
+    assert "修复\\_登录问题" in detail_text  # _ 应该被转义为 \_
+    assert "测试\\*描述\\*" in detail_text  # * 应该被转义为 \*
+
+
+@pytest.mark.parametrize(
+    "title,status,task_type,description",
+    [
+        ("Fix [critical] bug", "research", "defect", "API endpoint /users fails"),
+        ("Update API (v2.0)", "test", "task", "Refactor code: clean up"),
+        ("任务#123! 解决问题.", "done", "requirement", "描述: 完成-测试"),
+        ("Test_case.example", "research", "task", "File path: /path/to/file.txt"),
+        ("含特殊符号: ~`>#+=|{}", "test", "risk", "注意事项"),
+    ],
+)
+def test_format_task_detail_various_special_chars(monkeypatch, title, status, task_type, description):
+    """测试各种特殊字符在 MarkdownV2 模式下的处理"""
+    monkeypatch.setattr(bot, "_IS_MARKDOWN_V2", True)
+    monkeypatch.setattr(bot, "_IS_MARKDOWN", False)
+
+    task = TaskRecord(
+        id="TASK_TEST",
+        project_slug="demo",
+        title=title,
+        status=status,
+        priority=3,
+        task_type=task_type,
+        tags=(),
+        due_date=None,
+        description=description,
+        parent_id=None,
+        root_id="TASK_TEST",
+        depth=0,
+        lineage="0001",
+        created_at="2025-01-01T00:00:00+08:00",
+        updated_at="2025-01-01T00:00:00+08:00",
+        archived=False,
+    )
+
+    # 不应该抛出异常
+    detail_text = bot._format_task_detail(task, notes=[])
+
+    # 标题和描述应该保持原样（在 MarkdownV2 模式下）
+    assert title in detail_text
+    assert description in detail_text

{vibego-0.2.14 → vibego-0.2.16}/vibego.egg-info/PKG-INFO

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

{vibego-0.2.14 → vibego-0.2.16}/vibego_cli/__init__.py

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