Skip to content

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.

feat!: remove /do arbitrary-prompt flow and FSM states

smixs9db51754866d
diff --git a/src/d_brain/bot/handlers/__init__.py b/src/d_brain/bot/handlers/__init__.py
index f7c69d9..c119f44 100644
--- a/src/d_brain/bot/handlers/__init__.py
+++ b/src/d_brain/bot/handlers/__init__.py
@@ -3,7 +3,6 @@
from d_brain.bot.handlers import (
buttons,
commands,
- do,
forward,
photo,
process,
@@ -14,7 +13,6 @@ from d_brain.bot.handlers import (
__all__ = [
"buttons",
"commands",
- "do",
"forward",
"photo",
"process",
diff --git a/src/d_brain/bot/handlers/buttons.py b/src/d_brain/bot/handlers/buttons.py
index e137abb..34f4a8e 100644
--- a/src/d_brain/bot/handlers/buttons.py
+++ b/src/d_brain/bot/handlers/buttons.py
@@ -1,11 +1,8 @@
"""Button handlers for reply keyboard."""
from aiogram import F, Router
-from aiogram.fsm.context import FSMContext
from aiogram.types import Message
-from d_brain.bot.states import DoCommandState
-
router = Router(name="buttons")
@@ -25,16 +22,6 @@ async def btn_process(message: Message) -> None:
await cmd_process(message)
[email protected](F.text == "✨ Запрос")
-async def btn_do(message: Message, state: FSMContext) -> None:
- """Handle Do button - set state and wait for input."""
- await state.set_state(DoCommandState.waiting_for_input)
- await message.answer(
- "🎯 <b>Что сделать?</b>\n\n"
- "Отправь голосовое или текстовое сообщение с запросом."
- )
-
-
@router.message(F.text == "❓ Помощь")
async def btn_help(message: Message) -> None:
"""Handle Help button."""
diff --git a/src/d_brain/bot/handlers/commands.py b/src/d_brain/bot/handlers/commands.py
index 56ff19c..08a4c87 100644
--- a/src/d_brain/bot/handlers/commands.py
+++ b/src/d_brain/bot/handlers/commands.py
@@ -28,7 +28,6 @@ async def cmd_start(message: Message) -> None:
"<b>Команды:</b>\n"
"/status - статус сегодняшнего дня\n"
"/process - обработать записи\n"
- "/do - выполнить произвольный запрос\n"
"/help - справка",
reply_markup=get_main_keyboard(),
)
@@ -47,9 +46,7 @@ async def cmd_help(message: Message) -> None:
"Мысли → Obsidian\n\n"
"<b>Команды:</b>\n"
"/status - сколько записей сегодня\n"
- "/process - обработать записи\n"
- "/do - выполнить произвольный запрос\n\n"
- "<i>Пример: /do перенеси просроченные задачи на понедельник</i>"
+ "/process - обработать записи"
)
diff --git a/src/d_brain/bot/handlers/do.py b/src/d_brain/bot/handlers/do.py
deleted file mode 100644
index a58f9ed..0000000
--- a/src/d_brain/bot/handlers/do.py
+++ /dev/null
@@ -1,123 +0,0 @@
-"""Handler for /do command - arbitrary Claude requests."""
-
-import asyncio
-import logging
-
-from aiogram import Bot, Router
-from aiogram.filters import Command, CommandObject
-from aiogram.fsm.context import FSMContext
-from aiogram.types import Message
-
-from d_brain.bot.formatters import format_process_report
-from d_brain.bot.states import DoCommandState
-from d_brain.config import get_settings
-from d_brain.services.runtime import get_ask_lock, get_processor
-from d_brain.services.transcription import DeepgramTranscriber
-
-router = Router(name="do")
-logger = logging.getLogger(__name__)
-
-
[email protected](Command("do"))
-async def cmd_do(message: Message, command: CommandObject, state: FSMContext) -> None:
- """Handle /do command."""
- user_id = message.from_user.id if message.from_user else 0
-
- # Check for inline text: /do move overdue tasks
- if command.args:
- await process_request(message, command.args, user_id)
- return
-
- # Otherwise, wait for next message
- await state.set_state(DoCommandState.waiting_for_input)
- await message.answer(
- "🎯 <b>Что сделать?</b>\n\n"
- "Отправь голосовое или текстовое сообщение с запросом."
- )
-
-
[email protected](DoCommandState.waiting_for_input)
-async def handle_do_input(message: Message, bot: Bot, state: FSMContext) -> None:
- """Handle voice/text input after /do command."""
- await state.clear() # Clear state immediately
-
- prompt = None
-
- # Handle voice input
- if message.voice:
- await message.chat.do(action="typing")
- settings = get_settings()
- transcriber = DeepgramTranscriber(settings.deepgram_api_key)
-
- try:
- file = await bot.get_file(message.voice.file_id)
- if not file.file_path:
- await message.answer("❌ Не удалось скачать голосовое")
- return
-
- file_bytes = await bot.download_file(file.file_path)
- if not file_bytes:
- await message.answer("❌ Не удалось скачать голосовое")
- return
-
- audio_bytes = file_bytes.read()
- prompt = await transcriber.transcribe(audio_bytes)
- except Exception as e:
- logger.exception("Failed to transcribe voice for /do")
- await message.answer(f"❌ Не удалось транскрибировать: {e}")
- return
-
- if not prompt:
- await message.answer("❌ Не удалось распознать речь")
- return
-
- # Echo transcription to user
- await message.answer(f"🎤 <i>{prompt}</i>")
-
- # Handle text input
- elif message.text:
- prompt = message.text
-
- else:
- await message.answer("❌ Отправь текст или голосовое сообщение")
- return
-
- user_id = message.from_user.id if message.from_user else 0
- await process_request(message, prompt, user_id)
-
-
-async def process_request(message: Message, prompt: str, user_id: int = 0) -> None:
- """Process the user's request with Claude."""
- status_msg = await message.answer("⏳ Выполняю...")
-
- settings = get_settings()
- processor = get_processor(settings)
-
- async def run_with_progress() -> dict:
- task = asyncio.create_task(
- asyncio.to_thread(processor.execute_prompt, prompt, user_id)
- )
-
- elapsed = 0
- while not task.done():
- await asyncio.sleep(30)
- elapsed += 30
- if not task.done():
- try:
- await status_msg.edit_text(
- f"⏳ Выполняю... ({elapsed // 60}m {elapsed % 60}s)"
- )
- except Exception:
- pass
-
- return await task
-
- async with get_ask_lock():
- report = await run_with_progress()
-
- formatted = format_process_report(report)
- try:
- await status_msg.edit_text(formatted)
- except Exception:
- # Fallback: send without HTML parsing
- await status_msg.edit_text(formatted, parse_mode=None)
diff --git a/src/d_brain/bot/keyboards.py b/src/d_brain/bot/keyboards.py
index 183ae84..241d3db 100644
--- a/src/d_brain/bot/keyboards.py
+++ b/src/d_brain/bot/keyboards.py
@@ -7,11 +7,8 @@ from aiogram.utils.keyboard import ReplyKeyboardBuilder
def get_main_keyboard() -> ReplyKeyboardMarkup:
"""Main reply keyboard with common commands."""
builder = ReplyKeyboardBuilder()
- # First row: main commands
builder.button(text="📊 Статус")
builder.button(text="⚙️ Обработать")
- # Second row: additional
- builder.button(text="✨ Запрос")
builder.button(text="❓ Помощь")
- builder.adjust(2, 2) # 2 in first row, 2 in second
+ builder.adjust(3)
return builder.as_markup(resize_keyboard=True, is_persistent=True)
diff --git a/src/d_brain/bot/main.py b/src/d_brain/bot/main.py
index 791b8c6..c41c92e 100644
--- a/src/d_brain/bot/main.py
+++ b/src/d_brain/bot/main.py
@@ -31,7 +31,6 @@ def create_dispatcher() -> Dispatcher:
from d_brain.bot.handlers import (
buttons,
commands,
- do,
forward,
photo,
process,
@@ -39,13 +38,11 @@ def create_dispatcher() -> Dispatcher:
voice,
)
- # Use memory storage for FSM (required for /do command state)
dp = Dispatcher(storage=MemoryStorage())
# Register routers - ORDER MATTERS
dp.include_router(commands.router)
dp.include_router(process.router)
- dp.include_router(do.router) # Before voice/text to catch FSM state
dp.include_router(buttons.router) # Reply keyboard buttons
dp.include_router(voice.router)
dp.include_router(photo.router)
diff --git a/src/d_brain/bot/states.py b/src/d_brain/bot/states.py
deleted file mode 100644
index 961fd41..0000000
--- a/src/d_brain/bot/states.py
+++ /dev/null
@@ -1,9 +0,0 @@
-"""Bot FSM states."""
-
-from aiogram.fsm.state import State, StatesGroup
-
-
-class DoCommandState(StatesGroup):
- """States for /do command flow."""
-
- waiting_for_input = State() # Waiting for voice or text after /do
diff --git a/src/d_brain/services/processor.py b/src/d_brain/services/processor.py
index 5d55c8b..1e39832 100644
--- a/src/d_brain/services/processor.py
+++ b/src/d_brain/services/processor.py
@@ -13,7 +13,6 @@ from pathlib import Path
from typing import Any
from d_brain.services.claude_session import DEFAULT_TIMEOUT, AskResult, ClaudeSession
-from d_brain.services.session import SessionStore
logger = logging.getLogger(__name__)
@@ -61,23 +60,6 @@ class ClaudeProcessor:
skill_path = self.vault_path / ".claude/skills/dbrain-processor/SKILL.md"
return skill_path.read_text() if skill_path.exists() else ""
- def _get_session_context(self, user_id: int) -> str:
- if user_id == 0:
- return ""
- session = SessionStore(self.vault_path)
- today_entries = session.get_today(user_id)
- if not today_entries:
- return ""
- lines = ["=== TODAY'S SESSION ==="]
- for entry in today_entries[-10:]:
- ts = entry.get("ts", "")[11:16]
- entry_type = entry.get("type", "unknown")
- text = entry.get("text", "")[:80]
- if text:
- lines.append(f"{ts} [{entry_type}] {text}")
- lines.append("=== END SESSION ===\n")
- return "\n".join(lines)
-
# ── public operations ────────────────────────────────────────────
def process_daily(self, day: date | None = None) -> dict[str, Any]:
@@ -102,28 +84,3 @@ CRITICAL OUTPUT FORMAT:
- Allowed tags: <b>, <i>, <code>, <s>, <u>
- If entries already processed, return status report in same HTML format"""
return self._ask(prompt)
-
- def execute_prompt(self, user_prompt: str, user_id: int = 0) -> dict[str, Any]:
- today = date.today()
- session_context = self._get_session_context(user_id)
- prompt = f"""Ты - персональный ассистент d-brain.
-
-CONTEXT:
-- Текущая дата: {today}
-- Vault path: {self.vault_path}
-
-{session_context}USER REQUEST:
-{user_prompt}
-
-CRITICAL OUTPUT FORMAT:
-- Return ONLY raw HTML for Telegram (parse_mode=HTML)
-- NO markdown: no **, no ##, no ```, no tables, no -
-- Start with emoji and <b>header</b>
-- Allowed tags: <b>, <i>, <code>, <s>, <u>
-- Be concise - Telegram has 4096 char limit
-
-EXECUTION:
-1. Analyze the request
-2. Read/write vault files as needed
-3. Return HTML status report with results"""
- return self._ask(prompt)
diff --git a/tests/test_processor.py b/tests/test_processor.py
index 425da1b..17a7ed5 100644
--- a/tests/test_processor.py
+++ b/tests/test_processor.py
@@ -21,33 +21,33 @@ class FakeSession:
return self.result
-def test_execute_prompt_returns_report_on_ok(tmp_path):
- sess = FakeSession(AskResult("ok", reply="<b>done</b>"))
- p = ClaudeProcessor(tmp_path, session=sess)
- r = p.execute_prompt("move overdue tasks", user_id=0)
- assert r["report"] == "<b>done</b>"
- assert r["processed_entries"] == 1
- assert sess.prompts and "move overdue tasks" in sess.prompts[0]
+def _daily(tmp_path):
+ (tmp_path / "daily").mkdir(exist_ok=True)
+ (tmp_path / "daily" / "2026-06-07.md").write_text("# d\n")
+ return date(2026, 6, 7)
-def test_execute_prompt_maps_rate_limited(tmp_path):
+def test_process_daily_maps_rate_limited(tmp_path):
+ day = _daily(tmp_path)
sess = FakeSession(AskResult("rate_limited"))
p = ClaudeProcessor(tmp_path, session=sess)
- r = p.execute_prompt("x")
+ r = p.process_daily(day)
assert "error" in r and r["processed_entries"] == 0
-def test_execute_prompt_maps_logged_out(tmp_path):
+def test_process_daily_maps_logged_out(tmp_path):
+ day = _daily(tmp_path)
sess = FakeSession(AskResult("logged_out"))
p = ClaudeProcessor(tmp_path, session=sess)
- r = p.execute_prompt("x")
+ r = p.process_daily(day)
assert "error" in r
-def test_execute_prompt_maps_timeout(tmp_path):
+def test_process_daily_maps_timeout(tmp_path):
+ day = _daily(tmp_path)
sess = FakeSession(AskResult("timeout", detail="no reply"))
p = ClaudeProcessor(tmp_path, session=sess)
- r = p.execute_prompt("x")
+ r = p.process_daily(day)
assert "error" in r
@@ -77,7 +77,6 @@ def test_prompts_contain_no_todoist_references(tmp_path):
(tmp_path / "daily" / "2026-06-07.md").write_text("# d\n")
sess = FakeSession(AskResult("ok", reply="x"))
p = ClaudeProcessor(tmp_path, session=sess)
- p.execute_prompt("сделай что-нибудь", user_id=0)
p.process_daily(date(2026, 6, 7))
joined = "\n".join(sess.prompts).lower()
assert "todoist" not in joined