mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-07-09 16:56:22 +08:00
d8bc4f242f
Deep review of the cherry-picked #16454 found the ad-hoc flush thread raced new_session()'s inline on_session_switch(reset=True): memory providers key off internal _session_id state (MemoryManager.on_session_end takes no session id), so a late off-thread extraction ran against post-rotation bindings — misattributing the old transcript to the new session id, double-ingesting the old turn buffer (supermemory), or double-committing (openviking already async-finalizes in on_session_switch). Redesign: new MemoryManager.commit_session_boundary_async queues on_session_end + on_session_switch as ONE task on the manager's existing single-worker background executor (the same worker sync_all already uses). This preserves the strict end→switch ordering providers depend on, serializes against per-turn syncs FIFO, keeps /new non-blocking, and degrades to inline (pre-#16454 behavior) when the executor is unavailable. No ad-hoc threads; no per-provider changes needed. The context-engine on_session_end half stays synchronous in _launch_session_boundary_memory_flush (cheap, must land before reset_session_state rebinds the engine). Exit durability: _run_cleanup calls the manager's existing flush_pending(timeout=10) barrier before shutdown, so '/new then quit' doesn't drop the queued extraction (shutdown_all's own drain is ~5s and cancels queued tasks). Bounded well inside the 30s exit watchdog. Tests: ordering invariant with slow (LLM-like) extraction, FIFO serialization vs sync_all, switch-fires-even-if-end-raises, no-provider no-op, CLI snapshot handoff + inline-switch fallback, sync engine boundary, cleanup flush_pending.
125 lines
4.4 KiB
Python
125 lines
4.4 KiB
Python
"""Tests for MemoryManager.commit_session_boundary_async.
|
|
|
|
The /new session boundary must deliver on_session_end (old-session
|
|
extraction) strictly BEFORE on_session_switch (provider rebinding to the
|
|
new session), without blocking the caller. Both hooks run as one task on
|
|
the manager's single serialized background worker.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import threading
|
|
import time
|
|
from typing import Any, Dict, List
|
|
|
|
from agent.memory_manager import MemoryManager
|
|
from agent.memory_provider import MemoryProvider
|
|
|
|
|
|
class _RecordingProvider(MemoryProvider):
|
|
"""Provider that records hook invocations with thread identity."""
|
|
|
|
def __init__(self, end_delay: float = 0.0):
|
|
self.calls: List[tuple] = []
|
|
self._end_delay = end_delay
|
|
self._caller_thread_ids: List[int] = []
|
|
|
|
# Required ABC surface (minimal no-ops)
|
|
@property
|
|
def name(self) -> str:
|
|
return "recorder"
|
|
|
|
def is_available(self) -> bool:
|
|
return True
|
|
|
|
def get_tool_schemas(self) -> List[Dict[str, Any]]:
|
|
return []
|
|
|
|
def initialize(self, agent: Any = None, **kwargs) -> bool: # type: ignore[override]
|
|
return True
|
|
|
|
def build_system_prompt(self) -> str: # type: ignore[override]
|
|
return ""
|
|
|
|
def sync_turn(self, user_content: str, assistant_content: str, **kwargs) -> None: # type: ignore[override]
|
|
self.calls.append(("sync_turn", kwargs.get("session_id", "")))
|
|
|
|
def on_session_end(self, messages: List[Dict[str, Any]]) -> None:
|
|
if self._end_delay:
|
|
time.sleep(self._end_delay)
|
|
self._caller_thread_ids.append(threading.get_ident())
|
|
self.calls.append(("end", list(messages)))
|
|
|
|
def on_session_switch(self, new_session_id: str, **kwargs) -> None:
|
|
self.calls.append(("switch", new_session_id, kwargs.get("reset")))
|
|
|
|
|
|
def _make_manager(provider: _RecordingProvider) -> MemoryManager:
|
|
mm = MemoryManager()
|
|
mm._providers.append(provider) # bypass add_provider validation for the stub
|
|
return mm
|
|
|
|
|
|
def test_boundary_commit_delivers_end_strictly_before_switch():
|
|
"""Even with a slow (LLM-like) extraction, switch waits for end."""
|
|
provider = _RecordingProvider(end_delay=0.15)
|
|
mm = _make_manager(provider)
|
|
|
|
msgs = [{"role": "user", "content": "old turn"}]
|
|
t0 = time.monotonic()
|
|
mm.commit_session_boundary_async(
|
|
msgs, new_session_id="new-sid", parent_session_id="old-sid"
|
|
)
|
|
# Caller returns immediately — the slow extraction must not block /new.
|
|
assert time.monotonic() - t0 < 0.1
|
|
|
|
assert mm.flush_pending(timeout=5)
|
|
|
|
kinds = [c[0] for c in provider.calls]
|
|
assert kinds == ["end", "switch"], f"ordering violated: {provider.calls}"
|
|
assert provider.calls[0] == ("end", msgs)
|
|
assert provider.calls[1] == ("switch", "new-sid", True)
|
|
# And it genuinely ran off the caller's thread.
|
|
assert provider._caller_thread_ids[0] != threading.get_ident()
|
|
|
|
|
|
def test_boundary_commit_serializes_against_turn_syncs():
|
|
"""The boundary task shares the single worker with sync_all — FIFO order
|
|
means a queued boundary can't interleave into a later turn's sync."""
|
|
provider = _RecordingProvider(end_delay=0.05)
|
|
mm = _make_manager(provider)
|
|
|
|
mm.commit_session_boundary_async(
|
|
[{"role": "user", "content": "old"}],
|
|
new_session_id="new-sid",
|
|
)
|
|
mm.sync_all("next-session user msg", "assistant reply", session_id="new-sid")
|
|
|
|
assert mm.flush_pending(timeout=5)
|
|
|
|
kinds = [c[0] for c in provider.calls]
|
|
assert kinds == ["end", "switch", "sync_turn"], f"unexpected order: {provider.calls}"
|
|
|
|
|
|
def test_boundary_commit_switch_still_fires_when_end_raises():
|
|
"""A failing provider extraction must not strand providers on the old sid."""
|
|
|
|
class _ExplodingEndProvider(_RecordingProvider):
|
|
def on_session_end(self, messages): # type: ignore[override]
|
|
raise RuntimeError("provider extraction blew up")
|
|
|
|
provider = _ExplodingEndProvider()
|
|
mm = _make_manager(provider)
|
|
|
|
mm.commit_session_boundary_async([{"role": "user", "content": "x"}], new_session_id="new-sid")
|
|
assert mm.flush_pending(timeout=5)
|
|
|
|
assert ("switch", "new-sid", True) in provider.calls
|
|
|
|
|
|
def test_boundary_commit_noop_without_providers():
|
|
mm = MemoryManager()
|
|
# Must not create the executor or raise.
|
|
mm.commit_session_boundary_async([{"role": "user", "content": "x"}], new_session_id="s")
|
|
assert mm._sync_executor is None
|