mirror of
https://github.com/nesquena/hermes-webui.git
synced 2026-07-07 16:21:23 +00:00
1bf2ef9f5e
* stage-3629: scope gateway watcher to active profile (profile-keyed registry), rebased onto master * stage-3629: + stop-race-safe subscribe() (Codex CORE) + regression test Codex caught a TOCTOU between get_watcher() and subscribe(): a watcher reaped as subscriber-free during a concurrent profile switch left a late subscriber's queue without the None sentinel -> SSE loop hangs open (keepalives, no events). Opus independently found the same race (rated follow-up). subscribe() now checks _stop_event under _sub_lock after appending and self-enqueues the sentinel. test_subscribe_after_stop_gets_sentinel_immediately pins it. * stage-3629: + reconnect gateway SSE to new profile on switch (Codex CORE #2) Second Codex finding: after a profile switch this tab's _gatewaySSE stayed subscribed to the PREVIOUS profile's watcher (switchToProfile never restarted it; the probe reattach is gated on !_gatewaySSE which is false while the old ES is open). switchToProfile() now calls startGatewaySSE() after S.activeProfile is set — it closes the old ES + reconnects with the new profile cookie, self-gating on _showCliSessions. * Release PF: scope gateway watcher to active profile (#2848) rodboev's #3629, re-pushed to fix both bounce findings (client SSE reconnect + singleton→profile-keyed registry). Two Codex CORE races caught + fixed inline: (1) stop/subscribe sentinel race, (2) tab's own SSE staying on the old profile after switch. Codex SAFE + Opus SHIP (architecture) + gateway-watcher tests green. Co-authored-by: rodboev <rodboev@users.noreply.github.com> --------- Co-authored-by: nesquena-hermes <agent@nesquena-hermes> Co-authored-by: rodboev <rodboev@users.noreply.github.com>
480 lines
21 KiB
Python
480 lines
21 KiB
Python
"""
|
|
Hermes Web UI -- Gateway session watcher.
|
|
|
|
Background daemon thread that polls state.db every 5 seconds for changes
|
|
to gateway sessions (telegram, discord, slack, etc.). When changes are
|
|
detected, it pushes notifications to all subscribed SSE clients.
|
|
|
|
This enables real-time session list updates in the sidebar without
|
|
requiring any changes to hermes-agent.
|
|
"""
|
|
import hashlib
|
|
import json
|
|
import logging
|
|
import os
|
|
import queue
|
|
import sqlite3
|
|
import threading
|
|
import time
|
|
from contextlib import closing
|
|
from pathlib import Path
|
|
|
|
from api.config import HOME
|
|
from api.agent_sessions import read_importable_agent_session_rows
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
# ── State hash tracking ─────────────────────────────────────────────────────
|
|
|
|
def _snapshot_hash(sessions: list) -> str:
|
|
"""Create a lightweight hash of session IDs and timestamps for change detection."""
|
|
key = '|'.join(
|
|
f"{s['session_id']}:{s.get('updated_at', 0)}:{s.get('message_count', 0)}"
|
|
for s in sorted(sessions, key=lambda x: x['session_id'])
|
|
)
|
|
return hashlib.md5(key.encode(), usedforsecurity=False).hexdigest()
|
|
|
|
|
|
# Sources excluded from the WebUI sidebar projection. Must match the default
|
|
# ``exclude_sources`` used by ``read_importable_agent_session_rows`` so the
|
|
# cheap change-detection scan below sees exactly the same row set as the
|
|
# expensive projection (otherwise cron message churn would defeat the gate).
|
|
_WATCHER_EXCLUDED_SOURCES = ("cron", "webui")
|
|
|
|
|
|
def _cheap_change_fingerprint(db_path: Path) -> str | None:
|
|
"""Compute a cheap change-detection fingerprint without the messages JOIN.
|
|
|
|
The expensive projection (``read_importable_agent_session_rows``) runs a CTE
|
|
plus a per-session ``MAX(messages.timestamp)`` aggregation over an oversampled
|
|
candidate set every poll. On a large ``state.db`` (hundreds of sessions, tens
|
|
of thousands of messages) that is ~10x the cost of a single ``sessions``-table
|
|
scan, and the watcher runs it forever on a 5s timer even when nothing changed
|
|
(issue #3506).
|
|
|
|
This computes a fingerprint from a ``sessions``-table-only scan (no messages
|
|
JOIN), scoped to the same non-cron/webui rows as the projection. To guarantee
|
|
it never skips a change the projection would reflect, it hashes **every
|
|
sessions-table column the projection reads or uses for visibility/collapse**
|
|
-- not just the columns surfaced to the sidebar. That matters because the
|
|
projection collapses compression lineage and hides/shows rows based on
|
|
``parent_session_id`` / ``ended_at`` / ``end_reason`` / ``source``, so a change
|
|
to one of those alters *which rows* appear even when no displayed field on a
|
|
given row moved.
|
|
|
|
The one projection input that does not live in the ``sessions`` table is the
|
|
per-session message aggregate (``COUNT`` / ``MAX(messages.timestamp)`` ->
|
|
``last_activity``). That is fully proxied by ``sessions.message_count``: the
|
|
agent's state layer bumps ``message_count`` on every appended message and
|
|
rewrites it to the absolute count on truncate/rewind/compaction, so a message
|
|
insert or delete (the only events that can move ``MAX(timestamp)``) always
|
|
changes ``message_count``. The fingerprint is therefore a strict superset of
|
|
the projection's change surface (it also fires on out-of-order inserts that
|
|
would not raise ``MAX(timestamp)``).
|
|
|
|
Returns the fingerprint string, or ``None`` on any error / a pre-source
|
|
schema so the caller falls back to running the expensive projection rather
|
|
than risk skipping a change.
|
|
"""
|
|
# Columns the projection reads from the ``sessions`` table. ``id``/``source``
|
|
# are always present (``source`` is required for the projection to run at
|
|
# all); the rest are optional on older agent schemas and filtered below.
|
|
_PROJECTION_SESSION_COLS = (
|
|
'id', 'source', 'session_source', 'title', 'model', 'message_count',
|
|
'started_at', 'ended_at', 'end_reason', 'parent_session_id', 'archived',
|
|
'user_id', 'chat_id', 'chat_type', 'thread_id', 'session_key',
|
|
'origin_chat_id', 'origin_user_id', 'platform',
|
|
)
|
|
try:
|
|
with closing(sqlite3.connect(str(db_path))) as conn:
|
|
cur = conn.cursor()
|
|
cur.execute("PRAGMA table_info(sessions)")
|
|
cols = {row[1] for row in cur.fetchall()}
|
|
if 'source' not in cols:
|
|
return None
|
|
selectable = [c for c in _PROJECTION_SESSION_COLS if c in cols]
|
|
placeholders = ", ".join("?" for _ in _WATCHER_EXCLUDED_SOURCES)
|
|
cur.execute(
|
|
f"SELECT {', '.join(selectable)} FROM sessions "
|
|
f"WHERE source IS NOT NULL AND source NOT IN ({placeholders}) "
|
|
f"ORDER BY id",
|
|
list(_WATCHER_EXCLUDED_SOURCES),
|
|
)
|
|
h = hashlib.md5(usedforsecurity=False)
|
|
for row in cur.fetchall():
|
|
h.update(repr(row).encode('utf-8', 'replace'))
|
|
h.update(b'\x1e')
|
|
# A same-count transcript rewrite (SessionDB.replace_messages used by
|
|
# /retry, /undo, /compress) deletes + reinserts messages with new
|
|
# timestamps but can leave sessions.message_count unchanged — so the
|
|
# sessions-only scan above would miss it and the watcher would skip a
|
|
# projection whose last_activity (MAX(messages.timestamp)) actually
|
|
# moved. Fold in a PER-SESSION message aggregate, scoped to the same
|
|
# non-excluded sessions as the projection. It must be per-session
|
|
# (grouped), NOT a single global MAX: rewriting an OLDER, non-newest
|
|
# session moves that session's last_activity but not the global max,
|
|
# so a global aggregate would still miss it (#3536 review round 2).
|
|
# cron/webui churn is excluded by the JOIN filter so it still does
|
|
# NOT trigger a re-projection. This is one GROUP BY over the already-
|
|
# filtered set — far cheaper than the projection's oversampled
|
|
# correlated CTE — so it preserves the cheap-fingerprint property.
|
|
if 'messages' in {r[0] for r in conn.execute(
|
|
"SELECT name FROM sqlite_master WHERE type='table'").fetchall()}:
|
|
try:
|
|
msg_rows = conn.execute(
|
|
"SELECT s.id, COUNT(m.id), "
|
|
"COUNT(CASE WHEN LOWER(m.role) = 'user' THEN 1 END), "
|
|
"COALESCE(MAX(m.timestamp), 0) "
|
|
"FROM sessions s LEFT JOIN messages m ON m.session_id = s.id "
|
|
f"WHERE s.source IS NOT NULL AND s.source NOT IN ({placeholders}) "
|
|
"GROUP BY s.id ORDER BY s.id",
|
|
list(_WATCHER_EXCLUDED_SOURCES),
|
|
).fetchall()
|
|
for mrow in msg_rows:
|
|
h.update(repr(mrow).encode('utf-8', 'replace'))
|
|
h.update(b'\x1e')
|
|
except sqlite3.Error:
|
|
# messages table shape unknown → don't trust the fingerprint;
|
|
# signal the caller to run the full projection.
|
|
return None
|
|
return h.hexdigest()
|
|
except Exception:
|
|
return None
|
|
|
|
|
|
# ── DB resolution (shared pattern with state_sync.py) ──────────────────────
|
|
|
|
def _get_state_db_path(hermes_home: Path | None = None) -> Path:
|
|
"""Resolve state.db path for the active profile."""
|
|
if hermes_home is not None:
|
|
return Path(hermes_home).expanduser().resolve() / 'state.db'
|
|
try:
|
|
from api.profiles import get_active_hermes_home
|
|
hermes_home = Path(get_active_hermes_home()).expanduser().resolve()
|
|
except Exception:
|
|
hermes_home = Path(os.getenv('HERMES_HOME', str(HOME / '.hermes'))).expanduser().resolve()
|
|
return hermes_home / 'state.db'
|
|
|
|
|
|
def _get_agent_sessions_from_db(db_path: Path | None = None) -> list:
|
|
"""Read all non-webui sessions from state.db.
|
|
Returns list of session dicts, or empty list on any error.
|
|
"""
|
|
db_path = Path(db_path) if db_path is not None else _get_state_db_path()
|
|
if not db_path.exists():
|
|
return []
|
|
|
|
try:
|
|
sessions = []
|
|
for row in read_importable_agent_session_rows(db_path, limit=200, log=logger):
|
|
sessions.append({
|
|
'session_id': row['id'],
|
|
'title': row['title'] or 'Agent Session',
|
|
'model': row['model'] or None,
|
|
'message_count': row['message_count'] or row['actual_message_count'] or 0,
|
|
'created_at': row['started_at'],
|
|
'updated_at': row['last_activity'] or row['started_at'],
|
|
'source': row['source'] or 'cli',
|
|
'raw_source': row.get('raw_source'),
|
|
'session_source': row.get('session_source'),
|
|
'source_label': row.get('source_label'),
|
|
})
|
|
return sessions
|
|
except Exception:
|
|
return []
|
|
|
|
|
|
# ── GatewayWatcher ──────────────────────────────────────────────────────────
|
|
|
|
class GatewayWatcher:
|
|
"""Background thread that polls state.db for agent session changes.
|
|
|
|
Usage:
|
|
watcher = GatewayWatcher()
|
|
watcher.start()
|
|
q = watcher.subscribe()
|
|
# ... receive change events via q.get() ...
|
|
watcher.unsubscribe(q)
|
|
watcher.stop()
|
|
"""
|
|
|
|
POLL_INTERVAL = 5 # seconds between polls
|
|
SUBSCRIBER_TIMEOUT = 30 # seconds before sending keepalive comment
|
|
|
|
def __init__(
|
|
self,
|
|
*,
|
|
hermes_home: Path | None = None,
|
|
profile_name: str | None = None,
|
|
state_db_path: Path | None = None,
|
|
):
|
|
self._subscribers: list[queue.Queue] = []
|
|
self._sub_lock = threading.Lock()
|
|
self._stop_event = threading.Event()
|
|
self._thread: threading.Thread | None = None
|
|
self._hermes_home = Path(hermes_home).expanduser().resolve() if hermes_home else None
|
|
self._state_db_path = (
|
|
Path(state_db_path).expanduser().resolve()
|
|
if state_db_path is not None
|
|
else _get_state_db_path(self._hermes_home) if self._hermes_home is not None else _get_state_db_path()
|
|
)
|
|
self.profile_name = profile_name or ""
|
|
self._last_hash: str = ''
|
|
self._last_sessions: list = []
|
|
# Cheap sessions-only fingerprint from the previous poll. When it is
|
|
# unchanged we skip the expensive messages-JOIN projection entirely
|
|
# (issue #3506). Empty string forces the first poll to run the full read.
|
|
self._last_cheap_fp: str = ''
|
|
|
|
def start(self):
|
|
"""Start the watcher daemon thread."""
|
|
if self._thread and self._thread.is_alive():
|
|
return
|
|
self._stop_event.clear()
|
|
self._thread = threading.Thread(target=self._poll_loop, daemon=True, name='gateway-watcher')
|
|
self._thread.start()
|
|
|
|
def is_alive(self) -> bool:
|
|
"""Return True when the poll thread is running.
|
|
|
|
Public accessor used by ``/api/sessions/gateway/stream`` probe mode and
|
|
the live SSE handler to detect a watcher instance whose poll thread
|
|
died silently (e.g. uncaught exception in ``_poll_loop``). Callers
|
|
use this to decide whether to return 503 and trigger the client-side
|
|
polling fallback, instead of handing out an SSE connection that would
|
|
never emit events.
|
|
"""
|
|
t = self._thread
|
|
return t is not None and t.is_alive()
|
|
|
|
def stop(self):
|
|
"""Stop the watcher thread."""
|
|
self._stop_event.set()
|
|
# Wake up any subscribers
|
|
with self._sub_lock:
|
|
for q in self._subscribers:
|
|
try:
|
|
q.put(None) # sentinel
|
|
except Exception:
|
|
logger.debug("Failed to send sentinel to subscriber")
|
|
if self._thread:
|
|
self._thread.join(timeout=3)
|
|
self._thread = None
|
|
|
|
def subscribe(self) -> queue.Queue:
|
|
"""Subscribe to change events. Returns a queue.Queue.
|
|
Events are dicts: {'type': 'sessions_changed', 'sessions': [...]}
|
|
A None sentinel means the watcher is stopping.
|
|
"""
|
|
q = queue.Queue(maxsize=10)
|
|
with self._sub_lock:
|
|
self._subscribers.append(q)
|
|
# Stop-race safety: if stop() already ran (set _stop_event and drained
|
|
# the then-current subscriber list) before we appended, this queue would
|
|
# never receive the sentinel and the SSE loop would hang open with
|
|
# keepalives but no events. Enqueue the sentinel ourselves so the handler
|
|
# closes and reconnects to the live registry watcher. (#3629 / Codex gate)
|
|
if self._stop_event.is_set():
|
|
try:
|
|
q.put_nowait(None)
|
|
except Exception:
|
|
logger.debug("Failed to send stop sentinel to late subscriber")
|
|
return q
|
|
|
|
def unsubscribe(self, q: queue.Queue):
|
|
"""Remove a subscriber queue."""
|
|
with self._sub_lock:
|
|
try:
|
|
self._subscribers.remove(q)
|
|
except ValueError:
|
|
pass
|
|
|
|
def _notify_subscribers(self, sessions: list):
|
|
"""Push change event to all subscribers."""
|
|
event = {
|
|
'type': 'sessions_changed',
|
|
'sessions': sessions,
|
|
}
|
|
with self._sub_lock:
|
|
dead = []
|
|
for q in self._subscribers:
|
|
try:
|
|
q.put_nowait(event)
|
|
except queue.Full:
|
|
dead.append(q) # remove slow consumers
|
|
except Exception:
|
|
dead.append(q)
|
|
for q in dead:
|
|
try:
|
|
self._subscribers.remove(q)
|
|
except ValueError:
|
|
pass
|
|
# Send a None sentinel so the SSE handler unblocks, closes,
|
|
# and lets the browser's EventSource auto-reconnect.
|
|
try:
|
|
q.put_nowait(None)
|
|
except Exception:
|
|
logger.debug("Failed to send sentinel to dead subscriber")
|
|
|
|
def _poll_loop(self):
|
|
"""Main polling loop. Runs in a daemon thread."""
|
|
while not self._stop_event.is_set():
|
|
try:
|
|
# Phase 1: cheap sessions-only fingerprint. The expensive
|
|
# messages-JOIN projection (_get_agent_sessions_from_db) only
|
|
# runs when this fingerprint actually changes, so an idle server
|
|
# with a large state.db stops re-aggregating tens of thousands
|
|
# of message rows every 5 seconds (issue #3506). A None
|
|
# fingerprint (error / unreadable db) forces the full read so we
|
|
# never silently skip a real change.
|
|
db_path = self._state_db_path
|
|
cheap_fp = _cheap_change_fingerprint(db_path) if db_path.exists() else ''
|
|
if cheap_fp is not None and cheap_fp == self._last_cheap_fp:
|
|
# Nothing changed in the sidebar-visible session set; skip
|
|
# the expensive projection and the notify entirely.
|
|
pass
|
|
else:
|
|
# Phase 2: only now pay for the full projection.
|
|
sessions = _get_agent_sessions_from_db(db_path)
|
|
current_hash = _snapshot_hash(sessions)
|
|
if cheap_fp is not None:
|
|
self._last_cheap_fp = cheap_fp
|
|
|
|
if current_hash != self._last_hash:
|
|
self._last_hash = current_hash
|
|
self._last_sessions = sessions
|
|
self._notify_subscribers(sessions)
|
|
except Exception:
|
|
logger.debug("Error in gateway watcher poll loop", exc_info=True)
|
|
|
|
# Sleep in small increments so we can stop promptly
|
|
for _ in range(self.POLL_INTERVAL * 10):
|
|
if self._stop_event.is_set():
|
|
return
|
|
time.sleep(0.1)
|
|
|
|
|
|
# ── Module-level watcher registry ──────────────────────────────────────────
|
|
|
|
_watchers: dict[str, GatewayWatcher] = {}
|
|
_watcher_lock = threading.Lock()
|
|
|
|
def _resolve_watcher_target(
|
|
*,
|
|
profile_name: str | None = None,
|
|
hermes_home: Path | None = None,
|
|
) -> tuple[str, Path | None]:
|
|
"""Resolve the watcher profile/home pair for the current request context."""
|
|
resolved_profile = str(profile_name or "").strip()
|
|
resolved_home = Path(hermes_home).expanduser().resolve() if hermes_home is not None else None
|
|
|
|
try:
|
|
from api.profiles import get_active_profile_name, get_hermes_home_for_profile
|
|
|
|
if not resolved_profile:
|
|
resolved_profile = get_active_profile_name() or "default"
|
|
if resolved_home is None and resolved_profile:
|
|
resolved_home = Path(get_hermes_home_for_profile(resolved_profile)).expanduser().resolve()
|
|
except Exception:
|
|
if resolved_home is None:
|
|
try:
|
|
resolved_home = _get_state_db_path().parent.resolve()
|
|
except Exception:
|
|
resolved_home = None
|
|
|
|
return resolved_profile, resolved_home
|
|
|
|
|
|
def _watcher_registry_key(profile_name: str | None = None, hermes_home: Path | None = None) -> str:
|
|
"""Return the stable registry key for a watcher target."""
|
|
if hermes_home is not None:
|
|
return str(Path(hermes_home).expanduser().resolve())
|
|
return str(profile_name or "").strip() or "__default__"
|
|
|
|
|
|
def _watcher_has_subscribers(watcher: GatewayWatcher) -> bool:
|
|
subscribers = getattr(watcher, "_subscribers", None)
|
|
sub_lock = getattr(watcher, "_sub_lock", None)
|
|
if subscribers is None or sub_lock is None:
|
|
return False
|
|
with sub_lock:
|
|
return bool(subscribers)
|
|
|
|
|
|
def _pop_idle_watchers_locked(*, exclude_key: str) -> list[GatewayWatcher]:
|
|
stale: list[GatewayWatcher] = []
|
|
for key, watcher in list(_watchers.items()):
|
|
if key == exclude_key or _watcher_has_subscribers(watcher):
|
|
continue
|
|
if _watchers.get(key) is watcher:
|
|
stale.append(_watchers.pop(key))
|
|
return stale
|
|
|
|
|
|
def start_watcher(*, profile_name: str | None = None, hermes_home: Path | None = None):
|
|
"""Start the watcher for the resolved profile home (idempotent)."""
|
|
resolved_profile, resolved_home = _resolve_watcher_target(
|
|
profile_name=profile_name,
|
|
hermes_home=hermes_home,
|
|
)
|
|
key = _watcher_registry_key(resolved_profile, resolved_home)
|
|
with _watcher_lock:
|
|
watcher = _watchers.get(key)
|
|
if watcher is None or not watcher.is_alive():
|
|
if watcher is not None:
|
|
watcher.stop()
|
|
watcher = GatewayWatcher(profile_name=resolved_profile, hermes_home=resolved_home)
|
|
watcher.start()
|
|
_watchers[key] = watcher
|
|
return watcher
|
|
|
|
|
|
def stop_watcher(*, profile_name: str | None = None, hermes_home: Path | None = None):
|
|
"""Stop either one profile watcher or the entire registry."""
|
|
with _watcher_lock:
|
|
if profile_name is None and hermes_home is None:
|
|
watchers = list(_watchers.values())
|
|
_watchers.clear()
|
|
else:
|
|
resolved_profile, resolved_home = _resolve_watcher_target(
|
|
profile_name=profile_name,
|
|
hermes_home=hermes_home,
|
|
)
|
|
key = _watcher_registry_key(resolved_profile, resolved_home)
|
|
watcher = _watchers.pop(key, None)
|
|
watchers = [watcher] if watcher is not None else []
|
|
for watcher in watchers:
|
|
watcher.stop()
|
|
|
|
|
|
def restart_watcher_for_profile(name: str):
|
|
"""Restart only the watcher pinned to the target profile home."""
|
|
from api.profiles import get_hermes_home_for_profile
|
|
|
|
hermes_home = Path(get_hermes_home_for_profile(name)).expanduser().resolve()
|
|
key = _watcher_registry_key(name, hermes_home)
|
|
watcher = GatewayWatcher(profile_name=name, hermes_home=hermes_home)
|
|
watcher.start()
|
|
with _watcher_lock:
|
|
existing = _watchers.pop(key, None)
|
|
stale_watchers = [] if existing is not None else _pop_idle_watchers_locked(exclude_key=key)
|
|
_watchers[key] = watcher
|
|
for old_watcher in ([existing] if existing is not None else stale_watchers):
|
|
old_watcher.stop()
|
|
return watcher
|
|
|
|
|
|
def get_watcher(*, profile_name: str | None = None, hermes_home: Path | None = None) -> GatewayWatcher | None:
|
|
"""Get or lazily start the watcher for the resolved request profile."""
|
|
resolved_profile, resolved_home = _resolve_watcher_target(
|
|
profile_name=profile_name,
|
|
hermes_home=hermes_home,
|
|
)
|
|
key = _watcher_registry_key(resolved_profile, resolved_home)
|
|
with _watcher_lock:
|
|
watcher = _watchers.get(key)
|
|
if watcher is None or not watcher.is_alive():
|
|
watcher = start_watcher(profile_name=resolved_profile, hermes_home=resolved_home)
|
|
return watcher
|