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.

refactor(bot): route handlers and pipeline through shared session

smixs10fefe15af25
diff --git a/scripts/weekly.py b/scripts/weekly.py
index 2b128d3..a31cfe1 100644
--- a/scripts/weekly.py
+++ b/scripts/weekly.py
@@ -15,7 +15,7 @@ from aiogram.enums import ParseMode
from d_brain.config import get_settings
from d_brain.services.git import VaultGit
-from d_brain.services.processor import ClaudeProcessor
+from d_brain.services.runtime import get_processor
logging.basicConfig(
level=logging.INFO,
@@ -27,7 +27,7 @@ logger = logging.getLogger(__name__)
async def main() -> None:
"""Generate weekly digest and send to Telegram."""
settings = get_settings()
- processor = ClaudeProcessor(settings.vault_path, settings.todoist_api_key)
+ processor = get_processor(settings)
git = VaultGit(settings.vault_path)
logger.info("Starting weekly digest generation...")
diff --git a/src/d_brain/bot/handlers/do.py b/src/d_brain/bot/handlers/do.py
index bb07208..a58f9ed 100644
--- a/src/d_brain/bot/handlers/do.py
+++ b/src/d_brain/bot/handlers/do.py
@@ -11,7 +11,7 @@ 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.processor import ClaudeProcessor
+from d_brain.services.runtime import get_ask_lock, get_processor
from d_brain.services.transcription import DeepgramTranscriber
router = Router(name="do")
@@ -91,7 +91,7 @@ async def process_request(message: Message, prompt: str, user_id: int = 0) -> No
status_msg = await message.answer("⏳ Выполняю...")
settings = get_settings()
- processor = ClaudeProcessor(settings.vault_path, settings.todoist_api_key)
+ processor = get_processor(settings)
async def run_with_progress() -> dict:
task = asyncio.create_task(
@@ -112,7 +112,8 @@ async def process_request(message: Message, prompt: str, user_id: int = 0) -> No
return await task
- report = await run_with_progress()
+ async with get_ask_lock():
+ report = await run_with_progress()
formatted = format_process_report(report)
try:
diff --git a/src/d_brain/bot/handlers/process.py b/src/d_brain/bot/handlers/process.py
index d3d12cc..fee1d4b 100644
--- a/src/d_brain/bot/handlers/process.py
+++ b/src/d_brain/bot/handlers/process.py
@@ -11,7 +11,7 @@ from aiogram.types import Message
from d_brain.bot.formatters import format_process_report
from d_brain.config import get_settings
from d_brain.services.git import VaultGit
-from d_brain.services.processor import ClaudeProcessor
+from d_brain.services.runtime import get_ask_lock, get_processor
router = Router(name="process")
logger = logging.getLogger(__name__)
@@ -26,7 +26,7 @@ async def cmd_process(message: Message) -> None:
status_msg = await message.answer("⏳ Processing... (may take up to 10 min)")
settings = get_settings()
- processor = ClaudeProcessor(settings.vault_path, settings.todoist_api_key)
+ processor = get_processor(settings)
git = VaultGit(settings.vault_path)
# Run subprocess in thread to avoid blocking event loop
@@ -49,7 +49,8 @@ async def cmd_process(message: Message) -> None:
return await task
- report = await process_with_progress()
+ async with get_ask_lock():
+ report = await process_with_progress()
# Commit and push changes
if "error" not in report:
diff --git a/src/d_brain/bot/handlers/weekly.py b/src/d_brain/bot/handlers/weekly.py
index 84f948c..489c6dc 100644
--- a/src/d_brain/bot/handlers/weekly.py
+++ b/src/d_brain/bot/handlers/weekly.py
@@ -10,7 +10,7 @@ from aiogram.types import Message
from d_brain.bot.formatters import format_process_report
from d_brain.config import get_settings
from d_brain.services.git import VaultGit
-from d_brain.services.processor import ClaudeProcessor
+from d_brain.services.runtime import get_ask_lock, get_processor
router = Router(name="weekly")
logger = logging.getLogger(__name__)
@@ -25,7 +25,7 @@ async def cmd_weekly(message: Message) -> None:
status_msg = await message.answer("⏳ Генерирую недельный дайджест...")
settings = get_settings()
- processor = ClaudeProcessor(settings.vault_path, settings.todoist_api_key)
+ processor = get_processor(settings)
git = VaultGit(settings.vault_path)
async def run_with_progress() -> dict:
@@ -47,7 +47,8 @@ async def cmd_weekly(message: Message) -> None:
return await task
- report = await run_with_progress()
+ async with get_ask_lock():
+ report = await run_with_progress()
# Commit any changes (weekly goal updates, etc)
if "error" not in report:
diff --git a/src/d_brain/services/runtime.py b/src/d_brain/services/runtime.py
new file mode 100644
index 0000000..60e85af
--- /dev/null
+++ b/src/d_brain/services/runtime.py
@@ -0,0 +1,72 @@
+"""Process-wide singletons for the shared Claude session.
+
+The bot, the daily pipeline and the watchdog must all talk to ONE persistent
+session. This module builds it lazily from Settings and hands the same
+instance to every caller. An asyncio lock serializes ask() calls within the
+bot process (the cross-process flock in ClaudeSession is the real mutex; this
+just avoids piling up blocked worker threads).
+"""
+
+import asyncio
+import uuid
+
+from d_brain.config import Settings
+from d_brain.services.claude_session import ClaudeSession
+from d_brain.services.processor import ClaudeProcessor
+
+_session: ClaudeSession | None = None
+_processor: ClaudeProcessor | None = None
+_ask_lock = asyncio.Lock()
+
+
+def reset() -> None:
+ """Drop the singletons (tests only)."""
+ global _session, _processor
+ _session = None
+ _processor = None
+
+
+def _persisted_name(settings: Settings) -> str:
+ if settings.brain_session_name:
+ return settings.brain_session_name
+ # Randomize per install (fingerprint hygiene) and persist so restarts
+ # reuse the same tmux session name.
+ settings.runtime_dir.mkdir(parents=True, exist_ok=True)
+ name_file = settings.runtime_dir / "brain.name"
+ if name_file.exists():
+ return name_file.read_text().strip()
+ name = f"dbrain_{uuid.uuid4().hex[:8]}"
+ name_file.write_text(name + "\n")
+ return name
+
+
+def get_session(settings: Settings) -> ClaudeSession:
+ global _session
+ if _session is None:
+ project_root = settings.vault_path.parent
+ mcp = project_root / "mcp-config.json"
+ brain_prompt = project_root / "deploy" / "brain-system.md"
+ _session = ClaudeSession(
+ session_name=_persisted_name(settings),
+ work_dir=settings.vault_path,
+ runtime_dir=settings.runtime_dir,
+ mcp_config=mcp if mcp.exists() else None,
+ system_prompt_file=brain_prompt if brain_prompt.exists() else None,
+ model=settings.claude_model or None,
+ )
+ return _session
+
+
+def get_processor(settings: Settings) -> ClaudeProcessor:
+ global _processor
+ if _processor is None:
+ _processor = ClaudeProcessor(
+ settings.vault_path,
+ settings.todoist_api_key,
+ session=get_session(settings),
+ )
+ return _processor
+
+
+def get_ask_lock() -> asyncio.Lock:
+ return _ask_lock
diff --git a/tests/test_runtime.py b/tests/test_runtime.py
new file mode 100644
index 0000000..41713ee
--- /dev/null
+++ b/tests/test_runtime.py
@@ -0,0 +1,46 @@
+"""Tests for the shared session/processor singletons."""
+
+import d_brain.services.runtime as rt
+from d_brain.config import Settings
+
+
+def _settings(tmp_path, **over):
+ base = dict(
+ telegram_bot_token="t",
+ deepgram_api_key="d",
+ vault_path=tmp_path / "vault",
+ runtime_dir=tmp_path / "rt",
+ _env_file=None,
+ )
+ base.update(over)
+ return Settings(**base)
+
+
+def test_get_session_is_singleton(tmp_path):
+ rt.reset()
+ s = _settings(tmp_path)
+ assert rt.get_session(s) is rt.get_session(s)
+
+
+def test_get_processor_is_singleton_and_wired_to_session(tmp_path):
+ rt.reset()
+ s = _settings(tmp_path)
+ p = rt.get_processor(s)
+ assert rt.get_processor(s) is p
+ assert p.session is rt.get_session(s)
+
+
+def test_session_name_persisted_and_stable(tmp_path):
+ rt.reset()
+ s = _settings(tmp_path)
+ name1 = rt.get_session(s).session_name
+ rt.reset() # drop in-memory singleton; must re-read persisted name
+ name2 = rt.get_session(s).session_name
+ assert name1 == name2
+ assert name1.startswith("dbrain")
+
+
+def test_explicit_session_name_used(tmp_path):
+ rt.reset()
+ s = _settings(tmp_path, brain_session_name="dbrain_fixed")
+ assert rt.get_session(s).session_name == "dbrain_fixed"