An always-on second brain you talk to. Voice notes in Telegram → typed, linked knowledge in your Obsidian vault. Runs 24/7 on the Claude subscription you already have.
Python ai-agentsai-automationclaudeclaude-codeebbinghausknowledge-graphllmmemory-systemobsidianpersonal-assistantpkmproductivitypythonsecond-braintelegram-botvoice-assistant
fix(chat): blind-review hardening for media input
smixs9191985c53c4
diff --git a/src/d_brain/bot/handlers/chat.py b/src/d_brain/bot/handlers/chat.pyindex 6d59a3a..cb11a7b 100644--- a/src/d_brain/bot/handlers/chat.py+++ b/src/d_brain/bot/handlers/chat.py@@ -8,6 +8,7 @@ ChatSessionManager for Claude to process and respond — no debounce buffer.import asyncioimport htmlimport logging+import refrom datetime import datetimefrom typing import Any@@ -34,7 +35,8 @@ MAX_RESPONSE_LENGTH = 4096# - control: client-side Claude Code commands — no model turn, fire-and-forget# - tui: interactive full-screen UIs — undrivable through a typed pane# - everything else (incl. /skill-name) is a normal model turn → marker path-_CONTROL = {"/clear", "/compact", "/model"}+# /compact is NOT here: commands.router (registered earlier) intercepts it.+_CONTROL = {"/clear", "/model"}_TUI_ONLY = {"/agents", "/config", "/login"}_manager: ChatSessionManager | None = None@@ -183,7 +185,10 @@ def extract_media(message: Any) -> tuple[str, str, str, str | None]:name = getattr(obj, "file_name", None)ext = default_ext or "bin"if name and "." in name:- ext = name.rsplit(".", 1)[-1].lower()+ candidate = name.rsplit(".", 1)[-1].lower()+ # file_name is sender-controlled — never let it shape the path+ if re.fullmatch(r"[a-z0-9]{1,10}", candidate):+ ext = candidatereturn (kind, obj.file_id, ext, name)raise ValueError("message carries no known media")@@ -195,7 +200,8 @@ def forward_note(origin: Any) -> str:user = getattr(origin, "sender_user", None)if user is not None:return f"[переслано от: {user.full_name}]\n"- chat = getattr(origin, "chat", None)+ # MessageOriginChannel carries .chat, MessageOriginChat carries .sender_chat+ chat = getattr(origin, "chat", None) or getattr(origin, "sender_chat", None)if chat is not None:return f"[переслано из: {chat.title}]\n"name = getattr(origin, "sender_user_name", None)@@ -219,6 +225,45 @@ def build_media_prompt()+# Telegram albums arrive as N separate messages sharing media_group_id.+# Buffer them briefly and hand the brain ONE prompt with all paths —+# otherwise an album means N long brain turns over the same context.+ALBUM_SETTLE = 1.5+_album_buf: dict[str, list[dict[str, str]]] = {}+_album_tasks: dict[str, asyncio.Task] = {}+++def build_album_prompt(items: list[dict[str, str]]) -> str:+ fwd = next((i["fwd"] for i in items if i["fwd"]), "")+ captions = [i["caption"] for i in items if i["caption"]]+ files = "\n".join(f"- {i['rel_path']} ({i['kind']})" for i in items)+ caption_part = f"\nПодпись: {' / '.join(captions)}" if captions else ""+ return (+ f"{fwd}Пользователь прислал альбом из {len(items)} файлов:\n"+ f"{files}{caption_part}\n"+ "Прочитай файлы (Read поддерживает изображения и PDF), сохрани суть "+ "в память по правилам vault одной записью и кратко ответь."+ )+++async def queue_album_item(+ bot: Bot, *, chat_id: int, user_id: int, group_id: str, item: dict[str, str]+) -> None:+ _album_buf.setdefault(group_id, []).append(item)+ if group_id not in _album_tasks:+ _album_tasks[group_id] = asyncio.create_task(+ _flush_album(bot, chat_id, user_id, group_id)+ )+++async def _flush_album(bot: Bot, chat_id: int, user_id: int, group_id: str) -> None:+ await asyncio.sleep(ALBUM_SETTLE)+ items = _album_buf.pop(group_id, [])+ _album_tasks.pop(group_id, None)+ if items:+ await _process_and_reply(bot, chat_id, user_id, build_album_prompt(items))++# --- Handlers ---@@ -268,7 +313,10 @@ async def handle_chat_voice(message: Message, bot: Bot) -> None:except Exception as e:logger.exception("Error processing voice in chat")- await message.answer(f"Error: {e}")+ try:+ await message.answer(f"Error: {html.escape(str(e)[:200])}")+ except Exception:+ logger.exception("Failed to send voice error message")@router.message(F.text)@@ -315,9 +363,17 @@ async def handle_chat_media(message: Message, bot: Bot) -> None:settings = get_settings()storage = VaultStorage(settings.vault_path)+ timestamp = datetime.fromtimestamp(message.date.timestamp())+ caption = message.caption or ""+ fwd = forward_note(getattr(message, "forward_origin", None))try:kind, file_id, ext, original_name = extract_media(message)+ except ValueError:+ await message.answer(UNSUPPORTED_REPLY)+ return++ try:file = await bot.get_file(file_id)if not file.file_path:await message.answer("Не удалось скачать файл.")@@ -327,14 +383,10 @@ async def handle_chat_media(message: Message, bot: Bot) -> None:await message.answer("Не удалось скачать файл.")return- timestamp = datetime.fromtimestamp(message.date.timestamp())rel_path = storage.save_attachment(file_bytes.read(), timestamp.date(), timestamp, ext)- caption = message.caption or ""- fwd = forward_note(getattr(message, "forward_origin", None))-# Safety net: save to daily with an Obsidian embeddaily_entry = f"{fwd}![[{rel_path}]]"if caption:@@ -349,6 +401,22 @@ async def handle_chat_media(message: Message, bot: Bot) -> None:msg_id=message.message_id,)+ group_id = getattr(message, "media_group_id", None)+ if group_id:+ await queue_album_item(+ bot,+ chat_id=message.chat.id,+ user_id=message.from_user.id,+ group_id=str(group_id),+ item={+ "kind": kind,+ "rel_path": rel_path,+ "caption": caption,+ "fwd": fwd,+ },+ )+ return+prompt = build_media_prompt(kind=kind,rel_path=rel_path,@@ -360,7 +428,22 @@ async def handle_chat_media(message: Message, bot: Bot) -> None:except Exception as e:logger.exception("Error processing media in chat")- await message.answer(f"Error: {e}")+ # Bot API can't hand us files >20MB — keep the librarian promise:+ # the fact and the caption still land in daily.+ if "too big" in str(e).lower():+ note = f"{fwd}(файл >20MB — Telegram не отдаёт его ботам)"+ if caption:+ note += f"\n\n{caption}"+ storage.append_to_daily(note, timestamp, f"[{kind}]")+ await message.answer(+ "Файл больше 20 МБ — Telegram не отдаёт такие ботам. "+ "Подпись сохранил; перешли файл иначе (ссылкой/частями)."+ )+ return+ try:+ await message.answer(f"Error: {html.escape(str(e)[:200])}")+ except Exception:+ logger.exception("Failed to send media error message")@router.message()diff --git a/src/d_brain/services/storage.py b/src/d_brain/services/storage.pyindex 4655e38..44b295e 100644--- a/src/d_brain/services/storage.py+++ b/src/d_brain/services/storage.py@@ -77,7 +77,13 @@ class VaultStorage:"""dir_path = self.get_attachments_dir(day)time_str = timestamp.strftime("%H%M%S")+ # Telegram albums arrive as N messages within the same second —+ # uniquify so concurrent saves never overwrite each other.filename = f"img-{time_str}.{extension}"+ counter = 1+ while (dir_path / filename).exists():+ filename = f"img-{time_str}-{counter}.{extension}"+ counter += 1file_path = dir_path / filenamefile_path.write_bytes(data)diff --git a/tests/test_chat_handler.py b/tests/test_chat_handler.pyindex 9c3b246..fbec642 100644--- a/tests/test_chat_handler.py+++ b/tests/test_chat_handler.py@@ -244,3 +244,75 @@ def test_unsupported_content_reply_exists():from d_brain.bot.handlers.chat import UNSUPPORTED_REPLYassert "голос" in UNSUPPORTED_REPLY or "voice" in UNSUPPORTED_REPLY.lower()+++# ── blind-review fixes: collisions, albums, attribution, escaping ──────────+++def test_save_attachment_never_overwrites_same_second(tmp_path):+ from datetime import date, datetime++ from d_brain.services.storage import VaultStorage++ s = VaultStorage(tmp_path)+ ts = datetime(2026, 6, 10, 12, 0, 0)+ p1 = s.save_attachment(b"one", date(2026, 6, 10), ts, "jpg")+ p2 = s.save_attachment(b"two", date(2026, 6, 10), ts, "jpg")+ assert p1 != p2+ assert (tmp_path / "attachments/2026-06-10").glob("*")+ assert (tmp_path / p1).read_bytes() == b"one"+ assert (tmp_path / p2).read_bytes() == b"two"+++def test_forward_note_anonymous_group_admin():+ from d_brain.bot.handlers.chat import forward_note++ origin = _Stub(sender_user=None, chat=None, sender_chat=_Stub(title="Work Chat"),+ sender_user_name=None)+ assert "Work Chat" in forward_note(origin)+++def test_extract_media_sanitizes_hostile_extension():+ from d_brain.bot.handlers.chat import extract_media++ doc = _Stub(file_id="d1", file_name="x.a/b")+ msg = _Stub(photo=None, document=doc, video=None, audio=None,+ animation=None, video_note=None)+ _, _, ext, _ = extract_media(msg)+ assert "/" not in ext and "\\" not in ext+++def test_compact_not_a_control_command():+ """commands.router intercepts /compact earlier — keeping it in _CONTROL+ is dead code that lies about behavior."""+ from d_brain.bot.handlers.chat import classify_command++ assert classify_command("/compact") == "turn"+++def test_album_items_flush_as_single_prompt(monkeypatch):+ from d_brain.bot.handlers import chat++ mgr = FakeManager(reply="ok")+ monkeypatch.setattr(chat, "_get_manager", lambda: mgr)+ monkeypatch.setattr(chat, "ALBUM_SETTLE", 0.01)+ bot = FakeBot()++ async def run():+ await chat.queue_album_item(+ bot, chat_id=10, user_id=1, group_id="g1",+ item={"kind": "photo", "rel_path": "attachments/a.jpg",+ "caption": "подпись", "fwd": ""},+ )+ await chat.queue_album_item(+ bot, chat_id=10, user_id=1, group_id="g1",+ item={"kind": "photo", "rel_path": "attachments/b.jpg",+ "caption": "", "fwd": ""},+ )+ await asyncio.sleep(0.1)++ asyncio.run(run())+ assert len(mgr.sent) == 1+ prompt = mgr.sent[0][1]+ assert "attachments/a.jpg" in prompt and "attachments/b.jpg" in prompt+ assert "подпись" in prompt