vibego 0.2.55__tar.gz → 0.2.57__tar.gz

{vibego-0.2.55 → vibego-0.2.57}/PKG-INFO

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

{vibego-0.2.55 → vibego-0.2.57}/bot.py

@@ -1344,6 +1344,36 @@ ATTACHMENT_USAGE_HINT = (
 _FS_SAFE_PATTERN = re.compile(r"[^A-Za-z0-9._-]")
 
 
+def _attachment_directory_prefix_for_display(relative_path: str) -> Optional[str]:
+    """根据附件相对路径推导目录前缀，便于提示模型定位。"""
+
+    path_str = (relative_path or "").strip()
+    if not path_str:
+        return None
+
+    try:
+        parent = Path(path_str).parent
+    except Exception:
+        return None
+
+    parent_str = parent.as_posix()
+    if parent_str in {"", "."}:
+        if path_str.startswith("./"):
+            parent_str = "./"
+        elif path_str.startswith("/"):
+            parent_str = "/"
+        else:
+            return None
+    else:
+        if path_str.startswith("./") and not parent_str.startswith(("./", "/")):
+            parent_str = f"./{parent_str}"
+
+    if not parent_str.endswith("/"):
+        parent_str = f"{parent_str}/"
+
+    return parent_str
+
+
 def _sanitize_fs_component(value: str, fallback: str) -> str:
     """清理路径片段中的特殊字符，避免越权访问。"""
 
@@ -1417,16 +1447,27 @@ def _guess_extension(mime_type: Optional[str], fallback: str = ".bin") -> str:
 
 
 def _attachment_dir_for_message(message: Message, media_group_id: Optional[str] = None) -> Path:
-    """为当前消息（或媒体组）生成稳定的附件目录。"""
+    """为当前消息生成附件目录，按项目标识 + 日期归档，便于模型定位。"""
 
-    chat_part = _sanitize_fs_component(str(message.chat.id), "chat")
-    base = ATTACHMENT_STORAGE_ROOT / chat_part
-    if media_group_id:
-        group_part = _sanitize_fs_component(media_group_id, str(message.message_id))
-        target = base / f"group_{group_part}"
-    else:
-        timestamp = int((message.date or datetime.now(UTC)).timestamp())
-        target = base / f"msg_{timestamp}_{message.message_id}"
+    # media_group_id 参数保留用于兼容旧调用，目前统一归档至日期目录。
+    _ = media_group_id
+
+    # 优先使用项目 slug，回退到 bot 名称或通用前缀。
+    project_identifier = PROJECT_SLUG or ""
+    sanitized_project = _sanitize_fs_component(project_identifier, "project")
+    if sanitized_project == "project":
+        bot_username = getattr(message.bot, "username", None)
+        sanitized_project = _sanitize_fs_component(bot_username or "bot", "bot")
+
+    # 使用消息时间（UTC）格式化日期，确保相同日期的附件集中存放。
+    event_time = message.date or datetime.now(UTC)
+    try:
+        event_time = event_time.astimezone(UTC)
+    except Exception:
+        event_time = datetime.now(UTC)
+    date_component = event_time.strftime("%Y-%m-%d")
+
+    target = ATTACHMENT_STORAGE_ROOT / sanitized_project / date_component
     target.mkdir(parents=True, exist_ok=True)
     return target
 
@@ -1617,7 +1658,15 @@ def _build_prompt_with_attachments(
     if base_text:
         sections.append(base_text)
     if attachments:
-        lines = ["附件列表（文件位于项目工作目录，可直接读取）："]
+        directory_hint: Optional[str] = None
+        for item in attachments:
+            directory_hint = _attachment_directory_prefix_for_display(item.relative_path)
+            if directory_hint:
+                break
+        if directory_hint:
+            lines = [f"附件列表（文件位于项目工作目录（{directory_hint}），可直接读取）："]
+        else:
+            lines = ["附件列表（文件位于项目工作目录，可直接读取）："]
         for idx, item in enumerate(attachments, 1):
             lines.append(
                 f"{idx}. {item.display_name}（{item.mime_type}）→ {item.relative_path}"

{vibego-0.2.55 → vibego-0.2.57}/pyproject.toml

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

vibego-0.2.57/tests/test_attachment_prompt_format.py

@@ -0,0 +1,50 @@
+import os
+from pathlib import Path
+
+os.environ.setdefault("BOT_TOKEN", "test-token")
+
+from bot import TelegramSavedAttachment, _build_prompt_with_attachments
+
+
+def _make_attachment(relative: str) -> TelegramSavedAttachment:
+    """构造测试附件，方便复用。"""
+
+    return TelegramSavedAttachment(
+        kind="photo",
+        display_name="photo.jpg",
+        mime_type="image/jpeg",
+        absolute_path=Path("/tmp/photo.jpg"),
+        relative_path=relative,
+    )
+
+
+def test_prompt_includes_relative_directory_prefix():
+    prompt = _build_prompt_with_attachments(
+        None,
+        [_make_attachment("./data/telegram/project/date/photo.jpg")],
+    )
+
+    first_line = prompt.splitlines()[0]
+    assert "附件列表" in first_line
+    assert "文件位于项目工作目录（./data/telegram/project/date/），可直接读取" in first_line
+
+
+def test_prompt_handles_absolute_path_directory_prefix():
+    prompt = _build_prompt_with_attachments(
+        "",
+        [_make_attachment("/var/tmp/attachments/photo.jpg")],
+    )
+
+    first_line = prompt.splitlines()[0]
+    assert "文件位于项目工作目录（/var/tmp/attachments/），可直接读取" in first_line
+
+
+def test_prompt_falls_back_when_directory_unknown():
+    prompt = _build_prompt_with_attachments(
+        "",
+        [_make_attachment("photo.jpg")],
+    )
+
+    first_line = prompt.splitlines()[0]
+    assert "文件位于项目工作目录，可直接读取" in first_line
+    assert "文件位于项目工作目录（）" not in first_line

{vibego-0.2.55 → vibego-0.2.57}/vibego.egg-info/PKG-INFO

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

{vibego-0.2.55 → vibego-0.2.57}/vibego.egg-info/SOURCES.txt

@@ -430,6 +430,7 @@ tasks/constants.py
 tasks/fsm.py
 tasks/models.py
 tasks/service.py
+tests/test_attachment_prompt_format.py
 tests/test_auto_compact.py
 tests/test_chat_menu_buttons.py
 tests/test_claudecode_jsonl.py

{vibego-0.2.55 → vibego-0.2.57}/vibego_cli/__init__.py

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