kshitijk4poor
db339f0051
A gateway process opened state.db from ~12 call sites, each minting its own writer connection, self._lock, close-time WAL checkpoint, and token-writer thread. With N independent writers on one WAL file, one connection's close-time checkpoint could race another's growth — the lost/reordered-page-write signature across 11+ incidents (#90837). Adds hermes_state_registry.py: a process-wide, per-path, refcounted shared registry owning the writer boundary. - acquire(path): same resolved path returns the same instance (one writer connection, one lock, one token-writer thread) for every long-lived in-process caller (gateway runner, SessionStore, per-agent lazy recall, cron per-job, mirror, channel_directory, slash_commands, shutdown_flush, session_search, react_to_message, delegate, mcp_serve, auto_archive, tui_gateway). - close() on a shared instance is a NO-OP — the registry owns the lifecycle, so one caller's close can never tear down a writer other callers still hold. - Generation-aware retirement on inode change: a replaced state.db RETIRES the live generation (never lent again) but keeps it alive for existing holders; release is object-keyed so holders of the old generation drain it independently of the new one. The old generation's own write path still fails with the typed StateDbReplacedError (existing protection, unchanged). - Replacement-open failure leaves NO registry entry for the path — the next acquire retries fresh, never hands out a closed stale object. - All teardown runs OUTSIDE the registry lock: a final release's WAL checkpoint can never stall acquisition for every state.db. - close_shared_session_dbs() at gateway shutdown drains every generation (live + retired) as the final safety net. CLI one-shots, recovery flows, and read-only cross-profile opens keep using SessionDB() directly with their own close() — only long-lived in-process sites route through the registry. References #90837 (root-cause tracker stays open: the #10 EOF signature and the WAL-lifecycle A/B verdict remain under investigation there).
130 lines
3.9 KiB
Python
130 lines
3.9 KiB
Python
from types import ModuleType, SimpleNamespace
|
|
from unittest.mock import MagicMock, patch
|
|
import json
|
|
import sys
|
|
|
|
from run_agent import AIAgent
|
|
|
|
|
|
def _mock_response(*, usage: dict, content: str = "done"):
|
|
msg = SimpleNamespace(content=content, tool_calls=None)
|
|
choice = SimpleNamespace(message=msg, finish_reason="stop")
|
|
return SimpleNamespace(
|
|
choices=[choice],
|
|
model="test/model",
|
|
usage=SimpleNamespace(**usage),
|
|
)
|
|
|
|
|
|
def _make_agent(session_db, *, platform: str):
|
|
with (
|
|
patch("run_agent.get_tool_definitions", return_value=[]),
|
|
patch("run_agent.check_toolset_requirements", return_value={}),
|
|
patch("run_agent.OpenAI"),
|
|
):
|
|
agent = AIAgent(
|
|
api_key="test-key",
|
|
base_url="https://openrouter.ai/api/v1",
|
|
quiet_mode=True,
|
|
skip_context_files=True,
|
|
skip_memory=True,
|
|
session_db=session_db,
|
|
session_id=f"{platform}-session",
|
|
platform=platform,
|
|
)
|
|
agent.client = MagicMock()
|
|
agent.client.chat.completions.create.return_value = _mock_response(
|
|
usage={
|
|
"prompt_tokens": 11,
|
|
"completion_tokens": 7,
|
|
"total_tokens": 18,
|
|
}
|
|
)
|
|
return agent
|
|
|
|
|
|
def test_run_conversation_persists_tokens_for_telegram_sessions():
|
|
session_db = MagicMock()
|
|
agent = _make_agent(session_db, platform="telegram")
|
|
|
|
result = agent.run_conversation("hello")
|
|
|
|
assert result["final_response"] == "done"
|
|
# Per-call deltas are enqueued for the SessionDB background writer
|
|
# (queue_token_counts) rather than written inline on the turn thread.
|
|
session_db.queue_token_counts.assert_called_once()
|
|
assert session_db.queue_token_counts.call_args.args[0] == "telegram-session"
|
|
|
|
|
|
|
|
|
|
def test_session_search_lazily_opens_db_when_entrypoint_did_not_pass_one(monkeypatch):
|
|
sentinel_db = object()
|
|
captured = {}
|
|
|
|
class FakeSessionDB:
|
|
def __new__(cls):
|
|
return sentinel_db
|
|
|
|
hermes_state = ModuleType("hermes_state")
|
|
hermes_state.SessionDB = FakeSessionDB
|
|
hermes_state.get_shared_session_db = lambda db_path=None: sentinel_db
|
|
monkeypatch.setitem(sys.modules, "hermes_state", hermes_state)
|
|
|
|
session_search_mod = ModuleType("tools.session_search_tool")
|
|
|
|
def fake_session_search(**kwargs):
|
|
captured.update(kwargs)
|
|
return json.dumps({"success": True, "results": []})
|
|
|
|
session_search_mod.session_search = fake_session_search
|
|
monkeypatch.setitem(sys.modules, "tools.session_search_tool", session_search_mod)
|
|
|
|
agent = _make_agent(None, platform="acp")
|
|
result = json.loads(agent._invoke_tool(
|
|
"session_search",
|
|
{"query": "Hermes", "detail": "full"},
|
|
"task-id",
|
|
))
|
|
|
|
assert result["success"] is True
|
|
assert captured["db"] is sentinel_db
|
|
assert captured["query"] == "Hermes"
|
|
assert captured["detail"] == "full"
|
|
assert agent._session_db is sentinel_db
|
|
|
|
|
|
def test_sequential_session_search_forwards_detail(monkeypatch):
|
|
session_db = MagicMock()
|
|
captured = {}
|
|
|
|
session_search_mod = ModuleType("tools.session_search_tool")
|
|
|
|
def fake_session_search(**kwargs):
|
|
captured.update(kwargs)
|
|
return json.dumps({"success": True, "results": []})
|
|
|
|
session_search_mod.session_search = fake_session_search
|
|
monkeypatch.setitem(sys.modules, "tools.session_search_tool", session_search_mod)
|
|
|
|
agent = _make_agent(session_db, platform="acp")
|
|
tool_call = SimpleNamespace(
|
|
id="search-1",
|
|
function=SimpleNamespace(
|
|
name="session_search",
|
|
arguments=json.dumps({"query": "Hermes", "detail": "full"}),
|
|
),
|
|
)
|
|
assistant_message = SimpleNamespace(tool_calls=[tool_call])
|
|
messages = []
|
|
|
|
agent._execute_tool_calls_sequential(
|
|
assistant_message,
|
|
messages,
|
|
"task-id",
|
|
)
|
|
|
|
assert captured["db"] is session_db
|
|
assert captured["query"] == "Hermes"
|
|
assert captured["detail"] == "full"
|