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 router escape-hatch (RouterSession, DBRAIN_MODE)

smixsf434ffdaf1f0
diff --git a/.env.example b/.env.example
index 102389a..d3ba8e0 100644
--- a/.env.example
+++ b/.env.example
@@ -17,11 +17,3 @@ TZ=UTC
# Model for the persistent session. Empty = Claude Code default (Opus).
# Set to "sonnet" to reduce weekly-limit pressure for a 24/7 bot.
CLAUDE_MODEL=
-
-# ── Escape hatch (only if Anthropic ever closes the interactive path) ──
-# Leave as "interactive" to stay on the subscription. Set to "router" to fall
-# back to claude -p against a different provider via ANTHROPIC_BASE_URL.
-DBRAIN_MODE=interactive
-# ANTHROPIC_BASE_URL=
-# A SEPARATE billed API key (NOT your subscription login) for router mode:
-# ANTHROPIC_AUTH_TOKEN=
diff --git a/scripts/escape-hatch.sh b/scripts/escape-hatch.sh
deleted file mode 100755
index 85994e4..0000000
--- a/scripts/escape-hatch.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-# Escape hatch: switch d-brain between the interactive session (subscription)
-# and router mode (claude -p against an alternate provider) if Anthropic ever
-# closes the interactive path. Reversible.
-#
-# scripts/escape-hatch.sh on # → router mode (needs a SEPARATE API key)
-# scripts/escape-hatch.sh off # → interactive (subscription)
-# scripts/escape-hatch.sh status
-set -euo pipefail
-
-PROJECT_DIR="$(cd "$(dirname "$0")/.." && pwd)"
-ENVF="$PROJECT_DIR/.env"
-[ -f "$ENVF" ] || { echo "No .env at $ENVF"; exit 1; }
-
-_set_mode() {
- if grep -q '^DBRAIN_MODE=' "$ENVF"; then
- sed -i.bak "s/^DBRAIN_MODE=.*/DBRAIN_MODE=$1/" "$ENVF" && rm -f "$ENVF.bak"
- else
- echo "DBRAIN_MODE=$1" >> "$ENVF"
- fi
-}
-
-_restart() {
- systemctl --user restart dbrain-bot.service 2>/dev/null || true
-}
-
-case "${1:-status}" in
- on)
- if ! grep -qE '^ANTHROPIC_BASE_URL=.+' "$ENVF" || ! grep -qE '^ANTHROPIC_AUTH_TOKEN=.+' "$ENVF"; then
- echo "❌ Router mode needs ANTHROPIC_BASE_URL and ANTHROPIC_AUTH_TOKEN in .env."
- echo " This must be a SEPARATE billed API key (NOT your subscription)."
- echo " Get one at: https://console.anthropic.com/ (or your provider)."
- exit 1
- fi
- _set_mode router
- echo "🔀 Router mode ON (claude -p via alternate provider). Restarting bot…"
- _restart
- ;;
- off)
- _set_mode interactive
- echo "🟢 Interactive mode (subscription). Restarting bot…"
- _restart
- ;;
- status)
- grep '^DBRAIN_MODE=' "$ENVF" || echo "DBRAIN_MODE=interactive (default)"
- ;;
- *)
- echo "Usage: escape-hatch.sh <on|off|status>"
- exit 1
- ;;
-esac
diff --git a/src/d_brain/config.py b/src/d_brain/config.py
index 4446ace..5621dd9 100644
--- a/src/d_brain/config.py
+++ b/src/d_brain/config.py
@@ -45,18 +45,6 @@ class Settings(BaseSettings):
)
tz: str = Field(default="UTC", description="Timezone for timers/reports")
- # ── escape hatch (fallback provider routing) ─────────────────────
- dbrain_mode: str = Field(
- default="interactive",
- description="interactive (subscription) | router (claude -p via base URL)",
- )
- anthropic_base_url: str = Field(
- default="", description="Fallback provider base URL (router mode)"
- )
- anthropic_auth_token: str = Field(
- default="", description="Fallback provider API key (router mode)"
- )
-
@property
def admin_chat_id(self) -> int | None:
"""First allowed user — destination for health alerts / reports."""
diff --git a/src/d_brain/services/claude_session.py b/src/d_brain/services/claude_session.py
index 7512583..bf45e76 100644
--- a/src/d_brain/services/claude_session.py
+++ b/src/d_brain/services/claude_session.py
@@ -371,76 +371,3 @@ class ClaudeSession:
# timed out: prompt is still physically in the pane → keep inflight
return AskResult("timeout", detail=f"no reply in {timeout}s")
-
-
-class RouterSession:
- """Escape-hatch fallback: route ask() to ``claude -p`` against an
- ALTERNATE provider via ANTHROPIC_BASE_URL.
-
- Used ONLY when DBRAIN_MODE=router (Anthropic closed the interactive path).
- Kept as a separate class with the same ask() shape so the interactive
- ClaudeSession stays untouched. Requires a SEPARATE billed API key, not the
- subscription OAuth — reusing the subscription token is exactly what
- Anthropic blocks.
- """
-
- def __init__(
- self,
- *,
- base_url: str,
- auth_token: str,
- work_dir: Path,
- model: str | None = None,
- claude_bin: str = "claude",
- runner: Runner = subprocess.run,
- ) -> None:
- self.base_url = base_url
- self.auth_token = auth_token
- self.work_dir = Path(work_dir)
- self.model = model
- self.claude_bin = claude_bin
- self._runner = runner
-
- def ask(
- self,
- prompt: str,
- *,
- timeout: float = DEFAULT_TIMEOUT,
- request_id: str | None = None,
- ) -> AskResult:
- env = os.environ.copy()
- env["ANTHROPIC_BASE_URL"] = self.base_url
- env["ANTHROPIC_AUTH_TOKEN"] = self.auth_token
- cmd = [self.claude_bin, "--print"] # ALLOW-CLAUDE-P: escape hatch only
- cmd += ["--dangerously-skip-permissions"]
- if self.model:
- cmd += ["--model", self.model]
- cmd += ["-p", prompt] # ALLOW-CLAUDE-P: escape hatch only
- try:
- proc = self._runner(
- cmd,
- cwd=str(self.work_dir),
- capture_output=True,
- text=True,
- timeout=timeout,
- check=False,
- env=env,
- )
- except subprocess.TimeoutExpired:
- return AskResult("timeout", detail=f"no reply in {timeout}s")
- if proc.returncode != 0:
- return AskResult("error", detail=(proc.stderr or "").strip())
- return AskResult("ok", reply=(proc.stdout or "").strip())
-
- # No-op lifecycle methods so callers/watchdog treat it like a session.
- def ensure_session(self) -> None:
- return None
-
- def is_healthy(self) -> bool:
- return True
-
- def current_state(self) -> PaneState:
- return PaneState.READY
-
- def force_recover(self) -> bool:
- return True
diff --git a/src/d_brain/services/runtime.py b/src/d_brain/services/runtime.py
index db82bc1..1f69ed4 100644
--- a/src/d_brain/services/runtime.py
+++ b/src/d_brain/services/runtime.py
@@ -11,7 +11,7 @@ import asyncio
import uuid
from d_brain.config import Settings
-from d_brain.services.claude_session import ClaudeSession, RouterSession
+from d_brain.services.claude_session import ClaudeSession
from d_brain.services.processor import ClaudeProcessor
_session: ClaudeSession | None = None
@@ -40,20 +40,11 @@ def _persisted_name(settings: Settings) -> str:
return name
-def get_session(settings: Settings):
- """Return the shared session: interactive ClaudeSession, or RouterSession
- when the escape hatch (DBRAIN_MODE=router) is engaged."""
+def get_session(settings: Settings) -> ClaudeSession:
+ """Return the shared interactive ClaudeSession singleton."""
global _session
if _session is not None:
return _session
- if settings.dbrain_mode == "router":
- _session = RouterSession(
- base_url=settings.anthropic_base_url,
- auth_token=settings.anthropic_auth_token,
- work_dir=settings.vault_path,
- model=settings.claude_model or None,
- )
- return _session
project_root = settings.vault_path.parent
mcp = project_root / "mcp-config.json"
brain_prompt = project_root / "deploy" / "brain-system.md"
diff --git a/tests/test_claude_session.py b/tests/test_claude_session.py
index 2239baa..dd25d0c 100644
--- a/tests/test_claude_session.py
+++ b/tests/test_claude_session.py
@@ -301,39 +301,3 @@ def test_kill_sends_kill_session(tmp_path, clock):
assert "kill-session" in fake.sent_subcommands()
-# ── RouterSession (escape hatch) ──────────────────────────────────────────
-
-
-def test_router_session_uses_claude_p_with_provider_env(tmp_path):
- from d_brain.services.claude_session import RouterSession
-
- captured = {}
-
- def runner(cmd, **kwargs):
- captured["cmd"] = cmd
- captured["env"] = kwargs.get("env", {})
- return subprocess.CompletedProcess(cmd, 0, stdout="hi there\n", stderr="")
-
- r = RouterSession(
- base_url="https://provider.example",
- auth_token="secret",
- work_dir=tmp_path,
- runner=runner,
- )
- res = r.ask("hello")
- assert res.ok
- assert res.reply == "hi there"
- assert "--print" in captured["cmd"]
- assert captured["env"]["ANTHROPIC_BASE_URL"] == "https://provider.example"
- assert captured["env"]["ANTHROPIC_AUTH_TOKEN"] == "secret"
-
-
-def test_router_session_error_on_nonzero(tmp_path):
- from d_brain.services.claude_session import RouterSession
-
- def runner(cmd, **kwargs):
- return subprocess.CompletedProcess(cmd, 1, stdout="", stderr="boom")
-
- r = RouterSession(base_url="u", auth_token="k", work_dir=tmp_path, runner=runner)
- res = r.ask("x")
- assert res.status == "error"
diff --git a/tests/test_config.py b/tests/test_config.py
index ae3dfae..78548aa 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -1,4 +1,4 @@
-"""Tests for the extended Settings (tmux-session + escape-hatch fields)."""
+"""Tests for the extended Settings (tmux-session fields)."""
from pathlib import Path
@@ -13,11 +13,8 @@ def _settings(**over):
def test_new_fields_have_safe_defaults():
s = _settings()
- assert s.dbrain_mode == "interactive"
assert s.tz == "UTC"
assert s.claude_model == "" # "" → use the session's default model
- assert s.anthropic_base_url == ""
- assert s.anthropic_auth_token == ""
assert isinstance(s.runtime_dir, Path)
@@ -32,7 +29,6 @@ def test_admin_chat_id_none_when_no_users():
def test_overrides_from_kwargs():
- s = _settings(dbrain_mode="router", claude_model="sonnet", tz="Asia/Tashkent")
- assert s.dbrain_mode == "router"
+ s = _settings(claude_model="sonnet", tz="Asia/Tashkent")
assert s.claude_model == "sonnet"
assert s.tz == "Asia/Tashkent"
diff --git a/tests/test_runtime.py b/tests/test_runtime.py
index dad6606..41713ee 100644
--- a/tests/test_runtime.py
+++ b/tests/test_runtime.py
@@ -44,16 +44,3 @@ 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"
-
-
-def test_router_mode_returns_router_session(tmp_path):
- from d_brain.services.claude_session import RouterSession
-
- rt.reset()
- s = _settings(
- tmp_path,
- dbrain_mode="router",
- anthropic_base_url="https://provider.example",
- anthropic_auth_token="key",
- )
- assert isinstance(rt.get_session(s), RouterSession)