@clawpump/claw-agent 0.1.4 → 0.1.6

package/agent/gateway/platforms/matrix.py

@@ -10,32 +10,58 @@ Environment variables:
     MATRIX_USER_ID              Full user ID (@bot:server) — required for password login
     MATRIX_PASSWORD             Password (alternative to access token)
     MATRIX_ENCRYPTION           Set "true" to enable E2EE
+    MATRIX_E2EE_MODE            off | optional | required. Overrides MATRIX_ENCRYPTION
+                                when set. Legacy MATRIX_ENCRYPTION=true maps to required.
     MATRIX_DEVICE_ID            Stable device ID for E2EE persistence across restarts
     MATRIX_PROXY                HTTP(S) or SOCKS proxy URL for Matrix traffic
     MATRIX_ALLOWED_USERS    Comma-separated Matrix user IDs (@user:server)
+    MATRIX_ALLOWED_ROOMS    Comma-separated Matrix room IDs allowed to trigger turns
     MATRIX_HOME_ROOM        Room ID for cron/notification delivery
     MATRIX_REACTIONS        Set "false" to disable processing lifecycle reactions
                             (eyes/checkmark/cross). Default: true
     MATRIX_REQUIRE_MENTION      Require @mention in rooms (default: true)
-    MATRIX_FREE_RESPONSE_ROOMS  Comma-separated room IDs exempt from mention requirement (alias of matrix.free_response_rooms)
-    MATRIX_ALLOWED_ROOMS    Comma-separated room IDs; if set, bot ONLY responds in these rooms (whitelist, DMs exempt; alias of matrix.allowed_rooms)
+    MATRIX_FREE_RESPONSE_ROOMS  Comma-separated room IDs exempt from mention requirement
+                                (alias of matrix.free_response_rooms)
+    MATRIX_ALLOWED_ROOMS    Comma-separated room IDs; if set, bot ONLY responds
+                            in these rooms (whitelist, DMs exempt; alias of
+                            matrix.allowed_rooms)
+    MATRIX_IGNORE_USER_PATTERNS Comma-separated regular expressions for appservice /
+                                bridge ghost user IDs to ignore
+    MATRIX_PROCESS_NOTICES      Set "true" to process inbound m.notice events
+                                (default: false)
+    MATRIX_ALLOW_ROOM_MENTIONS  Allow outbound @room mentions to notify whole rooms
+                                (default: false)
+    MATRIX_TOOLS_ALLOW_REDACTION
+                              Allow Matrix redaction tool execution (default: false)
+    MATRIX_TOOLS_ALLOW_INVITES Allow Matrix invite tool execution (default: false)
+    MATRIX_TOOLS_ALLOW_ROOM_CREATE
+                              Allow Matrix room creation tool execution (default: false)
     MATRIX_AUTO_THREAD          Auto-create threads for room messages (default: true)
     MATRIX_DM_AUTO_THREAD       Auto-create threads for DM messages (default: false)
     MATRIX_RECOVERY_KEY         Recovery key for cross-signing verification after device key rotation
     MATRIX_DM_MENTION_THREADS   Create a thread when bot is @mentioned in a DM (default: false)
+    MATRIX_ALLOW_PUBLIC_ROOMS   Allow Matrix tools to create public rooms (default: false)
+    MATRIX_APPROVAL_REQUIRE_SENDER
+                              Require reaction controls to come from the original requester
+                              when requester metadata is available (default: true)
+    MATRIX_APPROVAL_TIMEOUT_SECONDS
+                              Reaction approval/model-picker timeout (default: 300)
 """
 
 from __future__ import annotations
 
 import asyncio
+import inspect
 import logging
 import mimetypes
 import os
 import re
 import time
-from dataclasses import dataclass
+from urllib.parse import urlsplit, urlunsplit
+from dataclasses import dataclass, field
 
 from html import escape as _html_escape
+from html.parser import HTMLParser
 from pathlib import Path
 from typing import Any, Dict, Optional, Set
 
@@ -107,18 +133,209 @@ from gateway.platforms.helpers import ThreadParticipationTracker
 
 logger = logging.getLogger(__name__)
 
+_MATRIX_BANG_COMMAND_RE = re.compile(
+    r"^!([A-Za-z][A-Za-z0-9_-]*)(?=$|\s)(.*)$",
+    re.DOTALL,
+)
+
+
+def _resolve_matrix_bang_command(name: str) -> str | None:
+    """Resolve a ``!command`` token to a dispatchable Hermes command token.
+
+    Matrix clients often reserve leading ``/`` for local client commands.
+    Hermes accepts ``!command`` as a Matrix-friendly alias, but only for
+    commands that the gateway can actually dispatch so ordinary exclamations
+    remain normal chat text.
+
+    Returns the token form that actually resolves (which may differ from
+    *name* only by underscore→hyphen normalization, e.g. ``reload_skills`` →
+    ``reload-skills``) so the emitted ``/command`` always resolves downstream,
+    or ``None`` when *name* is not a known command. Aliases are intentionally
+    left as-is — the gateway dispatcher resolves them to their canonical name.
+    """
+    if not name:
+        return None
+    # Try the raw lowercased token first, then its hyphenated variant, so
+    # forms like ``!reload_skills`` resolve against ``reload-skills``. We emit
+    # whichever candidate resolved (not a forced canonical form) to preserve
+    # alias passthrough — the gateway dispatcher canonicalizes aliases itself.
+    candidates = [name.lower()]
+    hyphenated = name.lower().replace("_", "-")
+    if hyphenated != candidates[0]:
+        candidates.append(hyphenated)
+
+    try:
+        from hermes_cli.commands import is_gateway_known_command
+
+        for candidate in candidates:
+            if is_gateway_known_command(candidate):
+                return candidate
+    except Exception:
+        logger.debug(
+            "Matrix: is_gateway_known_command failed for %r", name, exc_info=True
+        )
+
+    try:
+        from agent.skill_commands import get_skill_commands
+
+        skill_commands = get_skill_commands() or {}
+        # Skill command keys are stored slash-prefixed (e.g. "/arxiv"), so
+        # compare against the "/candidate" form, not the bare token.
+        for candidate in candidates:
+            if f"/{candidate}" in skill_commands:
+                return candidate
+    except Exception:
+        logger.debug("Matrix: get_skill_commands failed for %r", name, exc_info=True)
+
+    return None
+
+
+def _normalize_matrix_bang_command(text: str) -> str:
+    """Convert Matrix ``!command`` aliases to normal Hermes ``/command`` text."""
+    if not text or not text.startswith("!"):
+        return text
+    match = _MATRIX_BANG_COMMAND_RE.match(text)
+    if not match:
+        return text
+    resolved = _resolve_matrix_bang_command(match.group(1))
+    if resolved is None:
+        return text
+    return f"/{resolved}{match.group(2) or ''}"
+
+
+class _MatrixHtmlSanitizer(HTMLParser):
+    """Allowlist sanitizer for Matrix-compatible formatted HTML."""
+
+    _ALLOWED_TAGS = {
+        "a", "b", "blockquote", "br", "code", "del", "em", "h1", "h2", "h3",
+        "h4", "h5", "h6", "hr", "i", "li", "ol", "p", "pre", "s", "strike",
+        "strong", "table", "tbody", "td", "th", "thead", "tr", "ul",
+    }
+    _VOID_TAGS = {"br", "hr"}
+
+    def __init__(self) -> None:
+        super().__init__(convert_charrefs=False)
+        self._parts: list[str] = []
+        self._skip_depth = 0
+
+    @staticmethod
+    def _safe_url(value: str) -> str:
+        stripped = re.sub(r"[\x00-\x1f\x7f]+", "", value or "").strip()
+        match = re.match(r"^([A-Za-z][A-Za-z0-9+.-]*):", stripped)
+        scheme = match.group(1).lower() if match else ""
+        if scheme and scheme not in {"http", "https", "matrix", "mailto"}:
+            return ""
+        return stripped
+
+    def _safe_attrs(self, tag: str, attrs: list[tuple[str, str | None]]) -> str:
+        safe: list[str] = []
+        for key, value in attrs:
+            attr = str(key or "").lower()
+            raw_value = "" if value is None else str(value)
+            if attr.startswith("on"):
+                continue
+            if tag == "a" and attr == "href":
+                href = self._safe_url(raw_value)
+                if href:
+                    safe.append(f' href="{_html_escape(href, quote=True)}"')
+            elif tag == "code" and attr == "class":
+                if re.fullmatch(r"language-[A-Za-z0-9_+.-]{1,64}", raw_value):
+                    safe.append(f' class="{_html_escape(raw_value, quote=True)}"')
+        return "".join(safe)
+
+    def handle_starttag(self, tag: str, attrs: list[tuple[str, str | None]]) -> None:
+        tag = tag.lower()
+        if tag in {"script", "style"}:
+            self._skip_depth += 1
+            return
+        if self._skip_depth:
+            return
+        if tag not in self._ALLOWED_TAGS:
+            return
+        if tag in self._VOID_TAGS:
+            self._parts.append(f"<{tag}>")
+            return
+        self._parts.append(f"<{tag}{self._safe_attrs(tag, attrs)}>")
+
+    def handle_endtag(self, tag: str) -> None:
+        tag = tag.lower()
+        if tag in {"script", "style"} and self._skip_depth:
+            self._skip_depth -= 1
+            return
+        if self._skip_depth or tag not in self._ALLOWED_TAGS or tag in self._VOID_TAGS:
+            return
+        self._parts.append(f"</{tag}>")
+
+    def handle_data(self, data: str) -> None:
+        if not self._skip_depth:
+            self._parts.append(_html_escape(data))
+
+    def handle_entityref(self, name: str) -> None:
+        if not self._skip_depth:
+            self._parts.append(f"&{name};")
+
+    def handle_charref(self, name: str) -> None:
+        if not self._skip_depth:
+            self._parts.append(f"&#{name};")
+
+    def get_html(self) -> str:
+        return "".join(self._parts)
+
+
+@dataclass(frozen=True)
+class MatrixRoomIdentity:
+    """Resolved Matrix room identity for routing and prompt context."""
+
+    room_id: str
+    room_name: str | None
+    room_topic: str | None
+    canonical_alias: str | None
+    server_name: str | None
+    joined_member_count: int | None
+    is_direct_account_data: bool
+    display_name: str
+    has_explicit_name: bool
+    chat_type: str
+    conflict: bool = False
+
 
 @dataclass
 class _MatrixApprovalPrompt:
     """Tracks a pending Matrix reaction-based exec approval prompt."""
 
-    def __init__(self, session_key: str, chat_id: str, message_id: str, resolved: bool = False):
+    def __init__(
+        self,
+        session_key: str,
+        chat_id: str,
+        message_id: str,
+        resolved: bool = False,
+        requester_user_id: str | None = None,
+        expires_at: float | None = None,
+    ):
         self.session_key = session_key
         self.chat_id = chat_id
         self.message_id = message_id
         self.resolved = resolved
+        self.requester_user_id = requester_user_id
+        self.expires_at = expires_at
         self.bot_reaction_events: dict[str, str] = {}  # emoji -> event_id
 
+
+@dataclass
+class _MatrixModelPickerPrompt:
+    """Tracks a pending Matrix reaction-based model picker prompt."""
+
+    chat_id: str
+    message_id: str
+    session_key: str
+    choices: dict[str, tuple[str, str]]
+    on_model_selected: Any
+    requester_user_id: str | None = None
+    expires_at: float | None = None
+    resolved: bool = False
+    bot_reaction_events: dict[str, str] = field(default_factory=dict)
+
+
 # Matrix message size limit (4000 chars practical, spec has no hard limit
 # but clients render poorly above this).
 MAX_MESSAGE_LENGTH = 4000
@@ -155,6 +372,40 @@ _MATRIX_IMAGE_FILENAME_EXTS = frozenset({
     ".avif",
 })
 
+_MATRIX_MODEL_PICKER_REACTIONS = (
+    "1\ufe0f\u20e3",
+    "2\ufe0f\u20e3",
+    "3\ufe0f\u20e3",
+    "4\ufe0f\u20e3",
+    "5\ufe0f\u20e3",
+    "6\ufe0f\u20e3",
+    "7\ufe0f\u20e3",
+    "8\ufe0f\u20e3",
+    "9\ufe0f\u20e3",
+    "\U0001f51f",
+)
+
+_MATRIX_CAPABILITIES: Dict[str, str] = {
+    "text": "yes",
+    "threads": "yes",
+    "reactions": "yes",
+    "approvals": "yes",
+    "model picker": "yes",
+    "thinking panes": "yes",
+    "images": "yes",
+    "multiple images": "yes",
+    "files": "yes",
+    "voice/audio": "yes",
+    "video": "yes",
+    "E2EE": "off / optional / required",
+    "diagnostics": "yes",
+}
+
+
+def get_matrix_capabilities() -> Dict[str, str]:
+    """Return Matrix gateway capabilities for docs and release checks."""
+    return dict(_MATRIX_CAPABILITIES)
+
 
 def _looks_like_matrix_image_filename(text: str) -> bool:
     """Return True when Matrix image body text is probably just a transport filename.
@@ -181,6 +432,26 @@ def _looks_like_matrix_image_filename(text: str) -> bool:
     return suffix in _MATRIX_IMAGE_FILENAME_EXTS
 
 
+def _matrix_event_timestamp_seconds(event: Any) -> float:
+    """Return a Matrix event timestamp in seconds, accepting ms or sec values."""
+    raw_ts = (
+        getattr(event, "timestamp", None)
+        or getattr(event, "server_timestamp", None)
+        or 0
+    )
+    if not raw_ts:
+        return 0.0
+    try:
+        ts = float(raw_ts)
+    except (TypeError, ValueError):
+        return 0.0
+    # Matrix origin_server_ts is milliseconds. Some tests/fakes and SDK objects
+    # expose seconds; do not turn those into 1970-era timestamps.
+    if ts > 10_000_000_000:
+        return ts / 1000.0
+    return ts
+
+
 def _create_matrix_session(proxy_url: str | None):
     """Create an ``aiohttp.ClientSession`` whose proxy applies to *all* requests.
 
@@ -237,6 +508,159 @@ def _check_e2ee_deps() -> bool:
         return False
 
 
+def _normalize_e2ee_mode(value: Any) -> str:
+    """Normalize Matrix E2EE mode to off/optional/required."""
+    raw = str(value or "").strip().lower()
+    if raw in ("required", "require", "true", "1", "yes", "on"):
+        return "required"
+    if raw in ("optional", "prefer", "preferred"):
+        return "optional"
+    return "off"
+
+
+def _resolve_e2ee_mode(extra: Optional[Dict[str, Any]] = None) -> str:
+    """Resolve E2EE mode with MATRIX_ENCRYPTION backwards compatibility."""
+    extra = extra or {}
+    explicit = extra.get("e2ee_mode") or os.getenv("MATRIX_E2EE_MODE", "")
+    if explicit:
+        return _normalize_e2ee_mode(explicit)
+    legacy_enabled = extra.get(
+        "encryption",
+        os.getenv("MATRIX_ENCRYPTION", "").lower() in ("true", "1", "yes"),
+    )
+    return "required" if legacy_enabled else "off"
+
+
+def _redact_matrix_value(value: Any) -> str:
+    """Return a safe, non-reversible preview for Matrix diagnostics."""
+    text = str(value or "").strip()
+    if not text:
+        return ""
+    return "***"
+
+
+def _write_matrix_recovery_key_output_file(recovery_key: str) -> Optional[Path]:
+    """Write a generated Matrix recovery key to an operator-chosen file.
+
+    The file is created with mode 0600 and never overwritten. Returns the path
+    when written, otherwise None.
+    """
+    output_file = os.getenv("MATRIX_RECOVERY_KEY_OUTPUT_FILE", "").strip()
+    if not output_file:
+        return None
+    path = Path(output_file).expanduser()
+    path.parent.mkdir(parents=True, exist_ok=True)
+    flags = os.O_WRONLY | os.O_CREAT | os.O_EXCL
+    fd = os.open(path, flags, 0o600)
+    try:
+        with os.fdopen(fd, "w", encoding="utf-8") as fh:
+            fh.write(recovery_key)
+            fh.write("\n")
+    except Exception:
+        try:
+            os.close(fd)
+        except OSError:
+            pass
+        raise
+    return path
+
+
+def _get_matrix_recovery_key_output_target() -> tuple[Optional[Path], str]:
+    """Return a usable one-time recovery-key output path, or a redacted reason."""
+    output_file = os.getenv("MATRIX_RECOVERY_KEY_OUTPUT_FILE", "").strip()
+    if not output_file:
+        return None, "not_configured"
+    path = Path(output_file).expanduser()
+    if path.exists():
+        return None, "exists"
+    try:
+        path.parent.mkdir(parents=True, exist_ok=True)
+    except Exception as exc:
+        return None, f"unusable: {exc}"
+    return path, ""
+
+
+def _handle_generated_matrix_recovery_key(mxid: str, recovery_key: str) -> None:
+    """Handle a freshly generated Matrix recovery key without logging it."""
+    try:
+        output_path = _write_matrix_recovery_key_output_file(recovery_key)
+    except FileExistsError:
+        logger.warning(
+            "Matrix: bootstrapped cross-signing for %s. Recovery key output file "
+            "already exists; refusing to overwrite. Store the generated key "
+            "securely and set MATRIX_RECOVERY_KEY for future restarts.",
+            mxid,
+        )
+        return
+    except Exception as exc:
+        logger.warning(
+            "Matrix: bootstrapped cross-signing for %s, but failed to write "
+            "MATRIX_RECOVERY_KEY_OUTPUT_FILE: %s. Store the generated key "
+            "securely and set MATRIX_RECOVERY_KEY for future restarts.",
+            mxid,
+            exc,
+        )
+        return
+
+    if output_path:
+        logger.warning(
+            "Matrix: bootstrapped cross-signing for %s. A new recovery key was "
+            "written to %s with mode 0600. Move it to your secret store and set "
+            "MATRIX_RECOVERY_KEY for future restarts.",
+            mxid,
+            output_path,
+        )
+    else:
+        logger.warning(
+            "Matrix: bootstrapped cross-signing for %s. A new recovery key was "
+            "generated but will not be logged. Set MATRIX_RECOVERY_KEY_OUTPUT_FILE "
+            "to write it once with mode 0600, or configure MATRIX_RECOVERY_KEY "
+            "from your Matrix client before future restarts.",
+            mxid,
+        )
+
+
+def _sanitize_matrix_html(html: str) -> str:
+    sanitizer = _MatrixHtmlSanitizer()
+    try:
+        sanitizer.feed(html or "")
+        sanitizer.close()
+        return sanitizer.get_html()
+    except Exception:
+        return _html_escape(html or "")
+
+
+def _redact_url_for_log(url: str) -> str:
+    """Strip query/fragment from URLs before logging signed media links."""
+    try:
+        parts = urlsplit(str(url))
+        if not parts.scheme and not parts.netloc:
+            return str(url).split("?", 1)[0].split("#", 1)[0]
+        return urlunsplit((parts.scheme, parts.netloc, parts.path, "", ""))
+    except Exception:
+        return "<url>"
+
+
+def _pre_sanitize_matrix_markdown(text: str) -> str:
+    """Remove unsafe raw HTML before Markdown conversion can escape it."""
+    result = re.sub(
+        r"(?is)<\s*(script|style)\b[^>]*>.*?<\s*/\s*\1\s*>",
+        "",
+        text or "",
+    )
+    result = re.sub(
+        r"""(?is)\s+on[a-z0-9_-]+\s*=\s*("[^"]*"|'[^']*'|[^\s>]+)""",
+        "",
+        result,
+    )
+    result = re.sub(
+        r"""(?is)\s+(href|src)\s*=\s*("[^"]*(?:javascript|data|vbscript):[^"]*"|'[^']*(?:javascript|data|vbscript):[^']*'|[^\s>]*(?:javascript|data|vbscript):[^\s>]*)""",
+        "",
+        result,
+    )
+    return result
+
+
 def check_matrix_requirements() -> bool:
     """Return True if the Matrix adapter can be used.
 
@@ -302,21 +726,20 @@ def check_matrix_requirements() -> bool:
             )
             return False
 
-    # If encryption is requested, verify E2EE deps are available at startup
-    # rather than silently degrading to plaintext-only at connect time.
-    encryption_requested = os.getenv("MATRIX_ENCRYPTION", "").lower() in {
-        "true",
-        "1",
-        "yes",
-    }
-    if encryption_requested and not _check_e2ee_deps():
+    e2ee_mode = _resolve_e2ee_mode()
+    if e2ee_mode == "required" and not _check_e2ee_deps():
         logger.error(
-            "Matrix: MATRIX_ENCRYPTION=true but E2EE dependencies are missing. %s. "
+            "Matrix: E2EE is required but dependencies are missing. %s. "
             "Without this, encrypted rooms will not work. "
-            "Set MATRIX_ENCRYPTION=false to disable E2EE.",
+            "Set MATRIX_E2EE_MODE=off to disable E2EE.",
             _E2EE_INSTALL_HINT,
         )
         return False
+    if e2ee_mode == "optional" and not _check_e2ee_deps():
+        logger.warning(
+            "Matrix: E2EE optional but dependencies are missing. %s",
+            _E2EE_INSTALL_HINT,
+        )
 
     return True
 
@@ -351,6 +774,13 @@ class _CryptoStateStore:
 class MatrixAdapter(BasePlatformAdapter):
     """Gateway adapter for Matrix (any homeserver)."""
 
+    supports_code_blocks = True  # Matrix renders fenced code blocks (HTML/markdown)
+
+    # Matrix clients commonly reserve typed "/" for client-local commands;
+    # the adapter accepts "!command" as the alias that always reaches Hermes
+    # (see _normalize_matrix_bang_command), so instruction text shows "!".
+    typed_command_prefix = "!"
+
     # Threshold for detecting Matrix client-side message splits.
     # When a chunk is near the ~4000-char practical limit, a continuation
     # is almost certain.
@@ -369,10 +799,8 @@ class MatrixAdapter(BasePlatformAdapter):
         self._password: str = config.extra.get("password", "") or os.getenv(
             "MATRIX_PASSWORD", ""
         )
-        self._encryption: bool = config.extra.get(
-            "encryption",
-            os.getenv("MATRIX_ENCRYPTION", "").lower() in {"true", "1", "yes"},
-        )
+        self._e2ee_mode: str = _resolve_e2ee_mode(config.extra)
+        self._encryption: bool = self._e2ee_mode != "off"
         self._device_id: str = config.extra.get("device_id", "") or os.getenv(
             "MATRIX_DEVICE_ID", ""
         )
@@ -393,9 +821,19 @@ class MatrixAdapter(BasePlatformAdapter):
         self._late_grace_drops: int = 0
         self._late_grace_skew: float = 0.0
         self._clock_skew_warned: bool = False
+        self._last_sync_ts: float = 0.0
 
         # Cache: room_id → bool (is DM)
         self._dm_rooms: Dict[str, bool] = {}
+        self._room_identities: Dict[str, MatrixRoomIdentity] = {}
+        self._room_identity_cached_at: Dict[str, float] = {}
+        try:
+            self._room_identity_ttl_seconds = float(
+                os.getenv("MATRIX_ROOM_IDENTITY_TTL_SECONDS", "60")
+            )
+        except ValueError:
+            self._room_identity_ttl_seconds = 60.0
+        self._room_identity_cache_max = 256
         # Set of room IDs we've joined
         self._joined_rooms: Set[str] = set()
         # Event deduplication (bounded deque keeps newest entries)
@@ -410,10 +848,8 @@ class MatrixAdapter(BasePlatformAdapter):
         # Thread participation tracking (for require_mention bypass)
         self._threads = ThreadParticipationTracker("matrix")
 
-        # Mention/thread gating — parsed once from env vars.
-        self._require_mention: bool = os.getenv(
-            "MATRIX_REQUIRE_MENTION", "true"
-        ).lower() not in {"false", "0", "no"}
+        # Mention/thread gating — parsed once from config.extra or env vars.
+        self._require_mention: bool = self._parse_require_mention(config)
         self._thread_require_mention: bool = self._parse_thread_require_mention(config)
         free_rooms_raw = config.extra.get("free_response_rooms")
         if free_rooms_raw is None:
@@ -438,17 +874,27 @@ class MatrixAdapter(BasePlatformAdapter):
             self._allowed_rooms: Set[str] = {
                 r.strip() for r in str(allowed_rooms_raw).split(",") if r.strip()
             }
-        self._auto_thread: bool = os.getenv("MATRIX_AUTO_THREAD", "true").lower() in {
+        self._allow_room_mentions: bool = os.getenv(
+            "MATRIX_ALLOW_ROOM_MENTIONS", "false"
+        ).lower() in ("true", "1", "yes")
+        self._auto_thread: bool = os.getenv("MATRIX_AUTO_THREAD", "true").lower() in (
             "true",
             "1",
             "yes",
-        }
+        )
         self._dm_auto_thread: bool = os.getenv(
             "MATRIX_DM_AUTO_THREAD", "false"
         ).lower() in {"true", "1", "yes"}
         self._dm_mention_threads: bool = os.getenv(
             "MATRIX_DM_MENTION_THREADS", "false"
-        ).lower() in {"true", "1", "yes"}
+        ).lower() in ("true", "1", "yes")
+        raw_session_scope = os.getenv("MATRIX_SESSION_SCOPE", "auto").strip().lower()
+        self._matrix_session_scope = (
+            raw_session_scope if raw_session_scope in {"auto", "room", "thread"} else "auto"
+        )
+        self._process_notices: bool = os.getenv(
+            "MATRIX_PROCESS_NOTICES", "false"
+        ).lower() in ("true", "1", "yes")
 
         # Reactions: configurable via MATRIX_REACTIONS (default: true).
         self._reactions_enabled: bool = os.getenv(
@@ -466,6 +912,10 @@ class MatrixAdapter(BasePlatformAdapter):
         self._proxy_url: str | None = resolve_proxy_url(platform_env_var="MATRIX_PROXY")
         if self._proxy_url:
             logger.info("Matrix: proxy configured — %s", self._proxy_url)
+        try:
+            self._max_media_bytes = int(os.getenv("MATRIX_MAX_MEDIA_BYTES", str(100 * 1024 * 1024)))
+        except ValueError:
+            self._max_media_bytes = 100 * 1024 * 1024
 
         # Text batching: merge rapid successive messages (Telegram-style).
         # Matrix clients split long messages around 4000 chars.
@@ -481,14 +931,41 @@ class MatrixAdapter(BasePlatformAdapter):
         # Matrix reaction-based dangerous command approvals.
         self._approval_reaction_map = {
             "✅": "once",
+            "♾️": "always",
+            "♾": "always",
+            "\u267e\ufe0f": "always",
+            "\u267e": "always",
+            "❌": "deny",
             "❎": "deny",
         }
         self._approval_prompts_by_event: Dict[str, _MatrixApprovalPrompt] = {}
         self._approval_prompt_by_session: Dict[str, str] = {}
+        self._approval_require_sender: bool = os.getenv(
+            "MATRIX_APPROVAL_REQUIRE_SENDER", "true"
+        ).lower() in ("true", "1", "yes")
+        try:
+            self._approval_timeout_seconds = int(
+                os.getenv("MATRIX_APPROVAL_TIMEOUT_SECONDS", "300")
+            )
+        except ValueError:
+            self._approval_timeout_seconds = 300
+        self._model_picker_prompts_by_event: Dict[str, _MatrixModelPickerPrompt] = {}
         allowed_users_raw = os.getenv("MATRIX_ALLOWED_USERS", "")
         self._allowed_user_ids: Set[str] = {
             u.strip() for u in allowed_users_raw.split(",") if u.strip()
         }
+        self._allowed_room_ids: Set[str] = set(self._allowed_rooms)
+        ignore_patterns_raw = os.getenv("MATRIX_IGNORE_USER_PATTERNS", "")
+        self._ignored_user_patterns: list[re.Pattern[str]] = []
+        for pattern in (p.strip() for p in ignore_patterns_raw.split(",") if p.strip()):
+            try:
+                self._ignored_user_patterns.append(re.compile(pattern))
+            except re.error as exc:
+                logger.warning(
+                    "Matrix: ignoring invalid MATRIX_IGNORE_USER_PATTERNS entry %r: %s",
+                    pattern,
+                    exc,
+                )
 
     def _is_duplicate_event(self, event_id) -> bool:
         """Return True if this event was already processed. Tracks the ID otherwise."""
@@ -503,6 +980,25 @@ class MatrixAdapter(BasePlatformAdapter):
         self._processed_events_set.add(event_id)
         return False
 
+    @staticmethod
+    def _parse_require_mention(config) -> bool:
+        """Parse require_mention from config.extra or env var.
+
+        Handles both YAML booleans and string values (``\"true\"``, ``\"false\"``,
+        ``\"yes\"``, ``\"no\"``, ``\"on\"``, ``\"off\"``, ``\"1\"``, ``\"0\"``).
+        Falls back to ``MATRIX_REQUIRE_MENTION`` env var, default ``true``.
+        """
+        configured = config.extra.get("require_mention")
+        if configured is not None:
+            if isinstance(configured, bool):
+                return configured
+            if isinstance(configured, str):
+                return configured.lower() not in {"false", "0", "no", "off"}
+            return bool(configured)
+        return os.getenv(
+            "MATRIX_REQUIRE_MENTION", "true"
+        ).lower() not in {"false", "0", "no", "off"}
+
     @staticmethod
     def _parse_thread_require_mention(config) -> bool:
         """Parse thread_require_mention from config.extra or env var.
@@ -728,173 +1224,180 @@ class MatrixAdapter(BasePlatformAdapter):
         # Set up E2EE if requested.
         if self._encryption:
             if not _check_e2ee_deps():
-                logger.error(
-                    "Matrix: MATRIX_ENCRYPTION=true but E2EE dependencies are missing. %s. "
-                    "Refusing to connect — encrypted rooms would silently fail.",
-                    _E2EE_INSTALL_HINT,
-                )
-                await api.session.close()
-                return False
-            try:
-                from mautrix.crypto import OlmMachine
-                from mautrix.crypto.store.asyncpg import PgCryptoStore
-                from mautrix.util.async_db import Database
-
-                _STORE_DIR.mkdir(parents=True, exist_ok=True)
-
-                # Remove legacy pickle file from pre-SQLite era.
-                legacy_pickle = _STORE_DIR / "crypto_store.pickle"
-                if legacy_pickle.exists():
-                    logger.info(
-                        "Matrix: removing legacy crypto_store.pickle (migrated to SQLite)"
+                if self._e2ee_mode == "optional":
+                    logger.warning(
+                        "Matrix: E2EE optional but dependencies are missing. "
+                        "Continuing without encrypted-room support. %s",
+                        _E2EE_INSTALL_HINT,
+                    )
+                    self._encryption = False
+                else:
+                    logger.error(
+                        "Matrix: E2EE is required but dependencies are missing. %s. "
+                        "Refusing to connect — encrypted rooms would silently fail.",
+                        _E2EE_INSTALL_HINT,
                     )
-                    legacy_pickle.unlink()
-
-                # Open SQLite-backed crypto store.
-                crypto_db = Database.create(
-                    f"sqlite:///{_CRYPTO_DB_PATH}",
-                    upgrade_table=PgCryptoStore.upgrade_table,
-                )
-                await crypto_db.start()
-                self._crypto_db = crypto_db
-
-                _acct_id = self._user_id or "hermes"
-                _pickle_key = f"{_acct_id}:{self._device_id or 'default'}"
-                crypto_store = PgCryptoStore(
-                    account_id=_acct_id,
-                    pickle_key=_pickle_key,
-                    db=crypto_db,
-                )
-                await crypto_store.open()
-
-                # Bind the store to the runtime device_id before any
-                # put_account() runs. PgCryptoStore defaults _device_id
-                # to "" and its crypto_account UPSERT never updates the
-                # device_id column on conflict — so once put_account
-                # writes blank, it stays blank forever. That breaks
-                # every downstream device-scoped olm operation: peer
-                # to-device ciphertext can't find our identity key and
-                # no megolm sessions ever land. Setting _device_id here
-                # (in-memory; the on-disk row may not exist yet) makes
-                # the first put_account write the correct value.
-                # DeviceID is a NewType(str) so plain str works at runtime.
-                if client.device_id:
-                    await crypto_store.put_device_id(client.device_id)
-
-                crypto_state = _CryptoStateStore(state_store, self._joined_rooms)
-                olm = OlmMachine(client, crypto_store, crypto_state)
-
-                # Accept unverified devices so senders share Megolm
-                # session keys with us automatically.
-                olm.share_keys_min_trust = TrustState.UNVERIFIED
-                olm.send_keys_min_trust = TrustState.UNVERIFIED
-
-                await olm.load()
-
-                # Verify our device keys are still on the homeserver.
-                if not await self._verify_device_keys_on_server(client, olm):
-                    await crypto_db.stop()
                     await api.session.close()
                     return False
-
-                # Proactively flush one-time keys to detect stale OTK
-                # conflicts early.  When crypto state is wiped but the
-                # same device ID is reused, the server may still hold OTKs
-                # signed with the old ed25519 key.  Identity key re-upload
-                # succeeds but OTK uploads fail ("already exists" with
-                # mismatched signature).  Peers then cannot establish Olm
-                # sessions and all new messages are undecryptable.
+            if not self._encryption:
+                pass
+            else:
                 try:
-                    await olm.share_keys()
+                    from mautrix.crypto import OlmMachine
+                    from mautrix.crypto.store.asyncpg import PgCryptoStore
+                    from mautrix.util.async_db import Database
+
+                    _STORE_DIR.mkdir(parents=True, exist_ok=True)
                 except Exception as exc:
-                    exc_str = str(exc)
-                    if "already exists" in exc_str:
+                    if self._e2ee_mode == "optional":
+                        logger.warning(
+                            "Matrix: failed to import optional E2EE client; "
+                            "continuing without encrypted-room support: %s. %s",
+                            exc,
+                            _E2EE_INSTALL_HINT,
+                        )
+                        self._encryption = False
+                    else:
                         logger.error(
-                            "Matrix: device %s has stale one-time keys on the "
-                            "server signed with a previous identity key. "
-                            "Peers cannot establish new Olm sessions with "
-                            "this device. Delete the device from the "
-                            "homeserver and restart, or generate a new "
-                            "access token to get a fresh device ID.",
-                            client.device_id,
+                            "Matrix: failed to import E2EE client: %s. %s",
+                            exc,
+                            _E2EE_INSTALL_HINT,
                         )
-                        await crypto_db.stop()
                         await api.session.close()
                         return False
-                    # Non-OTK errors are transient (network, etc.) — log
-                    # but allow startup to continue.
-                    logger.warning(
-                        "Matrix: share_keys() warning during startup: %s",
-                        exc,
+            if self._encryption:
+                try:
+                    # Remove legacy pickle file from pre-SQLite era.
+                    legacy_pickle = _STORE_DIR / "crypto_store.pickle"
+                    if legacy_pickle.exists():
+                        logger.info(
+                            "Matrix: removing legacy crypto_store.pickle (migrated to SQLite)"
+                        )
+                        legacy_pickle.unlink()
+
+                    crypto_db = Database.create(
+                        f"sqlite:///{_CRYPTO_DB_PATH}",
+                        upgrade_table=PgCryptoStore.upgrade_table,
+                    )
+                    await crypto_db.start()
+                    self._crypto_db = crypto_db
+
+                    _acct_id = self._user_id or "hermes"
+                    _pickle_key = f"{_acct_id}:{self._device_id or 'default'}"
+                    crypto_store = PgCryptoStore(
+                        account_id=_acct_id,
+                        pickle_key=_pickle_key,
+                        db=crypto_db,
                     )
+                    await crypto_store.open()
+
+                    if client.device_id:
+                        await crypto_store.put_device_id(client.device_id)
+
+                    crypto_state = _CryptoStateStore(state_store, self._joined_rooms)
+                    olm = OlmMachine(client, crypto_store, crypto_state)
+                    olm.share_keys_min_trust = TrustState.UNVERIFIED
+                    olm.send_keys_min_trust = TrustState.UNVERIFIED
+
+                    await olm.load()
+
+                    if not await self._verify_device_keys_on_server(client, olm):
+                        await crypto_db.stop()
+                        await api.session.close()
+                        return False
 
-                # Import cross-signing private keys from SSSS and self-sign
-                # the current device. Required after any device-key rotation
-                # (fresh crypto.db, share_keys re-upload) — otherwise the
-                # device's self-signing signature is stale and peers refuse
-                # to share Megolm sessions with the rotated device.
-                recovery_key = os.getenv("MATRIX_RECOVERY_KEY", "").strip()
-                if recovery_key:
-                    try:
-                        await olm.verify_with_recovery_key(recovery_key)
-                        logger.info("Matrix: cross-signing verified via recovery key")
-                    except Exception as exc:
-                        logger.warning(
-                            "Matrix: recovery key verification failed: %s", exc
-                        )
-                else:
-                    # No recovery key — bootstrap cross-signing if the bot
-                    # has none yet. Without this, Element shows "Encrypted
-                    # by a device not verified by its owner" on every
-                    # message from this bot, indefinitely. mautrix's
-                    # generate_recovery_key does the full flow: generates
-                    # MSK/SSK/USK, uploads private keys to SSSS, publishes
-                    # public keys to the homeserver, and signs the current
-                    # device with the new SSK. Some homeservers require UIA
-                    # for /keys/device_signing/upload — those will need an
-                    # alternate path; Continuwuity and Synapse-with-shared-
-                    # secret accept the unauthenticated upload.
                     try:
-                        own_xsign = await olm.get_own_cross_signing_public_keys()
+                        await olm.share_keys()
                     except Exception as exc:
-                        own_xsign = None
-                        logger.warning(
-                            "Matrix: cross-signing key lookup failed: %s", exc
-                        )
-                    if own_xsign is None:
-                        try:
-                            new_recovery_key = await olm.generate_recovery_key()
-                            logger.warning(
-                                "Matrix: bootstrapped cross-signing for %s. "
-                                "SAVE THIS RECOVERY KEY — set "
-                                "MATRIX_RECOVERY_KEY for future restarts so "
-                                "the bot can re-sign its device after key "
-                                "rotation: %s",
-                                client.mxid,
-                                new_recovery_key,
+                        exc_str = str(exc)
+                        if "already exists" in exc_str:
+                            logger.error(
+                                "Matrix: device %s has stale one-time keys on the "
+                                "server signed with a previous identity key. "
+                                "Delete the device from the homeserver and restart, "
+                                "or generate a new access token to get a fresh device ID.",
+                                client.device_id,
                             )
+                            await crypto_db.stop()
+                            await api.session.close()
+                            return False
+                        logger.warning("Matrix: share_keys() warning during startup: %s", exc)
+
+                    recovery_key = os.getenv("MATRIX_RECOVERY_KEY", "").strip()
+                    if recovery_key:
+                        try:
+                            await olm.verify_with_recovery_key(recovery_key)
+                            logger.info("Matrix: cross-signing verified via recovery key")
                         except Exception as exc:
-                            logger.warning(
-                                "Matrix: cross-signing bootstrap failed "
-                                "(non-fatal — Element will show 'not "
-                                "verified by its owner'): %s",
-                                exc,
-                            )
+                            logger.warning("Matrix: recovery key verification failed: %s", exc)
+                    else:
+                        try:
+                            own_xsign = await olm.get_own_cross_signing_public_keys()
+                        except Exception as exc:
+                            own_xsign = None
+                            logger.warning("Matrix: cross-signing key lookup failed: %s", exc)
+                        if own_xsign is None:
+                            _, output_error = _get_matrix_recovery_key_output_target()
+                            if output_error == "not_configured":
+                                logger.warning(
+                                    "Matrix: cross-signing keys are missing, but "
+                                    "automatic bootstrap is skipped because "
+                                    "MATRIX_RECOVERY_KEY_OUTPUT_FILE is not configured. "
+                                    "Configure MATRIX_RECOVERY_KEY from your Matrix client "
+                                    "or set MATRIX_RECOVERY_KEY_OUTPUT_FILE to write a new "
+                                    "recovery key once with mode 0600."
+                                )
+                            elif output_error == "exists":
+                                logger.warning(
+                                    "Matrix: cross-signing keys are missing, but "
+                                    "automatic bootstrap is skipped because "
+                                    "MATRIX_RECOVERY_KEY_OUTPUT_FILE already exists and "
+                                    "will not be overwritten."
+                                )
+                            elif output_error:
+                                logger.warning(
+                                    "Matrix: cross-signing keys are missing, but "
+                                    "automatic bootstrap is skipped because "
+                                    "MATRIX_RECOVERY_KEY_OUTPUT_FILE is not usable: %s",
+                                    output_error,
+                                )
+                            else:
+                                try:
+                                    new_recovery_key = await olm.generate_recovery_key()
+                                    _handle_generated_matrix_recovery_key(
+                                        str(client.mxid),
+                                        new_recovery_key,
+                                    )
+                                except Exception as exc:
+                                    logger.warning(
+                                        "Matrix: cross-signing bootstrap failed "
+                                        "(non-fatal — Element will show 'not verified by its owner'): %s",
+                                        exc,
+                                    )
 
-                client.crypto = olm
-                logger.info(
-                    "Matrix: E2EE enabled (store: %s%s)",
-                    str(_CRYPTO_DB_PATH),
-                    f", device_id={client.device_id}" if client.device_id else "",
-                )
-            except Exception as exc:
-                logger.error(
-                    "Matrix: failed to create E2EE client: %s. %s",
-                    exc,
-                    _E2EE_INSTALL_HINT,
-                )
-                await api.session.close()
-                return False
+                    client.crypto = olm
+                    logger.info(
+                        "Matrix: E2EE enabled (store: %s%s)",
+                        str(_CRYPTO_DB_PATH),
+                        f", device_id={client.device_id}" if client.device_id else "",
+                    )
+                except Exception as exc:
+                    if self._e2ee_mode == "optional":
+                        logger.warning(
+                            "Matrix: failed to create optional E2EE client; "
+                            "continuing without encrypted-room support: %s. %s",
+                            exc,
+                            _E2EE_INSTALL_HINT,
+                        )
+                        self._encryption = False
+                    else:
+                        logger.error(
+                            "Matrix: failed to create E2EE client: %s. %s",
+                            exc,
+                            _E2EE_INSTALL_HINT,
+                        )
+                        await api.session.close()
+                        return False
 
         # Register event handlers.
         from mautrix.client import InternalEventType as IntEvt
@@ -919,9 +1422,12 @@ class MatrixAdapter(BasePlatformAdapter):
         try:
             sync_data = await client.sync(timeout=10000, full_state=True)
             if isinstance(sync_data, dict):
+                self._last_sync_ts = time.time()
                 rooms_join = sync_data.get("rooms", {}).get("join", {})
                 self._joined_rooms.clear()
                 self._joined_rooms.update(rooms_join.keys())
+                self._room_identities.clear()
+                self._room_identity_cached_at.clear()
                 # Store the next_batch token so incremental syncs start
                 # from where the initial sync left off.
                 nb = sync_data.get("next_batch")
@@ -937,9 +1443,7 @@ class MatrixAdapter(BasePlatformAdapter):
                 # Dispatch events from the initial sync so the OlmMachine
                 # receives to-device key shares queued while we were offline.
                 try:
-                    tasks = client.handle_sync(sync_data)
-                    if tasks:
-                        await asyncio.gather(*tasks)
+                    await self._dispatch_sync(sync_data)
                 except Exception as exc:
                     logger.warning("Matrix: initial sync event dispatch error: %s", exc)
                 await self._join_pending_invites(sync_data)
@@ -1017,20 +1521,7 @@ class MatrixAdapter(BasePlatformAdapter):
         for i, chunk in enumerate(chunks):
             msg_content = self._build_text_message_content(chunk)
 
-            # Reply-to support.
-            if reply_to:
-                msg_content["m.relates_to"] = {"m.in_reply_to": {"event_id": reply_to}}
-
-            # Thread support: if metadata has thread_id, send as threaded reply.
-            thread_id = (metadata or {}).get("thread_id")
-            if thread_id:
-                relates_to = msg_content.get("m.relates_to", {})
-                relates_to["rel_type"] = "m.thread"
-                relates_to["event_id"] = thread_id
-                relates_to["is_falling_back"] = True
-                if reply_to and "m.in_reply_to" not in relates_to:
-                    relates_to["m.in_reply_to"] = {"event_id": reply_to}
-                msg_content["m.relates_to"] = relates_to
+            self._apply_relation_metadata(msg_content, reply_to=reply_to, metadata=metadata)
 
             try:
                 event_id = await asyncio.wait_for(
@@ -1077,21 +1568,56 @@ class MatrixAdapter(BasePlatformAdapter):
 
     async def get_chat_info(self, chat_id: str) -> Dict[str, Any]:
         """Return room name and type (dm/group)."""
-        name = chat_id
-        chat_type = "dm" if await self._is_dm_room(chat_id) else "group"
-
-        if self._client:
-            try:
-                name_evt = await self._client.get_state_event(
-                    RoomID(chat_id),
-                    EventType.ROOM_NAME,
-                )
-                if name_evt and hasattr(name_evt, "name") and name_evt.name:
-                    name = name_evt.name
-            except Exception:
-                pass
-
-        return {"name": name, "type": chat_type}
+        identity = await self._resolve_room_identity(chat_id)
+        chat_type = "dm" if identity.chat_type == "dm" else "group"
+        return {"name": identity.display_name, "type": chat_type}
+
+    def get_diagnostics(self) -> Dict[str, Any]:
+        """Return redacted Matrix readiness/status diagnostics."""
+        now = time.time()
+        token_present = bool(self._access_token)
+        user_id = self._user_id or getattr(self._client, "mxid", "") or ""
+        device_id = self._device_id or getattr(self._client, "device_id", "") or ""
+        return {
+            "platform": "matrix",
+            "homeserver": self._homeserver,
+            "auth": {
+                "access_token_present": token_present,
+                "password_present": bool(self._password),
+                "token_preview": "***" if token_present else "",
+                "user_id": user_id,
+                "device_id_present": bool(device_id),
+                "device_id_preview": _redact_matrix_value(device_id),
+            },
+            "sync": {
+                "connected": self._client is not None,
+                "joined_room_count": len(self._joined_rooms),
+                "last_sync_age_seconds": (
+                    max(0.0, now - self._last_sync_ts) if self._last_sync_ts else None
+                ),
+            },
+            "e2ee": {
+                "mode": self._e2ee_mode,
+                "enabled": bool(self._encryption),
+                "deps_available": _check_e2ee_deps(),
+                "crypto_store_path": str(_CRYPTO_DB_PATH),
+                "recovery_key_configured": bool(os.getenv("MATRIX_RECOVERY_KEY", "").strip()),
+            },
+            "policy": {
+                "allowed_user_count": len(self._allowed_user_ids),
+                "allowed_room_count": len(self._allowed_room_ids),
+                "ignored_user_pattern_count": len(self._ignored_user_patterns),
+                "require_mention": self._require_mention,
+                "free_response_room_count": len(self._free_rooms),
+                "allow_room_mentions": self._allow_room_mentions,
+                "process_notices": self._process_notices,
+                "allow_public_rooms": os.getenv("MATRIX_ALLOW_PUBLIC_ROOMS", "").lower()
+                in ("true", "1", "yes"),
+            },
+            "media": {
+                "max_media_bytes": self._max_media_bytes,
+            },
+        }
 
     # ------------------------------------------------------------------
     # Optional overrides
@@ -1166,43 +1692,120 @@ class MatrixAdapter(BasePlatformAdapter):
             )
 
         try:
-            # Try aiohttp first (always available), fall back to httpx
-            try:
-                import aiohttp as _aiohttp
-                _sess_kw, _req_kw = proxy_kwargs_for_aiohttp(self._proxy_url)
-                async with _aiohttp.ClientSession(**_sess_kw) as http:
-                    async with http.get(
-                        image_url,
-                        timeout=_aiohttp.ClientTimeout(total=30),
-                        **_req_kw,
-                    ) as resp:
-                        resp.raise_for_status()
-                        data = await resp.read()
-                        ct = resp.content_type or "image/png"
-                        fname = (
-                            image_url.rsplit("/", 1)[-1].split("?")[0] or "image.png"
-                        )
-            except ImportError:
-                import httpx
-                _httpx_kw: dict = {}
-                if self._proxy_url:
-                    _httpx_kw["proxy"] = self._proxy_url
-                async with httpx.AsyncClient(**_httpx_kw) as http:
-                    resp = await http.get(image_url, follow_redirects=True, timeout=30)
-                    resp.raise_for_status()
-                    data = resp.content
-                    ct = resp.headers.get("content-type", "image/png")
-                    fname = image_url.rsplit("/", 1)[-1].split("?")[0] or "image.png"
+            data, ct, fname = await self._download_external_media_with_cap(image_url)
         except Exception as exc:
-            logger.warning("Matrix: failed to download image %s: %s", image_url, exc)
+            logger.warning(
+                "Matrix: failed to download image %s: %s",
+                _redact_url_for_log(image_url),
+                exc,
+            )
+            fallback = (
+                "I couldn't download and upload the image to Matrix. "
+                "The source URL was not shown because it may contain private tokens."
+            )
+            if caption:
+                fallback = f"{caption}\n{fallback}"
             return await self.send(
-                chat_id, f"{caption or ''}\n{image_url}".strip(), reply_to
+                chat_id,
+                fallback,
+                reply_to,
             )
 
         return await self._upload_and_send(
             chat_id, data, fname, ct, "m.image", caption, reply_to, metadata
         )
 
+    async def _download_external_media_with_cap(self, url: str) -> tuple[bytes, str, str]:
+        """Download external media while enforcing redirect safety and size caps."""
+        from tools.url_safety import is_safe_url
+
+        if not is_safe_url(url):
+            raise ValueError("blocked unsafe media URL")
+
+        def _check_content_length(headers: Any) -> None:
+            raw = None
+            try:
+                raw = headers.get("Content-Length") or headers.get("content-length")
+            except Exception:
+                raw = None
+            if raw is None:
+                return
+            try:
+                size = int(raw)
+            except (TypeError, ValueError):
+                return
+            if size > self._max_media_bytes:
+                raise ValueError(
+                    f"media exceeds Matrix limit ({size} > {self._max_media_bytes} bytes)"
+                )
+
+        def _check_image_content_type(content_type: str) -> str:
+            content_type = str(content_type or "").split(";", 1)[0].strip().lower()
+            if not content_type.startswith("image/"):
+                raise ValueError("external media is not an image")
+            return content_type
+
+        def _append_chunk(parts: list[bytes], total: int, chunk: bytes) -> int:
+            total += len(chunk)
+            if total > self._max_media_bytes:
+                raise ValueError(
+                    f"media exceeds Matrix limit (> {self._max_media_bytes} bytes)"
+                )
+            parts.append(chunk)
+            return total
+
+        fname = url.rsplit("/", 1)[-1].split("?")[0] or "image.png"
+
+        try:
+            import aiohttp as _aiohttp
+
+            _sess_kw, _req_kw = proxy_kwargs_for_aiohttp(self._proxy_url)
+            async with _aiohttp.ClientSession(**_sess_kw) as http:
+                async with http.get(
+                    url,
+                    timeout=_aiohttp.ClientTimeout(total=30),
+                    allow_redirects=True,
+                    **_req_kw,
+                ) as resp:
+                    resp.raise_for_status()
+                    if not is_safe_url(str(resp.url)):
+                        raise ValueError("blocked unsafe redirect URL")
+                    _check_content_length(resp.headers)
+                    parts: list[bytes] = []
+                    total = 0
+                    async for chunk in resp.content.iter_chunked(65536):
+                        total = _append_chunk(parts, total, bytes(chunk))
+                    ct = _check_image_content_type(
+                        getattr(resp, "content_type", None)
+                        or resp.headers.get("content-type", "application/octet-stream")
+                    )
+                    return b"".join(parts), ct, fname
+        except ImportError:
+            import httpx
+
+            _httpx_kw: dict = {}
+            if self._proxy_url:
+                _httpx_kw["proxy"] = self._proxy_url
+            async with httpx.AsyncClient(**_httpx_kw) as http:
+                async with http.stream(
+                    "GET",
+                    url,
+                    follow_redirects=True,
+                    timeout=30,
+                ) as resp:
+                    resp.raise_for_status()
+                    if not is_safe_url(str(resp.url)):
+                        raise ValueError("blocked unsafe redirect URL")
+                    _check_content_length(resp.headers)
+                    parts: list[bytes] = []
+                    total = 0
+                    async for chunk in resp.aiter_bytes():
+                        total = _append_chunk(parts, total, bytes(chunk))
+                    ct = _check_image_content_type(
+                        resp.headers.get("content-type", "application/octet-stream")
+                    )
+                    return b"".join(parts), ct, fname
+
     async def send_image_file(
         self,
         chat_id: str,
@@ -1216,6 +1819,42 @@ class MatrixAdapter(BasePlatformAdapter):
             chat_id, image_path, "m.image", caption, reply_to, metadata=metadata
         )
 
+    async def send_multiple_images(
+        self,
+        chat_id: str,
+        images: list[tuple[str, str]],
+        metadata: Optional[Dict[str, Any]] = None,
+        human_delay: float = 0.0,
+    ) -> None:
+        """Send multiple Matrix images as one ordered logical batch."""
+        if not images:
+            return
+        from urllib.parse import unquote as _unquote
+
+        total = len(images)
+        for idx, (image_url, alt_text) in enumerate(images, start=1):
+            if human_delay > 0 and idx > 1:
+                await asyncio.sleep(human_delay)
+            caption = alt_text or None
+            if total > 1 and caption:
+                caption = f"{caption} ({idx}/{total})"
+            if image_url.startswith("file://"):
+                result = await self.send_image_file(
+                    chat_id=chat_id,
+                    image_path=_unquote(image_url[7:]),
+                    caption=caption,
+                    metadata=metadata,
+                )
+            else:
+                result = await self.send_image(
+                    chat_id=chat_id,
+                    image_url=image_url,
+                    caption=caption,
+                    metadata=metadata,
+                )
+            if not result.success:
+                logger.warning("Matrix: failed to send image %d/%d: %s", idx, total, result.error)
+
     async def send_document(
         self,
         chat_id: str,
@@ -1274,16 +1913,17 @@ class MatrixAdapter(BasePlatformAdapter):
         if not self._client:
             return SendResult(success=False, error="Not connected")
 
+        requester_user_id = str((metadata or {}).get("requester_user_id") or "") or None
         cmd_preview = command[:2000] + "..." if len(command) > 2000 else command
         text = (
             "⚠️ **Dangerous command requires approval**\n"
             f"```\n{cmd_preview}\n```\n"
             f"Reason: {description}\n\n"
-            "Reply `/approve` to execute, `/approve session` to approve this pattern for the session, "
-            "`/approve always` to approve permanently, or `/deny` to cancel.\n\n"
+            "Reply `!approve` to execute, `!approve session` to approve this pattern for the session, "
+            "`!approve always` to approve permanently, or `!deny` to cancel.\n\n"
             "You can also click the reaction to approve:\n"
-            "✅ = /approve\n"
-            "❎ = /deny"
+            "✅ = approve\n"
+            "❎ = deny"
         )
 
         result = await self.send(chat_id, text, metadata=metadata)
@@ -1294,6 +1934,8 @@ class MatrixAdapter(BasePlatformAdapter):
             session_key=session_key,
             chat_id=chat_id,
             message_id=result.message_id,
+            requester_user_id=requester_user_id,
+            expires_at=time.monotonic() + max(self._approval_timeout_seconds, 0),
         )
         old_event = self._approval_prompt_by_session.get(session_key)
         if old_event:
@@ -1301,7 +1943,7 @@ class MatrixAdapter(BasePlatformAdapter):
         self._approval_prompts_by_event[result.message_id] = prompt
         self._approval_prompt_by_session[session_key] = result.message_id
 
-        for emoji in ("✅", "❎"):
+        for emoji in ("✅", "♾️", "❌"):
             try:
                 reaction_result = await self._send_reaction(chat_id, result.message_id, emoji)
                 # Save the bot's reaction event_id for later cleanup
@@ -1312,6 +1954,87 @@ class MatrixAdapter(BasePlatformAdapter):
 
         return result
 
+    async def send_model_picker(
+        self,
+        chat_id: str,
+        providers: list,
+        current_model: str,
+        current_provider: str,
+        session_key: str,
+        on_model_selected,
+        metadata: Optional[Dict[str, Any]] = None,
+    ) -> SendResult:
+        """Send a Matrix reaction-based model picker."""
+        if not self._client:
+            return SendResult(success=False, error="Not connected")
+
+        flat_choices: list[tuple[str, str, str, str]] = []
+        for provider in providers or []:
+            provider_slug = str(provider.get("slug") or "")
+            provider_name = str(provider.get("name") or provider_slug)
+            models = provider.get("models") or []
+            for model_id in models:
+                if len(flat_choices) >= len(_MATRIX_MODEL_PICKER_REACTIONS):
+                    break
+                flat_choices.append((
+                    _MATRIX_MODEL_PICKER_REACTIONS[len(flat_choices)],
+                    str(model_id),
+                    provider_slug,
+                    provider_name,
+                ))
+            if len(flat_choices) >= len(_MATRIX_MODEL_PICKER_REACTIONS):
+                break
+
+        if not flat_choices:
+            return await self.send(
+                chat_id,
+                "No authenticated models are available for this session.",
+                metadata=metadata,
+            )
+
+        try:
+            from hermes_cli.providers import get_label
+            provider_label = get_label(current_provider)
+        except Exception:
+            provider_label = current_provider
+
+        lines = [
+            "⚙ **Model Configuration**",
+            f"Current model: `{current_model or 'unknown'}`",
+            f"Provider: {provider_label or 'unknown'}",
+            "",
+            "React to choose a model:",
+        ]
+        choices: dict[str, tuple[str, str]] = {}
+        for emoji, model_id, provider_slug, provider_name in flat_choices:
+            choices[emoji] = (model_id, provider_slug)
+            lines.append(f"{emoji} `{model_id}` — {provider_name}")
+
+        result = await self.send(chat_id, "\n".join(lines), metadata=metadata)
+        if not result.success or not result.message_id:
+            return result
+
+        prompt = _MatrixModelPickerPrompt(
+            chat_id=chat_id,
+            message_id=result.message_id,
+            session_key=session_key,
+            choices=choices,
+            on_model_selected=on_model_selected,
+            requester_user_id=str((metadata or {}).get("requester_user_id") or "") or None,
+            expires_at=time.monotonic() + max(self._approval_timeout_seconds, 0),
+        )
+        self._model_picker_prompts_by_event[result.message_id] = prompt
+
+        for emoji in choices:
+            try:
+                reaction_event_id = await self._send_reaction(chat_id, result.message_id, emoji)
+                if reaction_event_id:
+                    prompt.bot_reaction_events[emoji] = str(reaction_event_id)
+            except Exception as exc:
+                logger.debug("Matrix: failed to add model picker reaction %s: %s", emoji, exc)
+
+        return result
+
     def format_message(self, content: str) -> str:
         """Pass-through — Matrix supports standard Markdown natively."""
         # Strip image markdown; media is uploaded separately.
@@ -1335,6 +2058,11 @@ class MatrixAdapter(BasePlatformAdapter):
         is_voice: bool = False,
     ) -> SendResult:
         """Upload bytes to Matrix and send as a media message."""
+        if len(data) > self._max_media_bytes:
+            return SendResult(
+                success=False,
+                error=f"Media file exceeds Matrix limit ({len(data)} > {self._max_media_bytes} bytes)",
+            )
 
         upload_data = data
         encrypted_file = None
@@ -1385,16 +2113,7 @@ class MatrixAdapter(BasePlatformAdapter):
         if is_voice:
             msg_content["org.matrix.msc3245.voice"] = {}
 
-        if reply_to:
-            msg_content["m.relates_to"] = {"m.in_reply_to": {"event_id": reply_to}}
-
-        thread_id = (metadata or {}).get("thread_id")
-        if thread_id:
-            relates_to = msg_content.get("m.relates_to", {})
-            relates_to["rel_type"] = "m.thread"
-            relates_to["event_id"] = thread_id
-            relates_to["is_falling_back"] = True
-            msg_content["m.relates_to"] = relates_to
+        self._apply_relation_metadata(msg_content, reply_to=reply_to, metadata=metadata)
 
         try:
             event_id = await self._client.send_message_event(
@@ -1423,6 +2142,15 @@ class MatrixAdapter(BasePlatformAdapter):
             return await self.send(
                 room_id, f"{caption or ''}\n(file not found: {file_path})", reply_to
             )
+        try:
+            file_size = p.stat().st_size
+        except OSError:
+            file_size = 0
+        if file_size > self._max_media_bytes:
+            return SendResult(
+                success=False,
+                error=f"Media file exceeds Matrix limit ({file_size} > {self._max_media_bytes} bytes)",
+            )
 
         fname = file_name or p.name
         ct = mimetypes.guess_type(fname)[0] or "application/octet-stream"
@@ -1467,10 +2195,13 @@ class MatrixAdapter(BasePlatformAdapter):
                         return
 
                 if isinstance(sync_data, dict):
+                    self._last_sync_ts = time.time()
                     # Update joined rooms from sync response.
                     rooms_join = sync_data.get("rooms", {}).get("join", {})
                     if rooms_join:
                         self._joined_rooms.update(rooms_join.keys())
+                        self._room_identities.clear()
+                        self._room_identity_cached_at.clear()
 
                     # Advance the sync token so the next request is
                     # incremental instead of a full initial sync.
@@ -1482,9 +2213,7 @@ class MatrixAdapter(BasePlatformAdapter):
                     # Dispatch events to registered handlers so that
                     # _on_room_message / _on_reaction / _on_invite fire.
                     try:
-                        tasks = client.handle_sync(sync_data)
-                        if tasks:
-                            await asyncio.gather(*tasks)
+                        await self._dispatch_sync(sync_data)
                     except Exception as exc:
                         logger.warning("Matrix: sync event dispatch error: %s", exc)
                     await self._join_pending_invites(sync_data)
@@ -1513,6 +2242,17 @@ class MatrixAdapter(BasePlatformAdapter):
     # Event callbacks
     # ------------------------------------------------------------------
 
+    async def _dispatch_sync(self, sync_data: Dict[str, Any]) -> None:
+        """Dispatch a sync response through the mautrix event machinery."""
+        client = self._client
+        if not client or not hasattr(client, "handle_sync"):
+            return
+        tasks = client.handle_sync(sync_data)
+        if inspect.isawaitable(tasks):
+            tasks = await tasks
+        if tasks:
+            await asyncio.gather(*tasks)
+
     def _is_self_sender(self, sender: str) -> bool:
         """Return True if the sender refers to the bot's own account.
 
@@ -1569,6 +2309,33 @@ class MatrixAdapter(BasePlatformAdapter):
             return True
         return localpart.startswith("_")
 
+    def _matches_ignored_user_pattern(self, sender: str) -> bool:
+        """Return True when sender matches configured Matrix ignore patterns."""
+        return any(pattern.search(sender or "") for pattern in self._ignored_user_patterns)
+
+    def _is_allowed_matrix_room(self, room_id: str) -> bool:
+        """Return True when MATRIX_ALLOWED_ROOMS permits the room."""
+        return not self._allowed_room_ids or room_id in self._allowed_room_ids
+
+    async def _is_allowed_matrix_room_event(self, room_id: str) -> bool:
+        """Return True when a room event may proceed past intake filters.
+
+        MATRIX_ALLOWED_ROOMS constrains shared rooms. Matrix DMs are exempt so
+        personal chats still work when operators use a room allowlist for
+        project rooms.
+        """
+        if self._is_allowed_matrix_room(room_id):
+            return True
+        try:
+            return await self._is_dm_room(room_id)
+        except Exception as exc:
+            logger.debug(
+                "Matrix: could not resolve room identity for allowlist check in %s: %s",
+                room_id,
+                exc,
+            )
+            return False
+
     async def _on_room_message(self, event: Any) -> None:
         """Handle incoming room message events (text, media)."""
         room_id = str(getattr(event, "room_id", ""))
@@ -1600,6 +2367,19 @@ class MatrixAdapter(BasePlatformAdapter):
                 room_id,
             )
             return
+        if self._matches_ignored_user_pattern(sender):
+            logger.debug(
+                "Matrix: ignoring sender %s in %s due to configured ignore pattern",
+                sender,
+                room_id,
+            )
+            return
+        if not await self._is_allowed_matrix_room_event(room_id):
+            logger.info(
+                "Matrix: ignoring message from unauthorized room %s",
+                room_id,
+            )
+            return
 
         # Deduplicate by event ID.
         event_id = str(getattr(event, "event_id", ""))
@@ -1607,12 +2387,7 @@ class MatrixAdapter(BasePlatformAdapter):
             return
 
         # Startup grace: ignore old messages from initial sync.
-        raw_ts = (
-            getattr(event, "timestamp", None)
-            or getattr(event, "server_timestamp", None)
-            or 0
-        )
-        event_ts = raw_ts / 1000.0 if raw_ts else 0.0
+        event_ts = _matrix_event_timestamp_seconds(event)
         if event_ts and event_ts < self._startup_ts - _STARTUP_GRACE_SECONDS:
             # If we are well past startup but events are still being dropped
             # by the grace check, the host clock is probably set ahead of
@@ -1688,7 +2463,7 @@ class MatrixAdapter(BasePlatformAdapter):
 
         # Ignore m.notice to prevent bot-to-bot loops (m.notice is the
         # conventional msgtype for bot responses in the Matrix ecosystem).
-        if msgtype == "m.notice":
+        if msgtype == "m.notice" and not self._process_notices:
             return
 
         # Dispatch by msgtype.
@@ -1697,7 +2472,7 @@ class MatrixAdapter(BasePlatformAdapter):
             await self._handle_media_message(
                 room_id, sender, event_id, event_ts, source_content, relates_to, msgtype
             )
-        elif msgtype == "m.text":
+        elif msgtype in ("m.text", "m.notice"):
             await self._handle_text_message(
                 room_id, sender, event_id, event_ts, source_content, relates_to
             )
@@ -1716,6 +2491,7 @@ class MatrixAdapter(BasePlatformAdapter):
         Returns (body, is_dm, chat_type, thread_id, display_name, source)
         or None if the message should be dropped (mention gating).
         """
+        identity = await self._resolve_room_identity(room_id)
         is_dm = await self._is_dm_room(room_id)
         chat_type = "dm" if is_dm else "group"
 
@@ -1747,8 +2523,9 @@ class MatrixAdapter(BasePlatformAdapter):
 
             is_free_room = room_id in self._free_rooms
             in_bot_thread = bool(thread_id and thread_id in self._threads)
+            is_command = body.startswith("/")
             if self._require_mention and not is_free_room and not in_bot_thread:
-                if not is_mentioned:
+                if not is_mentioned and not is_command:
                     logger.debug(
                         "Matrix: ignoring message %s in %s — no @mention "
                         "(set MATRIX_REQUIRE_MENTION=false to disable)",
@@ -1781,18 +2558,34 @@ class MatrixAdapter(BasePlatformAdapter):
         if is_mentioned and self._require_mention:
             body = self._strip_mention(body)
 
-        # Auto-thread.
-        if not thread_id and ((not is_dm and self._auto_thread) or (is_dm and self._dm_auto_thread)):
-            thread_id = event_id
-            self._threads.mark(thread_id)
+        # Auto-thread/session-scope policy. Real Matrix thread roots are
+        # preserved above; synthetic thread roots are policy-driven.
+        if not thread_id:
+            if is_dm:
+                if self._dm_auto_thread:
+                    thread_id = event_id
+                    self._threads.mark(thread_id)
+            elif self._matrix_session_scope == "room":
+                thread_id = None
+            elif self._matrix_session_scope == "thread":
+                thread_id = event_id
+                self._threads.mark(thread_id)
+            elif self._auto_thread:
+                thread_id = event_id
+                self._threads.mark(thread_id)
 
         display_name = await self._get_display_name(room_id, sender)
         source = self.build_source(
             chat_id=room_id,
+            chat_name=identity.display_name,
             chat_type=chat_type,
             user_id=sender,
             user_name=display_name,
             thread_id=thread_id,
+            chat_topic=identity.room_topic,
+            guild_id=identity.server_name,
+            parent_chat_id=room_id if thread_id else None,
+            message_id=event_id,
         )
 
         if thread_id:
@@ -1815,6 +2608,7 @@ class MatrixAdapter(BasePlatformAdapter):
         body = source_content.get("body", "") or ""
         if not body:
             return
+        body = _normalize_matrix_bang_command(body)
 
         ctx = await self._resolve_message_context(
             room_id,
@@ -1850,8 +2644,13 @@ class MatrixAdapter(BasePlatformAdapter):
                 stripped.append(line)
             body = "\n".join(stripped) if stripped else body
 
+        # Re-run bang normalization after reply-fallback stripping so a quoted
+        # reply whose actual content is a bang command (e.g. ``> quoted\n\n!model``)
+        # is treated as a command, matching how ``/command`` is recognized below.
+        body = _normalize_matrix_bang_command(body)
+
         msg_type = MessageType.TEXT
-        if body.startswith(("!", "/")):
+        if body.startswith("/"):
             msg_type = MessageType.COMMAND
 
         msg_event = MessageEvent(
@@ -1881,6 +2680,12 @@ class MatrixAdapter(BasePlatformAdapter):
         """Process a media message event (image, audio, video, file)."""
         body = source_content.get("body", "") or ""
         url = source_content.get("url", "")
+        if url and not str(url).startswith("mxc://"):
+            logger.warning(
+                "[Matrix] Rejecting inbound media %s with non-MXC URL",
+                event_id,
+            )
+            return
 
         # Convert mxc:// to HTTP URL for downstream processing.
         http_url = ""
@@ -1892,11 +2697,30 @@ class MatrixAdapter(BasePlatformAdapter):
         if not isinstance(content_info, dict):
             content_info = {}
         event_mimetype = content_info.get("mimetype", "")
+        event_size = content_info.get("size")
+        try:
+            event_size_int = int(event_size) if event_size is not None else 0
+        except (TypeError, ValueError):
+            event_size_int = 0
+        if event_size_int and event_size_int > self._max_media_bytes:
+            logger.warning(
+                "[Matrix] Rejecting oversized inbound media %s (%d > %d bytes)",
+                event_id,
+                event_size_int,
+                self._max_media_bytes,
+            )
+            return
 
         # For encrypted media, the URL may be in file.url.
         file_content = source_content.get("file", {})
         if not url and isinstance(file_content, dict):
             url = file_content.get("url", "") or ""
+            if url and not str(url).startswith("mxc://"):
+                logger.warning(
+                    "[Matrix] Rejecting inbound encrypted media %s with non-MXC URL",
+                    event_id,
+                )
+                return
             if url and url.startswith("mxc://"):
                 http_url = self._mxc_to_http(url)
 
@@ -2067,6 +2891,8 @@ class MatrixAdapter(BasePlatformAdapter):
         try:
             await self._client.join_room(RoomID(room_id))
             self._joined_rooms.add(room_id)
+            self._room_identities.pop(room_id, None)
+            self._room_identity_cached_at.pop(room_id, None)
             logger.info("Matrix: joined %s", room_id)
             await self._refresh_dm_cache()
             return True
@@ -2236,15 +3062,20 @@ class MatrixAdapter(BasePlatformAdapter):
             if prompt and not prompt.resolved:
                 if room_id != prompt.chat_id:
                     return
-                _allow_all = os.getenv("GATEWAY_ALLOW_ALL_USERS", "").lower() in {"true", "1", "yes"}
-                if not _allow_all and not (self._allowed_user_ids and sender in self._allowed_user_ids):
-                    logger.info(
-                        "Matrix: ignoring approval reaction from unauthorized user %s on %s",
-                        sender, reacts_to,
-                    )
+                if self._matrix_prompt_expired(prompt):
+                    await self._expire_matrix_approval_prompt(room_id, reacts_to, prompt)
+                    return
+                if not await self._validate_matrix_prompt_reactor(
+                    room_id, reacts_to, sender, prompt, "approval"
+                ):
                     return
                 choice = self._approval_reaction_map.get(key)
                 if not choice:
+                    await self._send_invalid_reaction_feedback(
+                        room_id,
+                        reacts_to,
+                        "That reaction is not valid for this approval prompt.",
+                    )
                     return
                 try:
                     from tools.approval import resolve_gateway_approval
@@ -2263,17 +3094,157 @@ class MatrixAdapter(BasePlatformAdapter):
                         await self._redact_bot_approval_reactions(room_id, prompt)
                 except Exception as exc:
                     logger.error("Failed to resolve gateway approval from Matrix reaction: %s", exc)
+                return
+
+            model_prompt = self._model_picker_prompts_by_event.get(reacts_to)
+            if model_prompt and not model_prompt.resolved:
+                if room_id != model_prompt.chat_id:
+                    return
+                if self._matrix_prompt_expired(model_prompt):
+                    await self._expire_matrix_model_picker_prompt(room_id, reacts_to, model_prompt)
+                    return
+                if not await self._validate_matrix_prompt_reactor(
+                    room_id, reacts_to, sender, model_prompt, "model picker"
+                ):
+                    return
+                selection = model_prompt.choices.get(key)
+                if not selection:
+                    await self._send_invalid_reaction_feedback(
+                        room_id,
+                        reacts_to,
+                        "That reaction is not one of the available model choices.",
+                    )
+                    return
+                model_prompt.resolved = True
+                self._model_picker_prompts_by_event.pop(reacts_to, None)
+                model_id, provider_slug = selection
+                try:
+                    confirmation = await model_prompt.on_model_selected(
+                        room_id, model_id, provider_slug
+                    )
+                    await self._redact_bot_model_picker_reactions(room_id, model_prompt)
+                    if confirmation:
+                        await self.send(room_id, confirmation, reply_to=reacts_to)
+                except Exception as exc:
+                    logger.error("Failed to switch model from Matrix reaction: %s", exc)
+                    await self.send(
+                        room_id,
+                        f"Failed to switch model: {exc}",
+                        reply_to=reacts_to,
+                    )
+                return
+
+    def _matrix_prompt_expired(self, prompt: Any) -> bool:
+        expires_at = getattr(prompt, "expires_at", None)
+        return expires_at is not None and time.monotonic() > float(expires_at)
+
+    async def _validate_matrix_prompt_reactor(
+        self,
+        room_id: str,
+        target_event_id: str,
+        sender: str,
+        prompt: Any,
+        prompt_label: str,
+    ) -> bool:
+        allow_all = os.getenv("GATEWAY_ALLOW_ALL_USERS", "").lower() in {
+            "true",
+            "1",
+            "yes",
+        }
+        if not allow_all and not (
+            self._allowed_user_ids and sender in self._allowed_user_ids
+        ):
+            logger.info(
+                "Matrix: ignoring %s reaction from unauthorized user %s on %s",
+                prompt_label, sender, target_event_id,
+            )
+            await self._send_invalid_reaction_feedback(
+                room_id,
+                target_event_id,
+                "Only an authorized Matrix user can use these controls.",
+            )
+            return False
+
+        requester = getattr(prompt, "requester_user_id", None)
+        approval_require_sender = getattr(self, "_approval_require_sender", True)
+        if approval_require_sender and requester and sender != requester:
+            logger.info(
+                "Matrix: ignoring %s reaction from %s; requester is %s",
+                prompt_label, sender, requester,
+            )
+            await self._send_invalid_reaction_feedback(
+                room_id,
+                target_event_id,
+                "Only the user who requested this action can use these controls.",
+            )
+            return False
+        return True
+
+    async def _send_invalid_reaction_feedback(
+        self,
+        room_id: str,
+        target_event_id: str,
+        text: str,
+    ) -> None:
+        try:
+            await self.send(room_id, text, reply_to=target_event_id)
+        except Exception as exc:
+            logger.debug("Matrix: failed to send invalid reaction feedback: %s", exc)
+
+    async def _expire_matrix_approval_prompt(
+        self,
+        room_id: str,
+        target_event_id: str,
+        prompt: "_MatrixApprovalPrompt",
+    ) -> None:
+        prompt.resolved = True
+        self._approval_prompts_by_event.pop(target_event_id, None)
+        self._approval_prompt_by_session.pop(prompt.session_key, None)
+        await self._redact_bot_approval_reactions(room_id, prompt)
+        await self._send_invalid_reaction_feedback(
+            room_id,
+            target_event_id,
+            "This approval prompt has expired. Run the command again if you still want to approve it.",
+        )
+
+    async def _expire_matrix_model_picker_prompt(
+        self,
+        room_id: str,
+        target_event_id: str,
+        prompt: "_MatrixModelPickerPrompt",
+    ) -> None:
+        prompt.resolved = True
+        self._model_picker_prompts_by_event.pop(target_event_id, None)
+        await self._redact_bot_model_picker_reactions(room_id, prompt)
+        await self._send_invalid_reaction_feedback(
+            room_id,
+            target_event_id,
+            "This model picker has expired. Run `/model` again to choose a model.",
+        )
 
     async def _redact_bot_approval_reactions(
         self,
         room_id: str,
         prompt: "_MatrixApprovalPrompt",
     ) -> None:
-        """Redact the bot's seed ✅/❎ reactions, leaving only the user's reaction."""
+        """Redact the bot's seeded approval reactions, leaving only the user's reaction."""
         for emoji, evt_id in prompt.bot_reaction_events.items():
             self._schedule_reaction_redaction(room_id, evt_id, "approval resolved")
             logger.debug("Matrix: scheduled bot reaction redaction %s (%s)", emoji, evt_id)
 
+    async def _redact_bot_model_picker_reactions(
+        self,
+        room_id: str,
+        prompt: "_MatrixModelPickerPrompt",
+    ) -> None:
+        """Redact the bot's seeded model picker reactions."""
+        for emoji, evt_id in prompt.bot_reaction_events.items():
+            try:
+                await self.redact_message(room_id, evt_id, "model picker resolved")
+                logger.debug("Matrix: redacted model picker reaction %s (%s)", emoji, evt_id)
+            except Exception as exc:
+                logger.debug("Matrix: failed to redact model picker reaction %s: %s", emoji, exc)
+
     # ------------------------------------------------------------------
     # Text message aggregation (handles Matrix client-side splits)
     # ------------------------------------------------------------------
@@ -2422,6 +3393,13 @@ class MatrixAdapter(BasePlatformAdapter):
         """Create a new Matrix room."""
         if not self._client:
             return None
+        if preset == "public_chat" and os.getenv("MATRIX_ALLOW_PUBLIC_ROOMS", "").lower() not in (
+            "true",
+            "1",
+            "yes",
+        ):
+            logger.warning("Matrix: refusing to create public room without MATRIX_ALLOW_PUBLIC_ROOMS=true")
+            return None
         try:
             preset_enum = {
                 "private_chat": RoomCreatePreset.PRIVATE,
@@ -2456,6 +3434,63 @@ class MatrixAdapter(BasePlatformAdapter):
             logger.warning("Matrix: invite error: %s", exc)
             return False
 
+    async def fetch_history(
+        self,
+        room_id: str,
+        limit: int = 20,
+        from_token: str = "",
+    ) -> list[dict[str, Any]]:
+        """Fetch recent Matrix room history using the live client."""
+        if not self._client:
+            return []
+        limit = max(1, min(int(limit or 20), 100))
+        try:
+            direction = getattr(PaginationDirection, "BACKWARD", "b")
+            if hasattr(self._client, "messages"):
+                response = await self._client.messages(
+                    RoomID(room_id),
+                    from_token=SyncToken(from_token) if from_token else None,
+                    direction=direction,
+                    limit=limit,
+                )
+            elif hasattr(self._client, "get_messages"):
+                response = await self._client.get_messages(
+                    RoomID(room_id),
+                    start=SyncToken(from_token) if from_token else None,
+                    direction=direction,
+                    limit=limit,
+                )
+            else:
+                logger.debug("Matrix: client has no messages/get_messages method")
+                return []
+            chunk = getattr(response, "chunk", None)
+            if chunk is None and isinstance(response, dict):
+                chunk = response.get("chunk")
+            return [self._serialize_history_event(evt) for evt in (chunk or [])]
+        except Exception as exc:
+            logger.warning("Matrix: fetch history error: %s", exc)
+            return []
+
+    def _serialize_history_event(self, event: Any) -> dict[str, Any]:
+        content = getattr(event, "content", None)
+        if content is None and isinstance(event, dict):
+            content = event.get("content", {})
+        if not isinstance(content, dict):
+            content = dict(content) if hasattr(content, "items") else {}
+        return {
+            "event_id": str(
+                getattr(event, "event_id", "")
+                or (event.get("event_id", "") if isinstance(event, dict) else "")
+            ),
+            "sender": str(
+                getattr(event, "sender", "")
+                or (event.get("sender", "") if isinstance(event, dict) else "")
+            ),
+            "timestamp": _matrix_event_timestamp_seconds(event),
+            "msgtype": str(content.get("msgtype", "")),
+            "body": str(content.get("body", "")),
+        }
+
     # ------------------------------------------------------------------
     # Presence
     # ------------------------------------------------------------------
@@ -2515,22 +3550,152 @@ class MatrixAdapter(BasePlatformAdapter):
     # Helpers
     # ------------------------------------------------------------------
 
-    async def _is_dm_room(self, room_id: str) -> bool:
-        """Check if a room is a DM."""
-        if self._dm_rooms.get(room_id, False):
-            return True
-        # Fallback: check member count via state store.
+    @staticmethod
+    def _state_event_value(event: Any, key: str) -> Optional[str]:
+        """Extract a simple value from a Matrix state event object or dict."""
+        if event is None:
+            return None
+        value = getattr(event, key, None)
+        if value:
+            return str(value)
+        if isinstance(event, dict):
+            if event.get(key):
+                return str(event[key])
+            content = event.get("content")
+            if isinstance(content, dict) and content.get(key):
+                return str(content[key])
+        content = getattr(event, "content", None)
+        if isinstance(content, dict) and content.get(key):
+            return str(content[key])
+        if content is not None and getattr(content, key, None):
+            return str(getattr(content, key))
+        return None
+
+    async def _get_room_member_count(self, room_id: str) -> Optional[int]:
         state_store = (
             getattr(self._client, "state_store", None) if self._client else None
         )
-        if state_store:
-            try:
-                members = await state_store.get_members(room_id)
-                if members and len(members) == 2:
-                    return True
-            except Exception:
-                pass
-        return False
+        if not state_store:
+            return None
+        try:
+            members = await state_store.get_members(room_id)
+        except Exception:
+            return None
+        if members is None:
+            return None
+        try:
+            return len(members)
+        except TypeError:
+            return None
+
+    async def _get_room_name(self, room_id: str) -> Optional[str]:
+        if not self._client or not hasattr(self._client, "get_state_event"):
+            return None
+        try:
+            event = await self._client.get_state_event(
+                RoomID(room_id),
+                "m.room.name",
+            )
+        except Exception:
+            return None
+        value = self._state_event_value(event, "name")
+        return value.strip() if value and value.strip() else None
+
+    async def _get_room_canonical_alias(self, room_id: str) -> Optional[str]:
+        if not self._client or not hasattr(self._client, "get_state_event"):
+            return None
+        try:
+            event = await self._client.get_state_event(
+                RoomID(room_id),
+                "m.room.canonical_alias",
+            )
+        except Exception:
+            return None
+        value = self._state_event_value(event, "alias")
+        return value.strip() if value and value.strip() else None
+
+    async def _get_room_topic(self, room_id: str) -> Optional[str]:
+        if not self._client or not hasattr(self._client, "get_state_event"):
+            return None
+        try:
+            event = await self._client.get_state_event(
+                RoomID(room_id),
+                "m.room.topic",
+            )
+        except Exception:
+            return None
+        value = self._state_event_value(event, "topic")
+        return value.strip() if value and value.strip() else None
+
+    @staticmethod
+    def _room_server_name(room_id: str) -> Optional[str]:
+        if ":" not in room_id:
+            return None
+        server = room_id.rsplit(":", 1)[-1].strip()
+        return server or None
+
+    def _cache_room_identity(self, room_id: str, identity: MatrixRoomIdentity) -> None:
+        if len(self._room_identities) >= self._room_identity_cache_max:
+            oldest = min(
+                self._room_identity_cached_at,
+                key=self._room_identity_cached_at.get,
+                default=None,
+            )
+            if oldest:
+                self._room_identities.pop(oldest, None)
+                self._room_identity_cached_at.pop(oldest, None)
+        self._room_identities[room_id] = identity
+        self._room_identity_cached_at[room_id] = time.monotonic()
+
+    async def _resolve_room_identity(
+        self,
+        room_id: str,
+        *,
+        force_refresh: bool = False,
+    ) -> MatrixRoomIdentity:
+        """Resolve Matrix room identity without member-count DM heuristics.
+
+        Matrix ``m.direct`` account data is the authoritative DM signal, but
+        explicitly named rooms win over stale/conflicting DM account data.
+        """
+        cached = self._room_identities.get(room_id)
+        cached_at = self._room_identity_cached_at.get(room_id, 0.0)
+        cache_fresh = (
+            self._room_identity_ttl_seconds <= 0
+            or time.monotonic() - cached_at <= self._room_identity_ttl_seconds
+        )
+        if cached is not None and cache_fresh and not force_refresh:
+            return cached
+
+        room_name = await self._get_room_name(room_id)
+        room_topic = await self._get_room_topic(room_id)
+        canonical_alias = await self._get_room_canonical_alias(room_id)
+        member_count = await self._get_room_member_count(room_id)
+        has_explicit_name = bool(room_name)
+        is_direct = bool(self._dm_rooms.get(room_id, False))
+        conflict = bool(is_direct and has_explicit_name)
+        chat_type = "dm" if is_direct and not has_explicit_name else "room"
+        display_name = room_name or canonical_alias or room_id
+
+        identity = MatrixRoomIdentity(
+            room_id=room_id,
+            room_name=room_name,
+            room_topic=room_topic,
+            canonical_alias=canonical_alias,
+            server_name=self._room_server_name(room_id),
+            joined_member_count=member_count,
+            is_direct_account_data=is_direct,
+            display_name=display_name,
+            has_explicit_name=has_explicit_name,
+            chat_type=chat_type,
+            conflict=conflict,
+        )
+        self._cache_room_identity(room_id, identity)
+        return identity
+
+    async def _is_dm_room(self, room_id: str) -> bool:
+        """Check if a room is a DM."""
+        return (await self._resolve_room_identity(room_id)).chat_type == "dm"
 
     async def _refresh_dm_cache(self) -> None:
         """Refresh the DM room cache from m.direct account data."""
@@ -2554,9 +3719,11 @@ class MatrixAdapter(BasePlatformAdapter):
         dm_room_ids: Set[str] = set()
         for user_id, rooms in dm_data.items():
             if isinstance(rooms, list):
-                dm_room_ids.update(str(r) for r in rooms)
+                dm_room_ids.update(str(r) for r in rooms if isinstance(r, str))
 
         self._dm_rooms = {rid: (rid in dm_room_ids) for rid in self._joined_rooms}
+        self._room_identities.clear()
+        self._room_identity_cached_at.clear()
 
     # ------------------------------------------------------------------
     # Mention detection helpers
@@ -2566,8 +3733,11 @@ class MatrixAdapter(BasePlatformAdapter):
         """Build Matrix text content with HTML and outbound mention metadata."""
         msg_content: Dict[str, Any] = {"msgtype": msgtype, "body": text}
         mention_user_ids = self._extract_outbound_mentions(text)
+        room_mentioned = self._allow_room_mentions and self._has_outbound_room_mention(text)
         if mention_user_ids:
             msg_content["m.mentions"] = {"user_ids": mention_user_ids}
+        if room_mentioned:
+            msg_content.setdefault("m.mentions", {})["room"] = True
 
         html_source = self._inject_outbound_mention_links(text)
         html = self._markdown_to_html(html_source)
@@ -2577,6 +3747,31 @@ class MatrixAdapter(BasePlatformAdapter):
 
         return msg_content
 
+    def _apply_relation_metadata(
+        self,
+        msg_content: Dict[str, Any],
+        *,
+        reply_to: Optional[str] = None,
+        metadata: Optional[Dict[str, Any]] = None,
+    ) -> None:
+        """Apply Matrix reply/thread relation metadata to an outbound payload."""
+        thread_id = str((metadata or {}).get("thread_id") or "")
+        if reply_to:
+            msg_content["m.relates_to"] = {"m.in_reply_to": {"event_id": reply_to}}
+        if thread_id:
+            relates_to = msg_content.get("m.relates_to", {})
+            relates_to["rel_type"] = "m.thread"
+            relates_to["event_id"] = thread_id
+            relates_to["is_falling_back"] = True
+            # Matrix clients that do not render threads still use reply
+            # fallback. If no explicit reply target is available, fall back
+            # to the thread root.
+            relates_to.setdefault(
+                "m.in_reply_to",
+                {"event_id": reply_to or thread_id},
+            )
+            msg_content["m.relates_to"] = relates_to
+
     def _extract_outbound_mentions(self, text: str) -> list[str]:
         """Return unique Matrix user IDs mentioned in outbound text."""
         protected, _ = self._protect_outbound_mention_regions(text)
@@ -2589,6 +3784,11 @@ class MatrixAdapter(BasePlatformAdapter):
                 mentions.append(user_id)
         return mentions
 
+    def _has_outbound_room_mention(self, text: str) -> bool:
+        """Return True when outbound text contains @room outside protected spans."""
+        protected, _ = self._protect_outbound_mention_regions(text)
+        return bool(re.search(r"(?<![\w/])@room(?![\w:.-])", protected))
+
     def _inject_outbound_mention_links(self, text: str) -> str:
         """Wrap outbound Matrix mentions in markdown links outside code spans."""
         if not text:
@@ -2723,12 +3923,13 @@ class MatrixAdapter(BasePlatformAdapter):
     def _markdown_to_html(self, text: str) -> str:
         """Convert Markdown to Matrix-compatible HTML (org.matrix.custom.html).
 
-        Uses the ``markdown`` library when available (installed with the
-        ``matrix`` extra).  Falls back to a comprehensive regex converter
-        that handles fenced code blocks, inline code, headers, bold,
-        italic, strikethrough, links, blockquotes, lists, and horizontal
-        rules — everything the Matrix HTML spec allows.
+        Uses the ``markdown`` library (a core dependency) when available.
+        Falls back to a comprehensive regex converter that handles fenced
+        code blocks, inline code, headers, bold, italic, strikethrough,
+        links, blockquotes, lists, and horizontal rules — everything the
+        Matrix HTML spec allows.
         """
+        text = _pre_sanitize_matrix_markdown(text)
         try:
             import markdown as _md
 
@@ -2743,11 +3944,11 @@ class MatrixAdapter(BasePlatformAdapter):
 
             if html.count("<p>") == 1:
                 html = html.replace("<p>", "").replace("</p>", "")
-            return html
+            return _sanitize_matrix_html(html)
         except ImportError:
             pass
 
-        return self._markdown_to_html_fallback(text)
+        return _sanitize_matrix_html(self._markdown_to_html_fallback(text))
 
     # ------------------------------------------------------------------
     # Regex-based Markdown -> HTML (no extra dependencies)