feat: enforce agent routing and persist restart state
Task 4: stale room blocking + agent_id binding - MatrixBot._check_agent_routing: blocks normal messages when user has no selected agent or room is bound to a different agent - agent_routing_enabled flag on MatrixRuntime activates the check only in real multi-agent mode (RoutedPlatformClient) - make_handle_new_chat now writes agent_id into new room metadata when user already has a selected agent Task 5: durable restart state tests - test_restart_persistence.py proves selected_agent_id, room agent_id, platform_chat_id, and the sequence counter all survive SQLiteStore close/reopen; also covers clean startup with no prior state
This commit is contained in:
parent
74cf028e8f
commit
e733119d1e
4 changed files with 256 additions and 22 deletions
|
|
@ -30,7 +30,7 @@ from adapter.matrix.files import (
|
|||
matrix_msgtype_for_attachment,
|
||||
resolve_workspace_attachment_path,
|
||||
)
|
||||
from adapter.matrix.agent_registry import AgentRegistryError, load_agent_registry
|
||||
from adapter.matrix.agent_registry import AgentRegistry, AgentRegistryError, load_agent_registry
|
||||
from adapter.matrix.handlers import register_matrix_handlers
|
||||
from adapter.matrix.handlers.auth import handle_invite, provision_workspace_chat
|
||||
from adapter.matrix.handlers.context_commands import (
|
||||
|
|
@ -44,11 +44,13 @@ from adapter.matrix.store import (
|
|||
clear_staged_attachments,
|
||||
get_load_pending,
|
||||
get_room_meta,
|
||||
get_selected_agent_id,
|
||||
get_staged_attachments,
|
||||
next_platform_chat_id,
|
||||
remove_staged_attachment_at,
|
||||
set_pending_confirm,
|
||||
set_platform_chat_id,
|
||||
set_room_agent_id,
|
||||
set_room_meta,
|
||||
)
|
||||
from core.auth import AuthManager
|
||||
|
|
@ -85,6 +87,7 @@ class MatrixRuntime:
|
|||
auth_mgr: AuthManager
|
||||
settings_mgr: SettingsManager
|
||||
dispatcher: EventDispatcher
|
||||
agent_routing_enabled: bool = False
|
||||
|
||||
|
||||
def build_event_dispatcher(platform: PlatformClient, store: StateStore) -> EventDispatcher:
|
||||
|
|
@ -93,6 +96,7 @@ def build_event_dispatcher(platform: PlatformClient, store: StateStore) -> Event
|
|||
settings_mgr = SettingsManager(platform, store)
|
||||
prototype_state = getattr(platform, "_prototype_state", None)
|
||||
agent_base_url = _agent_base_url_from_env()
|
||||
registry = _load_agent_registry_from_env()
|
||||
dispatcher = EventDispatcher(
|
||||
platform=platform, chat_mgr=chat_mgr, auth_mgr=auth_mgr, settings_mgr=settings_mgr
|
||||
)
|
||||
|
|
@ -100,6 +104,7 @@ def build_event_dispatcher(platform: PlatformClient, store: StateStore) -> Event
|
|||
register_matrix_handlers(
|
||||
dispatcher,
|
||||
store=store,
|
||||
registry=registry,
|
||||
prototype_state=prototype_state,
|
||||
agent_base_url=agent_base_url,
|
||||
)
|
||||
|
|
@ -120,19 +125,26 @@ def _agent_base_url_from_env() -> str:
|
|||
return "http://127.0.0.1:8000"
|
||||
|
||||
|
||||
def _load_agent_registry_from_env(required: bool = False) -> AgentRegistry | None:
|
||||
registry_path = os.environ.get("MATRIX_AGENT_REGISTRY_PATH", "").strip()
|
||||
if not registry_path:
|
||||
if required:
|
||||
raise RuntimeError(
|
||||
"MATRIX_AGENT_REGISTRY_PATH is required when MATRIX_PLATFORM_BACKEND=real"
|
||||
)
|
||||
return None
|
||||
try:
|
||||
return load_agent_registry(registry_path)
|
||||
except (AgentRegistryError, OSError) as exc:
|
||||
raise RuntimeError(f"failed to load matrix agent registry: {registry_path}") from exc
|
||||
|
||||
|
||||
def _build_platform_from_env(*, store: StateStore, chat_mgr: ChatManager) -> PlatformClient:
|
||||
backend = os.environ.get("MATRIX_PLATFORM_BACKEND", "mock").strip().lower()
|
||||
if backend == "real":
|
||||
prototype_state = PrototypeStateStore()
|
||||
registry_path = os.environ.get("MATRIX_AGENT_REGISTRY_PATH", "").strip()
|
||||
if not registry_path:
|
||||
raise RuntimeError(
|
||||
"MATRIX_AGENT_REGISTRY_PATH is required when MATRIX_PLATFORM_BACKEND=real"
|
||||
)
|
||||
try:
|
||||
registry = load_agent_registry(registry_path)
|
||||
except (AgentRegistryError, OSError) as exc:
|
||||
raise RuntimeError(f"failed to load matrix agent registry: {registry_path}") from exc
|
||||
registry = _load_agent_registry_from_env(required=True)
|
||||
assert registry is not None
|
||||
delegates = {
|
||||
agent.agent_id: RealPlatformClient(
|
||||
agent_id=agent.agent_id,
|
||||
|
|
@ -163,6 +175,7 @@ def build_runtime(
|
|||
settings_mgr = SettingsManager(platform, store)
|
||||
prototype_state = getattr(platform, "_prototype_state", None)
|
||||
agent_base_url = _agent_base_url_from_env()
|
||||
registry = _load_agent_registry_from_env()
|
||||
dispatcher = EventDispatcher(
|
||||
platform=platform, chat_mgr=chat_mgr, auth_mgr=auth_mgr, settings_mgr=settings_mgr
|
||||
)
|
||||
|
|
@ -171,6 +184,7 @@ def build_runtime(
|
|||
dispatcher,
|
||||
client=client,
|
||||
store=store,
|
||||
registry=registry,
|
||||
prototype_state=prototype_state,
|
||||
agent_base_url=agent_base_url,
|
||||
)
|
||||
|
|
@ -181,6 +195,7 @@ def build_runtime(
|
|||
auth_mgr=auth_mgr,
|
||||
settings_mgr=settings_mgr,
|
||||
dispatcher=dispatcher,
|
||||
agent_routing_enabled=isinstance(platform, RoutedPlatformClient),
|
||||
)
|
||||
|
||||
|
||||
|
|
@ -244,6 +259,12 @@ class MatrixBot:
|
|||
user=sender,
|
||||
)
|
||||
return
|
||||
if not body.startswith("!") and self.runtime.agent_routing_enabled:
|
||||
block = await self._check_agent_routing(room.room_id, sender, room_meta)
|
||||
if block is not None:
|
||||
await self._send_all(room.room_id, block)
|
||||
return
|
||||
|
||||
local_chat_id = await resolve_chat_id(self.runtime.store, room.room_id, sender)
|
||||
incoming = from_room_event(event, room_id=room.room_id, chat_id=local_chat_id)
|
||||
if incoming is None:
|
||||
|
|
@ -574,6 +595,38 @@ class MatrixBot:
|
|||
self.runtime.chat_mgr,
|
||||
)
|
||||
|
||||
async def _check_agent_routing(
|
||||
self,
|
||||
room_id: str,
|
||||
sender: str,
|
||||
room_meta: dict,
|
||||
) -> list[OutgoingEvent] | None:
|
||||
selected_agent_id = await get_selected_agent_id(self.runtime.store, sender)
|
||||
if not selected_agent_id:
|
||||
return [
|
||||
OutgoingMessage(
|
||||
chat_id=room_id,
|
||||
text="Выбери агент через !agent прежде чем отправлять сообщения.",
|
||||
)
|
||||
]
|
||||
room_agent_id = room_meta.get("agent_id")
|
||||
if room_agent_id and room_agent_id != selected_agent_id:
|
||||
return [
|
||||
OutgoingMessage(
|
||||
chat_id=room_id,
|
||||
text=(
|
||||
f"Этот чат привязан к агенту «{room_agent_id}». "
|
||||
"Создай новый чат командой !new."
|
||||
),
|
||||
)
|
||||
]
|
||||
if not room_agent_id:
|
||||
await set_room_agent_id(self.runtime.store, room_id, selected_agent_id)
|
||||
await self._ensure_platform_chat_id(
|
||||
room_id, await get_room_meta(self.runtime.store, room_id)
|
||||
)
|
||||
return None
|
||||
|
||||
async def _send_all(self, room_id: str, outgoing: list[OutgoingEvent]) -> None:
|
||||
for event in outgoing:
|
||||
await send_outgoing(self.client, room_id, event, store=self.runtime.store)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ from nio.api import RoomVisibility
|
|||
from nio.responses import RoomCreateError
|
||||
|
||||
from adapter.matrix.store import (
|
||||
get_selected_agent_id,
|
||||
get_user_meta,
|
||||
next_chat_id,
|
||||
next_platform_chat_id,
|
||||
|
|
@ -104,18 +105,18 @@ def make_handle_new_chat(
|
|||
state_key=room_id,
|
||||
)
|
||||
|
||||
await set_room_meta(
|
||||
store,
|
||||
room_id,
|
||||
{
|
||||
"room_type": "chat",
|
||||
"chat_id": chat_id,
|
||||
"display_name": room_name,
|
||||
"matrix_user_id": event.user_id,
|
||||
"space_id": space_id,
|
||||
"platform_chat_id": platform_chat_id,
|
||||
},
|
||||
)
|
||||
selected_agent_id = await get_selected_agent_id(store, event.user_id)
|
||||
room_meta: dict = {
|
||||
"room_type": "chat",
|
||||
"chat_id": chat_id,
|
||||
"display_name": room_name,
|
||||
"matrix_user_id": event.user_id,
|
||||
"space_id": space_id,
|
||||
"platform_chat_id": platform_chat_id,
|
||||
}
|
||||
if selected_agent_id:
|
||||
room_meta["agent_id"] = selected_agent_id
|
||||
await set_room_meta(store, room_id, room_meta)
|
||||
ctx = await chat_mgr.get_or_create(
|
||||
user_id=event.user_id,
|
||||
chat_id=chat_id,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue