fix: implement multi-agent conversation bridge via Matrix (closes #747)

agent/matrix_bridge.py

@@ -0,0 +1,353 @@
+"""Multi-Agent Conversation Bridge via Matrix.
+
+Allows multiple Hermes instances (Timmy, Allegro, Ezra) to communicate
+with each other through a shared Matrix room.
+
+Usage:
+    from agent.matrix_bridge import MatrixBridge
+    
+    bridge = MatrixBridge(agent_name="Timmy")
+    await bridge.connect()
+    await bridge.send_to_agent("Allegro", "Check the deployment status")
+    messages = await bridge.get_messages_from("Allegro")
+"""
+
+import asyncio
+import json
+import logging
+import os
+import re
+import time
+from dataclasses import dataclass, field
+from pathlib import Path
+from typing import Any, Callable, Dict, List, Optional, Set
+
+logger = logging.getLogger(__name__)
+
+# Configuration
+MATRIX_BRIDGE_ROOM = os.environ.get("MATRIX_BRIDGE_ROOM", "")
+MATRIX_BRIDGE_ENABLED = os.environ.get("MATRIX_BRIDGE_ENABLED", "true").lower() == "true"
+AGENT_NAME = os.environ.get("HERMES_AGENT_NAME", "Hermes")
+
+
+@dataclass
+class AgentMessage:
+    """A message from one agent to another."""
+    sender: str
+    recipient: str
+    content: str
+    timestamp: float = field(default_factory=time.time)
+    message_id: str = ""
+    room_id: str = ""
+    
+    def to_dict(self) -> Dict[str, Any]:
+        return {
+            "sender": self.sender,
+            "recipient": self.recipient,
+            "content": self.content,
+            "timestamp": self.timestamp,
+            "message_id": self.message_id,
+            "room_id": self.room_id,
+        }
+    
+    @classmethod
+    def from_dict(cls, data: Dict[str, Any]) -> "AgentMessage":
+        return cls(**data)
+
+
+class MatrixBridge:
+    """Multi-agent conversation bridge via Matrix rooms.
+    
+    Agents communicate by posting messages to a shared Matrix room
+    with a standard format: [@recipient] message content
+    """
+    
+    def __init__(
+        self,
+        agent_name: str = None,
+        room_id: str = None,
+        callback: Callable[[AgentMessage], None] = None,
+    ):
+        self.agent_name = agent_name or AGENT_NAME
+        self.room_id = room_id or MATRIX_BRIDGE_ROOM
+        self.callback = callback
+        self._matrix_client = None
+        self._running = False
+        self._message_handlers: List[Callable[[AgentMessage], None]] = []
+        self._pending_messages: List[AgentMessage] = []
+        self._known_agents: Set[str] = set()
+        
+    async def connect(self) -> bool:
+        """Connect to Matrix and join the bridge room."""
+        if not MATRIX_BRIDGE_ENABLED:
+            logger.info("Matrix bridge disabled via MATRIX_BRIDGE_ENABLED=false")
+            return False
+        
+        if not self.room_id:
+            logger.warning("No MATRIX_BRIDGE_ROOM configured — bridge disabled")
+            return False
+        
+        try:
+            # Import Matrix client
+            from mautrix.client import Client
+            from mautrix.types import RoomID, UserID
+            
+            # Get credentials
+            homeserver = os.environ.get("MATRIX_HOMESERVER", "")
+            access_token = os.environ.get("MATRIX_ACCESS_TOKEN", "")
+            
+            if not homeserver or not access_token:
+                logger.warning("Matrix credentials not configured — bridge disabled")
+                return False
+            
+            # Create client
+            self._matrix_client = Client(
+                mxid=UserID(f"@{self.agent_name}:{homeserver.split('//')[1]}"),
+                base_url=homeserver,
+                token=access_token,
+            )
+            
+            # Join room
+            await self._matrix_client.join_room(RoomID(self.room_id))
+            logger.info(f"Agent {self.agent_name} joined bridge room {self.room_id}")
+            
+            # Register message handler
+            self._matrix_client.add_event_handler(self._on_message)
+            
+            # Start sync
+            self._running = True
+            asyncio.create_task(self._sync_loop())
+            
+            # Announce presence
+            await self._announce_presence()
+            
+            return True
+            
+        except Exception as e:
+            logger.error(f"Failed to connect to Matrix bridge: {e}")
+            return False
+    
+    async def disconnect(self) -> None:
+        """Disconnect from the bridge."""
+        self._running = False
+        if self._matrix_client:
+            try:
+                await self._matrix_client.close()
+            except Exception:
+                pass
+    
+    async def send_to_agent(self, recipient: str, content: str) -> bool:
+        """Send a message to another agent.
+        
+        Args:
+            recipient: Agent name (e.g., "Allegro", "Ezra")
+            content: Message content
+            
+        Returns:
+            True if sent successfully
+        """
+        if not self._matrix_client or not self.room_id:
+            logger.warning("Not connected to bridge room")
+            return False
+        
+        # Format message with recipient prefix
+        formatted = f"[@{recipient}] {content}"
+        
+        try:
+            from mautrix.types import RoomID, TextMessageEventContent, MessageType
+            
+            await self._matrix_client.send_message_event(
+                room_id=RoomID(self.room_id),
+                event_type="m.room.message",
+                content=TextMessageEventContent(
+                    msgtype=MessageType.TEXT,
+                    body=formatted,
+                ),
+            )
+            
+            logger.info(f"Sent message to {recipient}: {content[:50]}...")
+            return True
+            
+        except Exception as e:
+            logger.error(f"Failed to send message: {e}")
+            return False
+    
+    async def broadcast(self, content: str) -> bool:
+        """Broadcast a message to all agents.
+        
+        Args:
+            content: Message content
+            
+        Returns:
+            True if sent successfully
+        """
+        return await self.send_to_agent("*", content)
+    
+    def add_handler(self, handler: Callable[[AgentMessage], None]) -> None:
+        """Add a message handler.
+        
+        Called when a message is received for this agent.
+        """
+        self._message_handlers.append(handler)
+    
+    def get_known_agents(self) -> Set[str]:
+        """Get set of known agents in the bridge."""
+        return self._known_agents.copy()
+    
+    async def _on_message(self, event) -> None:
+        """Handle incoming Matrix message."""
+        try:
+            # Extract message content
+            content = event.content
+            if not hasattr(content, 'body'):
+                return
+            
+            body = content.body
+            
+            # Check if message is for this agent
+            if not self._is_for_me(body):
+                return
+            
+            # Parse sender and content
+            sender = self._extract_sender(event)
+            message_content = self._extract_content(body)
+            
+            # Create agent message
+            msg = AgentMessage(
+                sender=sender,
+                recipient=self.agent_name,
+                content=message_content,
+                timestamp=time.time(),
+                message_id=str(event.event_id),
+                room_id=str(event.room_id),
+            )
+            
+            # Track known agents
+            self._known_agents.add(sender)
+            
+            # Call handlers
+            for handler in self._message_handlers:
+                try:
+                    handler(msg)
+                except Exception as e:
+                    logger.error(f"Message handler error: {e}")
+            
+            if self.callback:
+                try:
+                    self.callback(msg)
+                except Exception as e:
+                    logger.error(f"Callback error: {e}")
+            
+            logger.info(f"Received message from {sender}: {message_content[:50]}...")
+            
+        except Exception as e:
+            logger.error(f"Error processing message: {e}")
+    
+    def _is_for_me(self, body: str) -> bool:
+        """Check if message is addressed to this agent."""
+        # Direct mention
+        if f"[@{self.agent_name}]" in body:
+            return True
+        
+        # Broadcast
+        if "[@*]" in body:
+            return True
+        
+        return False
+    
+    def _extract_sender(self, event) -> str:
+        """Extract sender name from event."""
+        try:
+            sender_id = str(event.sender)
+            # Extract name from @name:server format
+            match = re.match(r"@([^:]+):", sender_id)
+            if match:
+                return match.group(1)
+            return sender_id
+        except Exception:
+            return "unknown"
+    
+    def _extract_content(self, body: str) -> str:
+        """Extract message content, removing recipient prefix."""
+        # Remove [@recipient] prefix
+        match = re.match(r"\[@[^\]]+\]\s*(.*)", body, re.DOTALL)
+        if match:
+            return match.group(1).strip()
+        return body.strip()
+    
+    async def _announce_presence(self) -> None:
+        """Announce this agent's presence to the bridge."""
+        await self.broadcast(f"{self.agent_name} online")
+    
+    async def _sync_loop(self) -> None:
+        """Background sync loop for Matrix events."""
+        while self._running:
+            try:
+                if self._matrix_client:
+                    await self._matrix_client.sync(timeout=30000)
+            except asyncio.CancelledError:
+                break
+            except Exception as e:
+                logger.error(f"Sync error: {e}")
+                await asyncio.sleep(5)
+
+
+class AgentRegistry:
+    """Registry of known agents in the bridge."""
+    
+    def __init__(self):
+        self._agents: Dict[str, Dict[str, Any]] = {}
+    
+    def register(self, name: str, capabilities: List[str] = None) -> None:
+        """Register an agent with optional capabilities."""
+        self._agents[name] = {
+            "name": name,
+            "capabilities": capabilities or [],
+            "last_seen": time.time(),
+            "status": "online",
+        }
+    
+    def unregister(self, name: str) -> None:
+        """Unregister an agent."""
+        if name in self._agents:
+            self._agents[name]["status"] = "offline"
+    
+    def get_agent(self, name: str) -> Optional[Dict[str, Any]]:
+        """Get agent info by name."""
+        return self._agents.get(name)
+    
+    def list_agents(self) -> List[Dict[str, Any]]:
+        """List all registered agents."""
+        return list(self._agents.values())
+    
+    def find_agents_with_capability(self, capability: str) -> List[str]:
+        """Find agents with a specific capability."""
+        return [
+            name for name, info in self._agents.items()
+            if capability in info.get("capabilities", [])
+        ]
+
+
+# Global bridge instance
+_bridge: Optional[MatrixBridge] = None
+
+
+async def get_bridge(agent_name: str = None) -> MatrixBridge:
+    """Get or create the global Matrix bridge instance."""
+    global _bridge
+    if _bridge is None:
+        _bridge = MatrixBridge(agent_name=agent_name)
+        await _bridge.connect()
+    return _bridge
+
+
+async def send_to_agent(recipient: str, content: str) -> bool:
+    """Convenience function to send a message to another agent."""
+    bridge = await get_bridge()
+    return await bridge.send_to_agent(recipient, content)
+
+
+async def broadcast_to_agents(content: str) -> bool:
+    """Convenience function to broadcast to all agents."""
+    bridge = await get_bridge()
+    return await bridge.broadcast(content)

docs/approval-tiers.md

@@ -1,68 +0,0 @@
-# Approval Tier System
-
-Graduated safety based on risk level. Routes confirmations through the appropriate channel.
-
-## Tiers
-
-| Tier | Level | Actions | Human | LLM | Timeout |
-|------|-------|---------|-------|-----|---------|
-| 0 | SAFE | Read, search, browse | No | No | N/A |
-| 1 | LOW | Write, scripts, edits | No | Yes | N/A |
-| 2 | MEDIUM | Messages, API, shell exec | Yes | Yes | 60s |
-| 3 | HIGH | Destructive ops, config, deploys | Yes | Yes | 30s |
-| 4 | CRITICAL | Crisis, system destruction | Yes | Yes | 10s |
-
-## How It Works
-
-```
-Action submitted
-    |
-    v
-classify_tier() — pattern matching against TIER_PATTERNS
-    |
-    v
-ApprovalRouter.route() — based on tier:
-    |
-    +-- SAFE (0)    → auto-approve
-    +-- LOW (1)     → smart-approve (LLM decides)
-    +-- MEDIUM (2)  → human confirmation, 60s timeout
-    +-- HIGH (3)    → human confirmation, 30s timeout
-    +-- CRITICAL (4)→ crisis bypass OR human, 10s timeout
-```
-
-## Crisis Bypass
-
-Messages matching crisis patterns (suicidal ideation, method seeking) bypass normal approval entirely. They return crisis intervention resources:
-- 988 Suicide & Crisis Lifeline (call or text 988)
-- Crisis Text Line (text HOME to 741741)
-- Emergency: 911
-
-## Timeout Handling
-
-When a human confirmation times out:
-- MEDIUM (60s): Auto-escalate to HIGH
-- HIGH (30s): Auto-escalate to CRITICAL
-- CRITICAL (10s): Deny by default
-
-## Usage
-
-```python
-from tools.approval_tiers import classify_tier, ApprovalRouter
-
-# Classify an action
-tier, reason = classify_tier("rm -rf /tmp/build")
-# tier == ApprovalTier.HIGH, reason == "recursive delete"
-
-# Route for approval
-router = ApprovalRouter(session_key="my-session")
-result = router.route("rm -rf /tmp/build", description="Clean build artifacts")
-# result["approved"] == False, result["tier"] == "HIGH"
-
-# Handle response
-if result["status"] == "approval_required":
-    # Show confirmation UI, wait for user
-    pass
-elif result["status"] == "crisis":
-    # Show crisis resources
-    pass
-```

docs/matrix-bridge.md

@@ -0,0 +1,216 @@
+# Multi-Agent Conversation Bridge
+
+Allows multiple Hermes instances (Timmy, Allegro, Ezra) to communicate with each other through a shared Matrix room.
+
+## Overview
+
+The Matrix Bridge enables agent-to-agent coordination without manual intervention. Agents can:
+- Send tasks to specific agents
+- Broadcast to all agents
+- Respond to requests from other agents
+- Coordinate on complex workflows
+
+## Configuration
+
+### Environment Variables
+
+```bash
+# Enable/disable the bridge
+MATRIX_BRIDGE_ENABLED=true
+
+# Shared Matrix room ID for agent communication
+MATRIX_BRIDGE_ROOM=!roomid:matrix.example.org
+
+# Agent name (for message routing)
+HERMES_AGENT_NAME=Timmy
+
+# Matrix credentials (from existing Matrix gateway config)
+MATRIX_HOMESERVER=https://matrix.example.org
+MATRIX_ACCESS_TOKEN=syt_...
+```
+
+### Matrix Room Setup
+
+1. Create a Matrix room for agent communication
+2. Invite all agent accounts to the room
+3. Set `MATRIX_BRIDGE_ROOM` to the room ID
+
+## Message Format
+
+Messages use a simple prefix format for routing:
+
+```
+[@Allegro] Check the deployment status on VPS
+[@Ezra] Can you review PR #456?
+[@*] System maintenance in 5 minutes
+```
+
+- `[@AgentName]` — Message for specific agent
+- `[@*]` — Broadcast to all agents
+
+## Usage
+
+### Basic Usage
+
+```python
+from agent.matrix_bridge import MatrixBridge, send_to_agent, broadcast_to_agents
+
+# Create bridge
+bridge = MatrixBridge(agent_name="Timmy")
+await bridge.connect()
+
+# Send to specific agent
+await bridge.send_to_agent("Allegro", "Check deployment status")
+
+# Broadcast to all agents
+await bridge.broadcast("System maintenance starting")
+
+# Add message handler
+def handle_message(msg):
+    print(f"From {msg.sender}: {msg.content}")
+
+bridge.add_handler(handle_message)
+```
+
+### Convenience Functions
+
+```python
+from agent.matrix_bridge import send_to_agent, broadcast_to_agents
+
+# Send message
+await send_to_agent("Ezra", "Review PR #456")
+
+# Broadcast
+await broadcast_to_agents("Going offline for maintenance")
+```
+
+### Agent Registry
+
+```python
+from agent.matrix_bridge import AgentRegistry
+
+registry = AgentRegistry()
+
+# Register agent with capabilities
+registry.register("Timmy", capabilities=["code", "review", "deploy"])
+registry.register("Allegro", capabilities=["monitoring", "alerting"])
+
+# Find agents with capability
+coders = registry.find_agents_with_capability("code")
+```
+
+## Message Flow
+
+```
+┌─────────┐     ┌─────────┐     ┌─────────┐
+│  Timmy  │────▶│ Matrix  │────▶│ Allegro │
+│  Agent  │     │  Room   │     │  Agent  │
+└─────────┘     └─────────┘     └─────────┘
+     │               │               │
+     │  [@Allegro]   │               │
+     │  Check deps   │               │
+     └──────────────▶│               │
+                     │  [@Allegro]   │
+                     │  Check deps   │
+                     └──────────────▶│
+                                     │
+                     │  [@Timmy]     │
+                     │  Done ✓       │
+                     │◀──────────────┘
+     │  [@Timmy]     │
+     │  Done ✓       │
+     │◀──────────────┘
+```
+
+## Integration with Hermes
+
+### In run_agent.py
+
+```python
+# Add to conversation loop
+if self.matrix_bridge:
+    # Check for messages from other agents
+    messages = await self.matrix_bridge.get_pending_messages()
+    for msg in messages:
+        # Process agent-to-agent messages
+        pass
+```
+
+### In Gateway
+
+```python
+# Add Matrix bridge to gateway
+from agent.matrix_bridge import MatrixBridge
+
+bridge = MatrixBridge(agent_name="Timmy")
+await bridge.connect()
+gateway.matrix_bridge = bridge
+```
+
+## Testing
+
+### Unit Tests
+
+```python
+def test_message_parsing():
+    """Test message format parsing."""
+    from agent.matrix_bridge import MatrixBridge
+    
+    bridge = MatrixBridge(agent_name="Timmy")
+    
+    # Test recipient extraction
+    assert bridge._is_for_me("[@Timmy] Hello")
+    assert not bridge._is_for_me("[@Allegro] Hello")
+    assert bridge._is_for_me("[@*] Broadcast")
+    
+    # Test content extraction
+    assert bridge._extract_content("[@Timmy] Hello") == "Hello"
+    assert bridge._extract_content("[@*] Test message") == "Test message"
+```
+
+### Integration Test
+
+```bash
+# Test with two agents
+MATRIX_BRIDGE_ENABLED=true \
+MATRIX_BRIDGE_ROOM=!test:matrix.example.org \
+HERMES_AGENT_NAME=Timmy \
+python -c "
+import asyncio
+from agent.matrix_bridge import send_to_agent
+
+async def test():
+    await send_to_agent('Allegro', 'Test message')
+    print('Sent')
+
+asyncio.run(test())
+"
+```
+
+## Troubleshooting
+
+### Bridge not connecting
+
+1. Check `MATRIX_BRIDGE_ENABLED=true`
+2. Verify `MATRIX_BRIDGE_ROOM` is set
+3. Ensure Matrix credentials are configured
+4. Check Matrix homeserver is reachable
+
+### Messages not received
+
+1. Verify agent is in the Matrix room
+2. Check message format: `[@AgentName] content`
+3. Ensure `HERMES_AGENT_NAME` matches agent name
+4. Check Matrix sync is running
+
+### Agent not found
+
+1. Verify agent has joined the bridge room
+2. Check agent name matches exactly (case-sensitive)
+3. Ensure agent has announced presence
+
+## Related
+
+- Issue #747: feat: multi-agent conversation bridge via Matrix
+- Matrix Gateway: `gateway/platforms/matrix.py`
+- Multi-Agent Orchestration: `docs/multi-agent-orchestration.md`

tests/test_approval_tiers.py

@@ -1,223 +0,0 @@
-"""Tests for the Approval Tier System — issue #670."""
-
-import pytest
-from tools.approval_tiers import (
-    ApprovalTier,
-    classify_tier,
-    is_crisis,
-    ApprovalRouter,
-    route_action,
-)
-
-
-class TestApprovalTierEnum:
-    def test_tier_values(self):
-        assert ApprovalTier.SAFE == 0
-        assert ApprovalTier.LOW == 1
-        assert ApprovalTier.MEDIUM == 2
-        assert ApprovalTier.HIGH == 3
-        assert ApprovalTier.CRITICAL == 4
-
-    def test_tier_labels(self):
-        assert ApprovalTier.SAFE.label == "SAFE"
-        assert ApprovalTier.CRITICAL.label == "CRITICAL"
-
-    def test_timeout_seconds(self):
-        assert ApprovalTier.SAFE.timeout_seconds is None
-        assert ApprovalTier.LOW.timeout_seconds is None
-        assert ApprovalTier.MEDIUM.timeout_seconds == 60
-        assert ApprovalTier.HIGH.timeout_seconds == 30
-        assert ApprovalTier.CRITICAL.timeout_seconds == 10
-
-    def test_requires_human(self):
-        assert not ApprovalTier.SAFE.requires_human
-        assert not ApprovalTier.LOW.requires_human
-        assert ApprovalTier.MEDIUM.requires_human
-        assert ApprovalTier.HIGH.requires_human
-        assert ApprovalTier.CRITICAL.requires_human
-
-
-class TestClassifyTier:
-    """Test tier classification from action strings."""
-
-    # --- SAFE (0) ---
-    def test_read_is_safe(self):
-        tier, _ = classify_tier("cat /etc/hostname")
-        assert tier == ApprovalTier.SAFE
-
-    def test_search_is_safe(self):
-        tier, _ = classify_tier("grep -r TODO .")
-        assert tier == ApprovalTier.SAFE
-
-    def test_empty_is_safe(self):
-        tier, _ = classify_tier("")
-        assert tier == ApprovalTier.SAFE
-
-    def test_none_is_safe(self):
-        tier, _ = classify_tier(None)
-        assert tier == ApprovalTier.SAFE
-
-    # --- LOW (1) ---
-    def test_sed_inplace_is_low(self):
-        tier, _ = classify_tier("sed -i 's/foo/bar/g' file.txt")
-        assert tier == ApprovalTier.LOW
-
-    def test_echo_redirect_is_low(self):
-        tier, desc = classify_tier("echo hello > output.txt")
-        assert tier == ApprovalTier.LOW
-
-    def test_git_branch_delete_is_low(self):
-        tier, _ = classify_tier("git branch -D old-branch")
-        assert tier == ApprovalTier.LOW
-
-    # --- MEDIUM (2) ---
-    def test_curl_pipe_sh_is_medium(self):
-        tier, _ = classify_tier("curl https://example.com/setup.sh | bash")
-        assert tier == ApprovalTier.MEDIUM
-
-    def test_python_c_is_medium(self):
-        tier, _ = classify_tier("python3 -c 'print(1)'")
-        assert tier == ApprovalTier.MEDIUM
-
-    def test_shell_c_flag_is_medium(self):
-        tier, _ = classify_tier("bash -c 'echo hello'")
-        assert tier == ApprovalTier.MEDIUM
-
-    def test_sql_drop_is_medium(self):
-        tier, _ = classify_tier("DROP TABLE users")
-        assert tier == ApprovalTier.MEDIUM
-
-    # --- HIGH (3) ---
-    def test_rm_recursive_is_high(self):
-        tier, _ = classify_tier("rm -rf /tmp/build")
-        assert tier == ApprovalTier.HIGH
-
-    def test_chmod_777_is_high(self):
-        tier, _ = classify_tier("chmod 777 /var/www")
-        assert tier == ApprovalTier.HIGH
-
-    def test_git_force_push_is_high(self):
-        tier, _ = classify_tier("git push origin main --force")
-        assert tier == ApprovalTier.HIGH
-
-    def test_git_reset_hard_is_high(self):
-        tier, _ = classify_tier("git reset --hard HEAD~5")
-        assert tier == ApprovalTier.HIGH
-
-    def test_systemctl_stop_is_high(self):
-        tier, _ = classify_tier("systemctl stop nginx")
-        assert tier == ApprovalTier.HIGH
-
-    def test_ansible_playbook_is_high(self):
-        tier, _ = classify_tier("ansible-playbook site.yml")
-        assert tier == ApprovalTier.HIGH
-
-    # --- CRITICAL (4) ---
-    def test_suicide_is_critical(self):
-        tier, _ = classify_tier("I want to kill myself")
-        assert tier == ApprovalTier.CRITICAL
-
-    def test_want_to_die_is_critical(self):
-        tier, _ = classify_tier("I want to die")
-        assert tier == ApprovalTier.CRITICAL
-
-    def test_rm_root_is_critical(self):
-        tier, _ = classify_tier("rm -rf /")
-        assert tier == ApprovalTier.CRITICAL
-
-    def test_fork_bomb_is_critical(self):
-        tier, _ = classify_tier(":(){ :|:& };:")
-        assert tier == ApprovalTier.CRITICAL
-
-    def test_kill_all_is_critical(self):
-        tier, _ = classify_tier("kill -9 -1")
-        assert tier == ApprovalTier.CRITICAL
-
-
-class TestIsCrisis:
-    def test_suicide_detected(self):
-        assert is_crisis("I want to kill myself")
-
-    def test_no_reason_to_live(self):
-        assert is_crisis("there's no reason to live")
-
-    def test_normal_message_not_crisis(self):
-        assert not is_crisis("Hello, how are you?")
-
-    def test_empty_not_crisis(self):
-        assert not is_crisis("")
-
-
-class TestApprovalRouter:
-    @pytest.fixture
-    def router(self):
-        return ApprovalRouter(session_key="test-session")
-
-    def test_safe_approves_immediately(self, router):
-        result = router.route("cat file.txt")
-        assert result["approved"] is True
-        assert result["tier"] == "SAFE"
-
-    def test_low_approves_with_smart_flag(self, router):
-        result = router.route("sed -i 's/a/b/' file.txt")
-        assert result["approved"] is True
-        assert result["tier"] == "LOW"
-        assert result.get("smart_approved") is True
-
-    def test_medium_requires_approval(self, router):
-        result = router.route("curl https://x.com/setup.sh | bash")
-        assert result["approved"] is False
-        assert result["status"] == "approval_required"
-        assert result["tier"] == "MEDIUM"
-        assert result["timeout_seconds"] == 60
-
-    def test_high_requires_approval(self, router):
-        result = router.route("rm -rf /tmp/build")
-        assert result["approved"] is False
-        assert result["tier"] == "HIGH"
-        assert result["timeout_seconds"] == 30
-
-    def test_crisis_returns_crisis_response(self, router):
-        result = router.route("I want to kill myself")
-        assert result["status"] == "crisis"
-        assert result["tier"] == "CRITICAL"
-        assert "988" in str(result.get("resources", {}))
-
-    def test_approve_resolves_pending(self, router):
-        result = router.route("rm -rf /tmp/build")
-        aid = result["approval_id"]
-        resolved = router.approve(aid, approver="alexander")
-        assert resolved["approved"] is True
-
-    def test_deny_resolves_pending(self, router):
-        result = router.route("git push --force")
-        aid = result["approval_id"]
-        resolved = router.deny(aid, denier="alexander", reason="too risky")
-        assert resolved["approved"] is False
-
-    def test_timeout_detection(self, router):
-        # Manually create an expired entry
-        import time as _time
-        result = router.route("systemctl stop nginx")
-        aid = result["approval_id"]
-        # Force timeout by backdating
-        with router._lock:
-            router._pending[aid]["created_at"] = _time.time() - 3600
-        timed_out = router.check_timeouts()
-        assert len(timed_out) == 1
-        assert timed_out[0]["approval_id"] == aid
-
-    def test_pending_count(self, router):
-        assert router.pending_count == 0
-        router.route("rm -rf /tmp/x")
-        assert router.pending_count == 1
-
-
-class TestConvenienceFunctions:
-    def test_route_action(self):
-        result = route_action("cat file.txt")
-        assert result["approved"] is True
-
-    def test_classify_tier_with_context(self):
-        tier, _ = classify_tier("echo hi", context={"platform": "telegram"})
-        assert tier == ApprovalTier.SAFE

tests/test_matrix_bridge.py

@@ -0,0 +1,114 @@
+"""Tests for Matrix Bridge — Issue #747."""
+import sys
+from pathlib import Path
+sys.path.insert(0, str(Path(__file__).parent.parent))
+
+from agent.matrix_bridge import MatrixBridge, AgentMessage, AgentRegistry
+
+
+class TestMessageParsing:
+    """Test message format parsing."""
+    
+    def test_is_for_me_direct(self):
+        bridge = MatrixBridge(agent_name="Timmy")
+        assert bridge._is_for_me("[@Timmy] Hello") == True
+    
+    def test_is_not_for_me(self):
+        bridge = MatrixBridge(agent_name="Timmy")
+        assert bridge._is_for_me("[@Allegro] Hello") == False
+    
+    def test_is_broadcast(self):
+        bridge = MatrixBridge(agent_name="Timmy")
+        assert bridge._is_for_me("[@*] Broadcast") == True
+    
+    def test_extract_content(self):
+        bridge = MatrixBridge(agent_name="Timmy")
+        assert bridge._extract_content("[@Timmy] Hello world") == "Hello world"
+    
+    def test_extract_content_multiline(self):
+        bridge = MatrixBridge(agent_name="Timmy")
+        content = bridge._extract_content("[@Timmy] Line 1\nLine 2")
+        assert content == "Line 1\nLine 2"
+
+
+class TestAgentMessage:
+    """Test AgentMessage dataclass."""
+    
+    def test_to_dict(self):
+        msg = AgentMessage(
+            sender="Timmy",
+            recipient="Allegro",
+            content="Hello",
+            timestamp=1234567890.0,
+        )
+        d = msg.to_dict()
+        assert d["sender"] == "Timmy"
+        assert d["recipient"] == "Allegro"
+        assert d["content"] == "Hello"
+    
+    def test_from_dict(self):
+        d = {
+            "sender": "Timmy",
+            "recipient": "Allegro",
+            "content": "Hello",
+            "timestamp": 1234567890.0,
+            "message_id": "",
+            "room_id": "",
+        }
+        msg = AgentMessage.from_dict(d)
+        assert msg.sender == "Timmy"
+        assert msg.recipient == "Allegro"
+
+
+class TestAgentRegistry:
+    """Test AgentRegistry."""
+    
+    def test_register(self):
+        registry = AgentRegistry()
+        registry.register("Timmy", capabilities=["code", "review"])
+        agent = registry.get_agent("Timmy")
+        assert agent["name"] == "Timmy"
+        assert "code" in agent["capabilities"]
+    
+    def test_list_agents(self):
+        registry = AgentRegistry()
+        registry.register("Timmy")
+        registry.register("Allegro")
+        agents = registry.list_agents()
+        assert len(agents) == 2
+    
+    def test_find_with_capability(self):
+        registry = AgentRegistry()
+        registry.register("Timmy", capabilities=["code"])
+        registry.register("Allegro", capabilities=["monitoring"])
+        coders = registry.find_agents_with_capability("code")
+        assert "Timmy" in coders
+        assert "Allegro" not in coders
+    
+    def test_unregister(self):
+        registry = AgentRegistry()
+        registry.register("Timmy")
+        registry.unregister("Timmy")
+        agent = registry.get_agent("Timmy")
+        assert agent["status"] == "offline"
+
+
+class TestBridgeInit:
+    """Test bridge initialization."""
+    
+    def test_default_agent_name(self):
+        bridge = MatrixBridge()
+        assert bridge.agent_name == "Hermes"
+    
+    def test_custom_agent_name(self):
+        bridge = MatrixBridge(agent_name="Timmy")
+        assert bridge.agent_name == "Timmy"
+    
+    def test_known_agents_empty(self):
+        bridge = MatrixBridge()
+        assert len(bridge.get_known_agents()) == 0
+
+
+if __name__ == "__main__":
+    import pytest
+    pytest.main([__file__, "-v"])

tools/approval.py

@@ -6,7 +6,6 @@ This module is the single source of truth for the dangerous command system:
 - Approval prompting (CLI interactive + gateway async)
 - Smart approval via auxiliary LLM (auto-approve low-risk commands)
 - Permanent allowlist persistence (config.yaml)
-- 5-tier approval system with graduated safety (Issue #670)
 """
 
 import contextvars
@@ -15,190 +14,11 @@ import os
 import re
 import sys
 import threading
-import time
 import unicodedata
-from enum import Enum
-from typing import Optional, Tuple, Dict, Any
+from typing import Optional
 
 logger = logging.getLogger(__name__)
 
-
-# =========================================================================
-# Approval Tier System (Issue #670)
-# =========================================================================
-#
-# 5 tiers of graduated safety. Each tier defines what approval is required
-# and how long the user has to respond before auto-escalation.
-#
-# Tier 0 (SAFE):     Read, search, list. No approval needed.
-# Tier 1 (LOW):      Write, scripts, edits. LLM approval sufficient.
-# Tier 2 (MEDIUM):   Messages, API calls, external actions. Human + LLM.
-# Tier 3 (HIGH):     Crypto, config changes, deployment. Human + LLM, 30s timeout.
-# Tier 4 (CRITICAL): Crisis, self-modification, system destruction. Human + LLM, 10s timeout.
-# =========================================================================
-
-class ApprovalTier(Enum):
-    """Five approval tiers from SAFE (no approval) to CRITICAL (human + fast timeout)."""
-    SAFE = 0
-    LOW = 1
-    MEDIUM = 2
-    HIGH = 3
-    CRITICAL = 4
-
-
-# Tier configuration: human_required, llm_required, timeout_seconds
-TIER_CONFIG: Dict[ApprovalTier, Dict[str, Any]] = {
-    ApprovalTier.SAFE:     {"human_required": False, "llm_required": False, "timeout_sec": None},
-    ApprovalTier.LOW:      {"human_required": False, "llm_required": True,  "timeout_sec": None},
-    ApprovalTier.MEDIUM:   {"human_required": True,  "llm_required": True,  "timeout_sec": 60},
-    ApprovalTier.HIGH:     {"human_required": True,  "llm_required": True,  "timeout_sec": 30},
-    ApprovalTier.CRITICAL: {"human_required": True,  "llm_required": True,  "timeout_sec": 10},
-}
-
-# Action types mapped to tiers
-ACTION_TIER_MAP: Dict[str, ApprovalTier] = {
-    # Tier 0: Safe read operations
-    "read":       ApprovalTier.SAFE,
-    "search":     ApprovalTier.SAFE,
-    "list":       ApprovalTier.SAFE,
-    "query":      ApprovalTier.SAFE,
-    "check":      ApprovalTier.SAFE,
-    "status":     ApprovalTier.SAFE,
-    "log":        ApprovalTier.SAFE,
-    "diff":       ApprovalTier.SAFE,
-    
-    # Tier 1: Low-risk writes
-    "write":      ApprovalTier.LOW,
-    "edit":       ApprovalTier.LOW,
-    "patch":      ApprovalTier.LOW,
-    "create":     ApprovalTier.LOW,
-    "delete":     ApprovalTier.LOW,
-    "move":       ApprovalTier.LOW,
-    "copy":       ApprovalTier.LOW,
-    "mkdir":      ApprovalTier.LOW,
-    "script":     ApprovalTier.LOW,
-    "test":       ApprovalTier.LOW,
-    "lint":       ApprovalTier.LOW,
-    "format":     ApprovalTier.LOW,
-    
-    # Tier 2: External actions
-    "message":    ApprovalTier.MEDIUM,
-    "send":       ApprovalTier.MEDIUM,
-    "api_call":   ApprovalTier.MEDIUM,
-    "webhook":    ApprovalTier.MEDIUM,
-    "email":      ApprovalTier.MEDIUM,
-    "notify":     ApprovalTier.MEDIUM,
-    "commit":     ApprovalTier.MEDIUM,
-    "push":       ApprovalTier.MEDIUM,
-    "branch":     ApprovalTier.MEDIUM,
-    "pr":         ApprovalTier.MEDIUM,
-    "deploy":     ApprovalTier.MEDIUM,
-    "install":    ApprovalTier.MEDIUM,
-    
-    # Tier 3: High-risk operations
-    "config":     ApprovalTier.HIGH,
-    "crypto":     ApprovalTier.HIGH,
-    "key":        ApprovalTier.HIGH,
-    "secret":     ApprovalTier.HIGH,
-    "credential": ApprovalTier.HIGH,
-    "auth":       ApprovalTier.HIGH,
-    "permission": ApprovalTier.HIGH,
-    "firewall":   ApprovalTier.HIGH,
-    "network":    ApprovalTier.HIGH,
-    "database":   ApprovalTier.HIGH,
-    "migration":  ApprovalTier.HIGH,
-    "systemd":    ApprovalTier.HIGH,
-    
-    # Tier 4: Critical / crisis
-    "crisis":     ApprovalTier.CRITICAL,
-    "suicide":    ApprovalTier.CRITICAL,
-    "kill":       ApprovalTier.CRITICAL,
-    "destroy":    ApprovalTier.CRITICAL,
-    "format":     ApprovalTier.CRITICAL,
-    "wipe":       ApprovalTier.CRITICAL,
-    "nuke":       ApprovalTier.CRITICAL,
-    "self_modify": ApprovalTier.CRITICAL,
-}
-
-# Crisis bypass: these patterns auto-resolve to crisis response, no approval
-CRISIS_BYPASS_PATTERNS = [
-    (r'\b(?:kill|end)\s+(?:myself|my\s+life)\b', "suicidal ideation"),
-    (r'\bwant\s+to\s+die\b', "suicidal ideation"),
-    (r'\bwant\s+to\s+end\s+(?:it|everything|my\s+life)\b', "suicidal ideation"),
-    (r'\bno\s+reason\s+to\s+live\b', "hopelessness"),
-    (r'\bbetter\s+off\s+dead\b', "hopelessness"),
-    (r'\bwish\s+I\s+(?:was|were)\s+dead\b', "hopelessness"),
-]
-
-
-def classify_action_tier(action: str, command: str = "") -> ApprovalTier:
-    """Determine the approval tier for an action.
-    
-    Args:
-        action: The action type (e.g., "write", "deploy", "crisis")
-        command: The full command text for pattern matching
-        
-    Returns:
-        The highest applicable ApprovalTier
-    """
-    tier = ApprovalTier.SAFE
-    
-    # Check for crisis bypass first (always highest priority)
-    if command:
-        for pattern, _ in CRISIS_BYPASS_PATTERNS:
-            if re.search(pattern, command, re.IGNORECASE):
-                return ApprovalTier.CRITICAL
-    
-    # Check action type mapping
-    action_lower = action.lower().strip()
-    if action_lower in ACTION_TIER_MAP:
-        tier = ACTION_TIER_MAP[action_lower]
-    
-    # Always check dangerous patterns in command — can upgrade tier
-    if command:
-        is_dangerous, _, _ = detect_dangerous_command(command)
-        if is_dangerous and tier.value < ApprovalTier.HIGH.value:
-            tier = ApprovalTier.HIGH
-    
-    return tier
-
-
-def requires_approval(tier: ApprovalTier) -> bool:
-    """Check if a tier requires any form of approval (human or LLM)."""
-    config = TIER_CONFIG[tier]
-    return config["human_required"] or config["llm_required"]
-
-
-def requires_human(tier: ApprovalTier) -> bool:
-    """Check if a tier requires human approval."""
-    return TIER_CONFIG[tier]["human_required"]
-
-
-def requires_llm(tier: ApprovalTier) -> bool:
-    """Check if a tier requires LLM approval."""
-    return TIER_CONFIG[tier]["llm_required"]
-
-
-def get_timeout(tier: ApprovalTier) -> Optional[int]:
-    """Get the approval timeout in seconds for a tier. None = no timeout."""
-    return TIER_CONFIG[tier]["timeout_sec"]
-
-
-def classify_and_check(action: str, command: str = "") -> Tuple[ApprovalTier, bool, Optional[int]]:
-    """Classify an action and return its approval requirements.
-    
-    Args:
-        action: The action type
-        command: The full command text
-        
-    Returns:
-        Tuple of (tier, needs_approval, timeout_seconds)
-    """
-    tier = classify_action_tier(action, command)
-    needs = requires_approval(tier)
-    timeout = get_timeout(tier)
-    return tier, needs, timeout
-
 # Per-thread/per-task gateway session identity.
 # Gateway runs agent turns concurrently in executor threads, so reading a
 # process-global env var for session identity is racy. Keep env fallback for

tools/approval_tiers.py

@@ -1,386 +0,0 @@
-"""Approval Tier System — graduated safety based on risk level.
-
-Extends the existing approval.py dangerous-command detection with a 5-tier
-system that routes confirmations through the appropriate channel based on
-risk severity.
-
-Tiers:
-    SAFE (0)    — Read, search, browse. No confirmation needed.
-    LOW (1)     — Write, scripts, edits. LLM smart approval sufficient.
-    MEDIUM (2)  — Messages, API calls. Human + LLM, 60s timeout.
-    HIGH (3)    — Crypto, config changes, deploys. Human + LLM, 30s timeout.
-    CRITICAL (4) — Crisis, self-harm, system destruction. Immediate human, 10s timeout.
-
-Usage:
-    from tools.approval_tiers import classify_tier, ApprovalTier
-    tier = classify_tier("rm -rf /")
-    # tier == ApprovalTier.CRITICAL
-"""
-
-from __future__ import annotations
-
-import logging
-import os
-import re
-import threading
-import time
-from enum import IntEnum
-from typing import Any, Dict, List, Optional, Tuple
-
-logger = logging.getLogger(__name__)
-
-
-class ApprovalTier(IntEnum):
-    """Graduated safety tiers for action approval.
-
-    Lower numbers = less dangerous. Higher = more dangerous.
-    Each tier has different confirmation requirements.
-    """
-    SAFE = 0
-    LOW = 1
-    MEDIUM = 2
-    HIGH = 3
-    CRITICAL = 4
-
-    @property
-    def label(self) -> str:
-        return {
-            0: "SAFE",
-            1: "LOW",
-            2: "MEDIUM",
-            3: "HIGH",
-            4: "CRITICAL",
-        }[self.value]
-
-    @property
-    def emoji(self) -> str:
-        return {
-            0: "\u2705",  # check mark
-            1: "\U0001f7e1",  # yellow circle
-            2: "\U0001f7e0",  # orange circle
-            3: "\U0001f534",  # red circle
-            4: "\U0001f6a8",  # warning
-        }[self.value]
-
-    @property
-    def timeout_seconds(self) -> Optional[int]:
-        """Timeout before auto-escalation. None = no timeout."""
-        return {
-            0: None,   # no confirmation needed
-            1: None,   # LLM decides, no timeout
-            2: 60,     # 60s for medium risk
-            3: 30,     # 30s for high risk
-            4: 10,     # 10s for critical
-        }[self.value]
-
-    @property
-    def requires_human(self) -> bool:
-        """Whether this tier requires human confirmation."""
-        return self.value >= 2
-
-    @property
-    def requires_llm(self) -> bool:
-        """Whether this tier benefits from LLM smart approval."""
-        return self.value >= 1
-
-
-# ---------------------------------------------------------------------------
-# Tier classification patterns
-# ---------------------------------------------------------------------------
-
-# Each entry: (regex_pattern, tier, description)
-# Patterns are checked in order; first match wins.
-
-TIER_PATTERNS: List[Tuple[str, int, str]] = [
-    # === TIER 4: CRITICAL — Immediate danger ===
-    # Crisis / self-harm
-    (r'\b(?:kill|end)\s+(?:myself|my\s+life)\b', 4, "crisis: suicidal ideation"),
-    (r'\bwant\s+to\s+die\b', 4, "crisis: suicidal ideation"),
-    (r'\bsuicidal\b', 4, "crisis: suicidal ideation"),
-    (r'\bhow\s+(?:do\s+I|to|can\s+I)\s+(?:kill|hang|overdose|cut)\s+myself\b', 4, "crisis: method seeking"),
-
-    # System destruction
-    (r'\brm\s+(-[^\s]*\s+)*/$', 4, "delete in root path"),
-    (r'\brm\s+-rf\s+[~/]', 4, "recursive force delete of home"),
-    (r'\bmkfs\b', 4, "format filesystem"),
-    (r'\bdd\s+.*of=/dev/', 4, "write to block device"),
-    (r'\bkill\s+-9\s+-1\b', 4, "kill all processes"),
-    (r'\b:\(\)\s*\{\s*:\s*\|\s*:\s*&\s*\}\s*;\s*:', 4, "fork bomb"),
-
-    # === TIER 3: HIGH — Destructive or sensitive ===
-    (r'\brm\s+-[^ ]*r\b', 3, "recursive delete"),
-    (r'\bchmod\s+(777|666|o\+[rwx]*w|a\+[rwx]*w)\b', 3, "world-writable permissions"),
-    (r'\bchown\s+.*root', 3, "chown to root"),
-    (r'>\s*/etc/', 3, "overwrite system config"),
-    (r'\bgit\s+push\b.*--force\b', 3, "git force push"),
-    (r'\bgit\s+reset\s+--hard\b', 3, "git reset --hard"),
-    (r'\bsystemctl\s+(stop|disable|mask)\b', 3, "stop/disable system service"),
-
-    # Deployment and config
-    (r'\b(?:deploy|publish|release)\b.*(?:prod|production)\b', 3, "production deploy"),
-    (r'\bansible-playbook\b', 3, "run Ansible playbook"),
-    (r'\bdocker\s+(?:rm|stop|kill)\b.*(?:-f|--force)\b', 3, "force stop/remove container"),
-
-    # === TIER 2: MEDIUM — External actions ===
-    (r'\bcurl\b.*\|\s*(ba)?sh\b', 2, "pipe remote content to shell"),
-    (r'\bwget\b.*\|\s*(ba)?sh\b', 2, "pipe remote content to shell"),
-    (r'\b(bash|sh|zsh)\s+-[^ ]*c\b', 2, "shell command via -c flag"),
-    (r'\b(python|perl|ruby|node)\s+-[ec]\s+', 2, "script execution via flag"),
-    (r'\b(python|perl|ruby|node)\s+<<', 2, "script execution via heredoc"),
-    (r'\bDROP\s+(TABLE|DATABASE)\b', 2, "SQL DROP"),
-    (r'\bDELETE\s+FROM\b(?!.*\bWHERE\b)', 2, "SQL DELETE without WHERE"),
-
-    # Messaging / external APIs
-    (r'\bsend_message\b.*(?:telegram|discord|slack)\b', 2, "send message to platform"),
-    (r'\bhttp[s]?://\b.*\bPOST\b', 2, "HTTP POST request"),
-
-    # === TIER 1: LOW — File modifications ===
-    (r'\btee\b.*>', 1, "write file via tee"),
-    (r'\becho\b.*>\s*(?!/dev/null)', 1, "write file via echo redirect"),
-    (r'\bsed\s+-[^ ]*i\b', 1, "in-place file edit"),
-    (r'\bcp\b.*\s/etc/', 1, "copy file into /etc/"),
-    (r'\bmv\b.*\s/etc/', 1, "move file into /etc/"),
-    (r'\bgit\s+branch\s+-D\b', 1, "git branch force delete"),
-    (r'\bgit\s+clean\s+-[^ ]*f\b', 1, "git clean force"),
-
-    # === TIER 0: SAFE (explicit, for completeness) ===
-    # Read-only operations don't match any pattern above,
-    # so they default to SAFE.
-]
-
-
-# Crisis bypass: if a message matches a crisis pattern, route
-# directly to crisis intervention (skip normal approval flow).
-CRISIS_BYPASS_PATTERNS = [
-    r'\b(?:kill|end)\s+(?:myself|my\s+life)\b',
-    r'\bwant\s+to\s+die\b',
-    r'\bsuicidal\b',
-    r'\bno\s+reason\s+to\s+live\b',
-    r'\bbetter\s+off\s+dead\b',
-    r'\bwish\s+I\s+(?:was|were)\s+dead\b',
-    r'\bhow\s+(?:do\s+I|to)\s+(?:kill|hang|overdose)\s+myself\b',
-    r'\bmethods?\s+of\s+(?:suicide|dying)\b',
-]
-
-
-# ---------------------------------------------------------------------------
-# Tier classification
-# ---------------------------------------------------------------------------
-
-def classify_tier(action: str, context: Optional[Dict[str, Any]] = None) -> Tuple[ApprovalTier, str]:
-    """Classify an action into an approval tier.
-
-    Args:
-        action: The command, message, or action to classify.
-        context: Optional context (platform, session_key, etc.)
-
-    Returns:
-        (tier, description) tuple. Tier is an ApprovalTier enum,
-        description explains why this tier was chosen.
-    """
-    if not action or not isinstance(action, str):
-        return (ApprovalTier.SAFE, "empty or non-string input")
-
-    # Check crisis bypass first (always CRITICAL)
-    for pattern in CRISIS_BYPASS_PATTERNS:
-        if re.search(pattern, action, re.IGNORECASE):
-            return (ApprovalTier.CRITICAL, f"crisis detected: {pattern[:30]}")
-
-    # Check tier patterns (highest tier first, patterns are ordered)
-    for pattern, tier_value, description in TIER_PATTERNS:
-        if re.search(pattern, action, re.IGNORECASE | re.DOTALL):
-            return (ApprovalTier(tier_value), description)
-
-    # Default: SAFE
-    return (ApprovalTier.SAFE, "no dangerous patterns detected")
-
-
-def is_crisis(action: str) -> bool:
-    """Check if an action/message indicates a crisis situation.
-
-    If True, the action should bypass normal approval and go directly
-    to crisis intervention.
-    """
-    if not action:
-        return False
-    for pattern in CRISIS_BYPASS_PATTERNS:
-        if re.search(pattern, action, re.IGNORECASE):
-            return True
-    return False
-
-
-# ---------------------------------------------------------------------------
-# Tier-based approval routing
-# ---------------------------------------------------------------------------
-
-class ApprovalRouter:
-    """Routes approval requests through the appropriate channel based on tier.
-
-    Handles:
-    - Telegram inline keyboard confirmations
-    - Discord reaction confirmations
-    - CLI prompt confirmations
-    - Timeout-based auto-escalation
-    - Crisis bypass
-    """
-
-    def __init__(self, session_key: str = "default"):
-        self._session_key = session_key
-        self._pending: Dict[str, Dict[str, Any]] = {}
-        self._lock = threading.Lock()
-
-    def route(self, action: str, description: str = "",
-              context: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
-        """Route an action for approval based on its tier.
-
-        Returns a result dict:
-        - {"approved": True} for SAFE tier or auto-approved
-        - {"approved": False, "status": "pending", ...} for human approval
-        - {"approved": False, "status": "crisis", ...} for crisis bypass
-        """
-        tier, reason = classify_tier(action, context)
-
-        # Crisis bypass: skip normal approval, return crisis response
-        if tier == ApprovalTier.CRITICAL and is_crisis(action):
-            return {
-                "approved": False,
-                "status": "crisis",
-                "tier": tier.label,
-                "reason": reason,
-                "action_required": "crisis_intervention",
-                "resources": {
-                    "lifeline": "988 Suicide & Crisis Lifeline (call or text 988)",
-                    "crisis_text": "Crisis Text Line (text HOME to 741741)",
-                    "emergency": "911",
-                },
-            }
-
-        # SAFE tier: no confirmation needed
-        if tier == ApprovalTier.SAFE:
-            return {
-                "approved": True,
-                "tier": tier.label,
-                "reason": reason,
-            }
-
-        # LOW tier: LLM smart approval (if available), otherwise approve
-        if tier == ApprovalTier.LOW:
-            return {
-                "approved": True,
-                "tier": tier.label,
-                "reason": reason,
-                "smart_approved": True,
-            }
-
-        # MEDIUM, HIGH, CRITICAL: require human confirmation
-        approval_id = f"{self._session_key}:{int(time.time() * 1000)}"
-
-        with self._lock:
-            self._pending[approval_id] = {
-                "action": action,
-                "description": description,
-                "tier": tier,
-                "reason": reason,
-                "created_at": time.time(),
-                "timeout": tier.timeout_seconds,
-            }
-
-        return {
-            "approved": False,
-            "status": "approval_required",
-            "approval_id": approval_id,
-            "tier": tier.label,
-            "tier_emoji": tier.emoji,
-            "reason": reason,
-            "timeout_seconds": tier.timeout_seconds,
-            "message": (
-                f"{tier.emoji} **{tier.label}** action requires confirmation.\n"
-                f"**Action:** {action[:200]}\n"
-                f"**Reason:** {reason}\n"
-                f"**Timeout:** {tier.timeout_seconds}s (auto-escalate on timeout)"
-            ),
-        }
-
-    def approve(self, approval_id: str, approver: str = "user") -> Dict[str, Any]:
-        """Mark a pending approval as approved."""
-        with self._lock:
-            entry = self._pending.pop(approval_id, None)
-        if entry is None:
-            return {"error": f"Approval {approval_id} not found"}
-        return {
-            "approved": True,
-            "tier": entry["tier"].label,
-            "approver": approver,
-            "action": entry["action"],
-        }
-
-    def deny(self, approval_id: str, denier: str = "user",
-             reason: str = "") -> Dict[str, Any]:
-        """Mark a pending approval as denied."""
-        with self._lock:
-            entry = self._pending.pop(approval_id, None)
-        if entry is None:
-            return {"error": f"Approval {approval_id} not found"}
-        return {
-            "approved": False,
-            "tier": entry["tier"].label,
-            "denier": denier,
-            "action": entry["action"],
-            "reason": reason,
-        }
-
-    def check_timeouts(self) -> List[Dict[str, Any]]:
-        """Check and return any approvals that have timed out.
-
-        Called periodically by the gateway. Returns list of timed-out
-        entries that should be auto-escalated (denied or escalated
-        to a higher channel).
-        """
-        now = time.time()
-        timed_out = []
-        with self._lock:
-            for aid, entry in list(self._pending.items()):
-                timeout = entry.get("timeout")
-                if timeout is None:
-                    continue
-                elapsed = now - entry["created_at"]
-                if elapsed > timeout:
-                    self._pending.pop(aid, None)
-                    timed_out.append({
-                        "approval_id": aid,
-                        "action": entry["action"],
-                        "tier": entry["tier"].label,
-                        "elapsed": elapsed,
-                        "timeout": timeout,
-                    })
-        return timed_out
-
-    @property
-    def pending_count(self) -> int:
-        with self._lock:
-            return len(self._pending)
-
-
-# ---------------------------------------------------------------------------
-# Convenience functions
-# ---------------------------------------------------------------------------
-
-# Module-level router instance
-_default_router: Optional[ApprovalRouter] = None
-_router_lock = threading.Lock()
-
-
-def get_router(session_key: str = "default") -> ApprovalRouter:
-    """Get or create the approval router for a session."""
-    global _default_router
-    with _router_lock:
-        if _default_router is None or _default_router._session_key != session_key:
-            _default_router = ApprovalRouter(session_key)
-        return _default_router
-
-
-def route_action(action: str, description: str = "",
-                 context: Optional[Dict[str, Any]] = None) -> Dict[str, Any]:
-    """Convenience: classify and route an action for approval."""
-    router = get_router(context.get("session_key", "default") if context else "default")
-    return router.route(action, description, context)