mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-05-07 02:51:50 +00:00
fix(telegram): harden DM topic binding — persist through switch_session, rebind on /new
Follow-up on @EmelyanenkoK's feat: add Telegram DM topic-mode sessions. Three issues: 1. Split-brain session state. After get_or_create_session() returned a SessionEntry for a topic lane, the handler was mutating .session_id in place to the binding's target, but never persisting the switch through SessionStore. The sessions.json session_key → session_id map kept pointing at the lane's natural id; any reader that reloaded from disk saw the wrong id. Fixed by routing through SessionStore.switch_session(), which _save()s the mapping and ends the old session in SQLite like /resume does. 2. /new inside a topic was a one-message no-op. Reset created a new session but left the telegram_dm_topic_bindings row pointing at the old session_id, so the next message's binding lookup switched right back. Now _handle_reset_command rebinds the topic to the new session_id after reset. 3. is_telegram_session_linked_to_topic and list_unlinked_telegram_sessions_for_user both called apply_telegram_topic_migration() on read, contradicting the PR's own invariant that migration only runs on explicit /topic opt-in. They now tolerate missing topic tables and return empty/False. Also: _telegram_topic_mode_enabled() now only treats True as enabled (not any truthy return), so test fixtures with MagicMock session_db don't accidentally flip every DM into lobby mode — this was breaking 4 pre-existing test_status_command tests. Tests: - New regression: /new inside a topic must update the binding row (test_new_inside_telegram_topic_rewrites_binding_to_new_session). - _make_runner now stubs switch_session so existing restore tests still exercise the new code path. Validated end-to-end with real SessionDB + SessionStore: readers on fresh DB don't create topic tables; enable creates them; binding override persists across SessionStore restart; /new rebinds and the new id survives a restart. Co-authored-by: EmelyanenkoK <emelyanenko.kirill@gmail.com>
This commit is contained in:
parent
25065283b3
commit
a7683d04a9
4 changed files with 184 additions and 44 deletions
|
|
@ -100,6 +100,21 @@ def _make_runner(session_db=None):
|
|||
runner.session_store.rewrite_transcript = MagicMock()
|
||||
runner.session_store.update_session = MagicMock()
|
||||
runner.session_store.reset_session = MagicMock(return_value=None)
|
||||
|
||||
# Default switch_session impl: returns a SessionEntry carrying the target
|
||||
# session_id. Mirrors SessionStore.switch_session semantics for tests that
|
||||
# exercise Telegram topic binding rebinds without a real store.
|
||||
def _switch_session(session_key, target_session_id):
|
||||
return SessionEntry(
|
||||
session_key=session_key,
|
||||
session_id=target_session_id,
|
||||
created_at=datetime.now(),
|
||||
updated_at=datetime.now(),
|
||||
platform=Platform.TELEGRAM,
|
||||
chat_type="dm",
|
||||
origin=None,
|
||||
)
|
||||
runner.session_store.switch_session = MagicMock(side_effect=_switch_session)
|
||||
runner._running_agents = {}
|
||||
runner._running_agents_ts = {}
|
||||
runner._pending_messages = {}
|
||||
|
|
@ -366,6 +381,68 @@ async def test_new_inside_telegram_topic_resets_current_topic_with_parallel_tip(
|
|||
runner.session_store.reset_session.assert_called_once_with(topic_key)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_new_inside_telegram_topic_rewrites_binding_to_new_session(tmp_path, monkeypatch):
|
||||
"""Regression: /new inside a topic must rewrite the binding table.
|
||||
|
||||
Previously /new reset the SessionStore entry but the
|
||||
telegram_dm_topic_bindings row still pointed at the old session_id;
|
||||
the next inbound message would look up the stale binding and switch
|
||||
back to the old session, making /new a no-op.
|
||||
"""
|
||||
import gateway.run as gateway_run
|
||||
|
||||
session_db = SessionDB(db_path=tmp_path / "state.db")
|
||||
session_db.enable_telegram_topic_mode(chat_id="208214988", user_id="208214988")
|
||||
session_db.create_session(
|
||||
session_id="old-topic-session",
|
||||
source="telegram",
|
||||
user_id="208214988",
|
||||
)
|
||||
topic_source = _make_source(thread_id="17585")
|
||||
topic_key = build_session_key(topic_source)
|
||||
session_db.bind_telegram_topic(
|
||||
chat_id="208214988",
|
||||
thread_id="17585",
|
||||
user_id="208214988",
|
||||
session_key=topic_key,
|
||||
session_id="old-topic-session",
|
||||
)
|
||||
|
||||
runner = _make_runner(session_db=session_db)
|
||||
new_entry = SessionEntry(
|
||||
session_key=topic_key,
|
||||
session_id="new-topic-session",
|
||||
created_at=datetime.now(),
|
||||
updated_at=datetime.now(),
|
||||
platform=Platform.TELEGRAM,
|
||||
chat_type="dm",
|
||||
origin=topic_source,
|
||||
)
|
||||
# Mirror SessionStore.reset_session: in production it calls
|
||||
# SessionDB.create_session() for the new id before returning, so the
|
||||
# bindings FK can reference it.
|
||||
session_db.create_session(
|
||||
session_id="new-topic-session",
|
||||
source="telegram",
|
||||
user_id="208214988",
|
||||
)
|
||||
runner.session_store.reset_session.return_value = new_entry
|
||||
runner._agent_cache_lock = None
|
||||
|
||||
monkeypatch.setattr(
|
||||
gateway_run, "_resolve_runtime_agent_kwargs", lambda: {"api_key": "***"}
|
||||
)
|
||||
|
||||
await runner._handle_message(_make_event("/new", thread_id="17585"))
|
||||
|
||||
binding = session_db.get_telegram_topic_binding(
|
||||
chat_id="208214988", thread_id="17585",
|
||||
)
|
||||
assert binding is not None
|
||||
assert binding["session_id"] == "new-topic-session"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_topic_root_command_explicitly_migrates_and_enables_topic_mode(tmp_path, monkeypatch):
|
||||
import gateway.run as gateway_run
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue