388130a122
* fix: persist ACP sessions to disk so they survive process restarts The ACP adapter stored sessions entirely in-memory. When the editor restarted the ACP subprocess (idle timeout, crash, system sleep/wake, editor restart), all sessions were lost. The editor's load_session / resume_session calls would fail to find the session, forcing a new empty session and losing all conversation history. Changes: - SessionManager now persists each session as a JSON file under ~/.hermes/acp_sessions/<session_id>.json - get_session() transparently restores from disk when not in memory - update_cwd(), fork_session(), list_sessions() all check disk - server.py calls save_session() after prompt completion, /reset, /compact, and model switches - cleanup() and remove_session() delete disk files too - Sessions have a 7-day TTL; expired sessions are pruned on startup - Atomic writes via tempfile + os.replace to prevent corruption - 11 new tests covering persistence, disk restoration, and TTL expiry * refactor: use SessionDB instead of JSON files for ACP session persistence Replace the standalone JSON file persistence layer with SessionDB (~/.hermes/state.db) integration. ACP sessions now: - Share the same DB as CLI and gateway sessions - Are searchable via session_search (FTS5) - Get token tracking, cost tracking, and session titles for free - Follow existing session pruning policies Key changes: - _get_db() lazily creates a SessionDB, resolving HERMES_HOME dynamically (not at import time) for test compatibility - _persist() creates session record + replaces messages in DB - _restore() loads from DB with source='acp' filter - cwd stored in model_config JSON field (no schema migration) - Model values coerced to str to handle mock agents in tests - Removed: json files, sessions_dir, ttl_days, _expire logic - Tests updated: DB-backed persistence, FTS search, tool_call round-tripping, source filtering --------- Co-authored-by: Test <test@test.com>
432 lines
16 KiB
Python
432 lines
16 KiB
Python
"""ACP session manager — maps ACP sessions to Hermes AIAgent instances.
|
|
|
|
Sessions are persisted to the shared SessionDB (``~/.hermes/state.db``) so they
|
|
survive process restarts and appear in ``session_search``. When the editor
|
|
reconnects after idle/restart, the ``load_session`` / ``resume_session`` calls
|
|
find the persisted session in the database and restore the full conversation
|
|
history.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import copy
|
|
import json
|
|
import logging
|
|
import uuid
|
|
from dataclasses import dataclass, field
|
|
from threading import Lock
|
|
from typing import Any, Dict, List, Optional
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
def _register_task_cwd(task_id: str, cwd: str) -> None:
|
|
"""Bind a task/session id to the editor's working directory for tools."""
|
|
if not task_id:
|
|
return
|
|
try:
|
|
from tools.terminal_tool import register_task_env_overrides
|
|
register_task_env_overrides(task_id, {"cwd": cwd})
|
|
except Exception:
|
|
logger.debug("Failed to register ACP task cwd override", exc_info=True)
|
|
|
|
|
|
def _clear_task_cwd(task_id: str) -> None:
|
|
"""Remove task-specific cwd overrides for an ACP session."""
|
|
if not task_id:
|
|
return
|
|
try:
|
|
from tools.terminal_tool import clear_task_env_overrides
|
|
clear_task_env_overrides(task_id)
|
|
except Exception:
|
|
logger.debug("Failed to clear ACP task cwd override", exc_info=True)
|
|
|
|
|
|
@dataclass
|
|
class SessionState:
|
|
"""Tracks per-session state for an ACP-managed Hermes agent."""
|
|
|
|
session_id: str
|
|
agent: Any # AIAgent instance
|
|
cwd: str = "."
|
|
model: str = ""
|
|
history: List[Dict[str, Any]] = field(default_factory=list)
|
|
cancel_event: Any = None # threading.Event
|
|
|
|
|
|
class SessionManager:
|
|
"""Thread-safe manager for ACP sessions backed by Hermes AIAgent instances.
|
|
|
|
Sessions are held in-memory for fast access **and** persisted to the
|
|
shared SessionDB so they survive process restarts and are searchable
|
|
via ``session_search``.
|
|
"""
|
|
|
|
def __init__(self, agent_factory=None, db=None):
|
|
"""
|
|
Args:
|
|
agent_factory: Optional callable that creates an AIAgent-like object.
|
|
Used by tests. When omitted, a real AIAgent is created
|
|
using the current Hermes runtime provider configuration.
|
|
db: Optional SessionDB instance. When omitted, the default
|
|
SessionDB (``~/.hermes/state.db``) is lazily created.
|
|
"""
|
|
self._sessions: Dict[str, SessionState] = {}
|
|
self._lock = Lock()
|
|
self._agent_factory = agent_factory
|
|
self._db_instance = db # None → lazy-init on first use
|
|
|
|
# ---- public API ---------------------------------------------------------
|
|
|
|
def create_session(self, cwd: str = ".") -> SessionState:
|
|
"""Create a new session with a unique ID and a fresh AIAgent."""
|
|
import threading
|
|
|
|
session_id = str(uuid.uuid4())
|
|
agent = self._make_agent(session_id=session_id, cwd=cwd)
|
|
state = SessionState(
|
|
session_id=session_id,
|
|
agent=agent,
|
|
cwd=cwd,
|
|
model=getattr(agent, "model", "") or "",
|
|
cancel_event=threading.Event(),
|
|
)
|
|
with self._lock:
|
|
self._sessions[session_id] = state
|
|
_register_task_cwd(session_id, cwd)
|
|
self._persist(state)
|
|
logger.info("Created ACP session %s (cwd=%s)", session_id, cwd)
|
|
return state
|
|
|
|
def get_session(self, session_id: str) -> Optional[SessionState]:
|
|
"""Return the session for *session_id*, or ``None``.
|
|
|
|
If the session is not in memory but exists in the database (e.g. after
|
|
a process restart), it is transparently restored.
|
|
"""
|
|
with self._lock:
|
|
state = self._sessions.get(session_id)
|
|
if state is not None:
|
|
return state
|
|
# Attempt to restore from database.
|
|
return self._restore(session_id)
|
|
|
|
def remove_session(self, session_id: str) -> bool:
|
|
"""Remove a session from memory and database. Returns True if it existed."""
|
|
with self._lock:
|
|
existed = self._sessions.pop(session_id, None) is not None
|
|
db_existed = self._delete_persisted(session_id)
|
|
if existed or db_existed:
|
|
_clear_task_cwd(session_id)
|
|
return existed or db_existed
|
|
|
|
def fork_session(self, session_id: str, cwd: str = ".") -> Optional[SessionState]:
|
|
"""Deep-copy a session's history into a new session."""
|
|
import threading
|
|
|
|
original = self.get_session(session_id) # checks DB too
|
|
if original is None:
|
|
return None
|
|
|
|
new_id = str(uuid.uuid4())
|
|
agent = self._make_agent(
|
|
session_id=new_id,
|
|
cwd=cwd,
|
|
model=original.model or None,
|
|
)
|
|
state = SessionState(
|
|
session_id=new_id,
|
|
agent=agent,
|
|
cwd=cwd,
|
|
model=getattr(agent, "model", original.model) or original.model,
|
|
history=copy.deepcopy(original.history),
|
|
cancel_event=threading.Event(),
|
|
)
|
|
with self._lock:
|
|
self._sessions[new_id] = state
|
|
_register_task_cwd(new_id, cwd)
|
|
self._persist(state)
|
|
logger.info("Forked ACP session %s -> %s", session_id, new_id)
|
|
return state
|
|
|
|
def list_sessions(self) -> List[Dict[str, Any]]:
|
|
"""Return lightweight info dicts for all sessions (memory + database)."""
|
|
# Collect in-memory sessions first.
|
|
with self._lock:
|
|
seen_ids = set(self._sessions.keys())
|
|
results = [
|
|
{
|
|
"session_id": s.session_id,
|
|
"cwd": s.cwd,
|
|
"model": s.model,
|
|
"history_len": len(s.history),
|
|
}
|
|
for s in self._sessions.values()
|
|
]
|
|
|
|
# Merge any persisted sessions not currently in memory.
|
|
db = self._get_db()
|
|
if db is not None:
|
|
try:
|
|
rows = db.search_sessions(source="acp", limit=1000)
|
|
for row in rows:
|
|
sid = row["id"]
|
|
if sid in seen_ids:
|
|
continue
|
|
# Extract cwd from model_config JSON.
|
|
cwd = "."
|
|
mc = row.get("model_config")
|
|
if mc:
|
|
try:
|
|
cwd = json.loads(mc).get("cwd", ".")
|
|
except (json.JSONDecodeError, TypeError):
|
|
pass
|
|
results.append({
|
|
"session_id": sid,
|
|
"cwd": cwd,
|
|
"model": row.get("model") or "",
|
|
"history_len": row.get("message_count") or 0,
|
|
})
|
|
except Exception:
|
|
logger.debug("Failed to list ACP sessions from DB", exc_info=True)
|
|
|
|
return results
|
|
|
|
def update_cwd(self, session_id: str, cwd: str) -> Optional[SessionState]:
|
|
"""Update the working directory for a session and its tool overrides."""
|
|
state = self.get_session(session_id) # checks DB too
|
|
if state is None:
|
|
return None
|
|
state.cwd = cwd
|
|
_register_task_cwd(session_id, cwd)
|
|
self._persist(state)
|
|
return state
|
|
|
|
def cleanup(self) -> None:
|
|
"""Remove all sessions (memory and database) and clear task-specific cwd overrides."""
|
|
with self._lock:
|
|
session_ids = list(self._sessions.keys())
|
|
self._sessions.clear()
|
|
for session_id in session_ids:
|
|
_clear_task_cwd(session_id)
|
|
self._delete_persisted(session_id)
|
|
# Also remove any DB-only ACP sessions not currently in memory.
|
|
db = self._get_db()
|
|
if db is not None:
|
|
try:
|
|
rows = db.search_sessions(source="acp", limit=10000)
|
|
for row in rows:
|
|
sid = row["id"]
|
|
_clear_task_cwd(sid)
|
|
db.delete_session(sid)
|
|
except Exception:
|
|
logger.debug("Failed to cleanup ACP sessions from DB", exc_info=True)
|
|
|
|
def save_session(self, session_id: str) -> None:
|
|
"""Persist the current state of a session to the database.
|
|
|
|
Called by the server after prompt completion, slash commands that
|
|
mutate history, and model switches.
|
|
"""
|
|
with self._lock:
|
|
state = self._sessions.get(session_id)
|
|
if state is not None:
|
|
self._persist(state)
|
|
|
|
# ---- persistence via SessionDB ------------------------------------------
|
|
|
|
def _get_db(self):
|
|
"""Lazily initialise and return the SessionDB instance.
|
|
|
|
Returns ``None`` if the DB is unavailable (e.g. import error in a
|
|
minimal test environment).
|
|
|
|
Note: we resolve ``HERMES_HOME`` dynamically rather than relying on
|
|
the module-level ``DEFAULT_DB_PATH`` constant, because that constant
|
|
is evaluated at import time and won't reflect env-var changes made
|
|
later (e.g. by the test fixture ``_isolate_hermes_home``).
|
|
"""
|
|
if self._db_instance is not None:
|
|
return self._db_instance
|
|
try:
|
|
import os
|
|
from pathlib import Path
|
|
from hermes_state import SessionDB
|
|
hermes_home = Path(os.getenv("HERMES_HOME", Path.home() / ".hermes"))
|
|
self._db_instance = SessionDB(db_path=hermes_home / "state.db")
|
|
return self._db_instance
|
|
except Exception:
|
|
logger.debug("SessionDB unavailable for ACP persistence", exc_info=True)
|
|
return None
|
|
|
|
def _persist(self, state: SessionState) -> None:
|
|
"""Write session state to the database.
|
|
|
|
Creates the session record if it doesn't exist, then replaces all
|
|
stored messages with the current in-memory history.
|
|
"""
|
|
db = self._get_db()
|
|
if db is None:
|
|
return
|
|
|
|
# Ensure model is a plain string (not a MagicMock or other proxy).
|
|
model_str = str(state.model) if state.model else None
|
|
cwd_json = json.dumps({"cwd": state.cwd})
|
|
|
|
try:
|
|
# Ensure the session record exists.
|
|
existing = db.get_session(state.session_id)
|
|
if existing is None:
|
|
db.create_session(
|
|
session_id=state.session_id,
|
|
source="acp",
|
|
model=model_str,
|
|
model_config={"cwd": state.cwd},
|
|
)
|
|
else:
|
|
# Update model_config (contains cwd) if changed.
|
|
try:
|
|
with db._lock:
|
|
db._conn.execute(
|
|
"UPDATE sessions SET model_config = ?, model = COALESCE(?, model) WHERE id = ?",
|
|
(cwd_json, model_str, state.session_id),
|
|
)
|
|
db._conn.commit()
|
|
except Exception:
|
|
logger.debug("Failed to update ACP session metadata", exc_info=True)
|
|
|
|
# Replace stored messages with current history.
|
|
db.clear_messages(state.session_id)
|
|
for msg in state.history:
|
|
db.append_message(
|
|
session_id=state.session_id,
|
|
role=msg.get("role", "user"),
|
|
content=msg.get("content"),
|
|
tool_name=msg.get("tool_name") or msg.get("name"),
|
|
tool_calls=msg.get("tool_calls"),
|
|
tool_call_id=msg.get("tool_call_id"),
|
|
)
|
|
except Exception:
|
|
logger.warning("Failed to persist ACP session %s", state.session_id, exc_info=True)
|
|
|
|
def _restore(self, session_id: str) -> Optional[SessionState]:
|
|
"""Load a session from the database into memory, recreating the AIAgent."""
|
|
import threading
|
|
|
|
db = self._get_db()
|
|
if db is None:
|
|
return None
|
|
|
|
try:
|
|
row = db.get_session(session_id)
|
|
except Exception:
|
|
logger.debug("Failed to query DB for ACP session %s", session_id, exc_info=True)
|
|
return None
|
|
|
|
if row is None:
|
|
return None
|
|
|
|
# Only restore ACP sessions.
|
|
if row.get("source") != "acp":
|
|
return None
|
|
|
|
# Extract cwd from model_config.
|
|
cwd = "."
|
|
mc = row.get("model_config")
|
|
if mc:
|
|
try:
|
|
cwd = json.loads(mc).get("cwd", ".")
|
|
except (json.JSONDecodeError, TypeError):
|
|
pass
|
|
|
|
model = row.get("model") or None
|
|
|
|
# Load conversation history.
|
|
try:
|
|
history = db.get_messages_as_conversation(session_id)
|
|
except Exception:
|
|
logger.warning("Failed to load messages for ACP session %s", session_id, exc_info=True)
|
|
history = []
|
|
|
|
try:
|
|
agent = self._make_agent(session_id=session_id, cwd=cwd, model=model)
|
|
except Exception:
|
|
logger.warning("Failed to recreate agent for ACP session %s", session_id, exc_info=True)
|
|
return None
|
|
|
|
state = SessionState(
|
|
session_id=session_id,
|
|
agent=agent,
|
|
cwd=cwd,
|
|
model=model or getattr(agent, "model", "") or "",
|
|
history=history,
|
|
cancel_event=threading.Event(),
|
|
)
|
|
with self._lock:
|
|
self._sessions[session_id] = state
|
|
_register_task_cwd(session_id, cwd)
|
|
logger.info("Restored ACP session %s from DB (%d messages)", session_id, len(history))
|
|
return state
|
|
|
|
def _delete_persisted(self, session_id: str) -> bool:
|
|
"""Delete a session from the database. Returns True if it existed."""
|
|
db = self._get_db()
|
|
if db is None:
|
|
return False
|
|
try:
|
|
return db.delete_session(session_id)
|
|
except Exception:
|
|
logger.debug("Failed to delete ACP session %s from DB", session_id, exc_info=True)
|
|
return False
|
|
|
|
# ---- internal -----------------------------------------------------------
|
|
|
|
def _make_agent(
|
|
self,
|
|
*,
|
|
session_id: str,
|
|
cwd: str,
|
|
model: str | None = None,
|
|
):
|
|
if self._agent_factory is not None:
|
|
return self._agent_factory()
|
|
|
|
from run_agent import AIAgent
|
|
from hermes_cli.config import load_config
|
|
from hermes_cli.runtime_provider import resolve_runtime_provider
|
|
|
|
config = load_config()
|
|
model_cfg = config.get("model")
|
|
default_model = "anthropic/claude-opus-4.6"
|
|
requested_provider = None
|
|
if isinstance(model_cfg, dict):
|
|
default_model = str(model_cfg.get("default") or default_model)
|
|
requested_provider = model_cfg.get("provider")
|
|
elif isinstance(model_cfg, str) and model_cfg.strip():
|
|
default_model = model_cfg.strip()
|
|
|
|
kwargs = {
|
|
"platform": "acp",
|
|
"enabled_toolsets": ["hermes-acp"],
|
|
"quiet_mode": True,
|
|
"session_id": session_id,
|
|
"model": model or default_model,
|
|
}
|
|
|
|
try:
|
|
runtime = resolve_runtime_provider(requested=requested_provider)
|
|
kwargs.update(
|
|
{
|
|
"provider": runtime.get("provider"),
|
|
"api_mode": runtime.get("api_mode"),
|
|
"base_url": runtime.get("base_url"),
|
|
"api_key": runtime.get("api_key"),
|
|
"command": runtime.get("command"),
|
|
"args": list(runtime.get("args") or []),
|
|
}
|
|
)
|
|
except Exception:
|
|
logger.debug("ACP session falling back to default provider resolution", exc_info=True)
|
|
|
|
_register_task_cwd(session_id, cwd)
|
|
return AIAgent(**kwargs)
|