Rename agent_session to session and session_store to persistence

Author: beacoder

README.md

@@ -188,8 +188,8 @@ python_agent_harness/
 ├── token_estimator.py # CJK-aware token estimation + calibration
 ├── planmode.py        # Plan/build modes + plan-file lifecycle
 ├── prompts.py         # Prompt loading + system-prompt assembly
-├── session_store.py   # Session persistence + titles
-├── agent_session.py   # AgentSession wiring hub + MCP lifecycle
+├── persistence.py     # Session persistence + titles
+├── session.py         # Session wiring hub + MCP lifecycle
 ├── subagent.py        # Sub-agent runner + error containment
 ├── commands.py        # Init/review/custom command definitions
 ├── cli.py             # CLI entry points

python_agent_harness/__init__.py

@@ -1,14 +1,14 @@
 """python-agent-harness: a Python port of the gptel-agent-harness."""
 
-from .agent_session import AgentSession
 from .mcp.config import MCPConfig, MCPServerConfig
 from .mcp.manager import MCPManager
 from .models import AgentMode, Message, ToolCall, ToolSpec
+from .session import Session
 
 __version__ = "1.2.0"
 
 __all__ = [
-    "AgentSession",
+    "Session",
     "AgentMode",
     "MCPConfig",
     "MCPManager",

python_agent_harness/agent.py

@@ -80,7 +80,7 @@ def __init__(
         self.messages: list[Message] = messages if messages is not None else []
         self.top_level = top_level
         # an explicit per-run client (a dedicated clone for this
-        # sub-agent invocation, see AgentSession.run_subagent) wins
+        # sub-agent invocation, see Session.run_subagent) wins
         # over the session's shared sub-agent client
         self._client = client
         # fall back to the session's prompt so a run never loses it;

python_agent_harness/cli.py

@@ -19,8 +19,8 @@
 import sys
 
 from . import config
-from .agent_session import AgentSession
 from .client import Client
+from .session import Session
 from .tools import default_registry
 
 
@@ -29,8 +29,8 @@ def make_session(
     config_path: str | None = None,
     model: str | None = None,
     stream: bool | None = None,
-) -> AgentSession:
-    """Create an AgentSession from config file + env (no env required).
+) -> Session:
+    """Create a Session from config file + env (no env required).
 
     The system prompt defaults to the ported main-agent prompt
     (config.DEFAULT_AGENT_PROMPT_FILE); the sub-agent prompt always
@@ -71,8 +71,8 @@ def make_session(
         # same LLM log file — the TUI advertises the main client's log
         # path, and a separate sub-agent log would fragment debugging
         subagent_client.log_path = client.log_path
-    from .agent_session import find_skill_dir
     from .prompts import assemble_agent_prompt, load_agent_prompt
+    from .session import find_skill_dir
 
     abs_project = os.path.abspath(project_dir)
     skill_dir = find_skill_dir(abs_project, paths.get("skill_path"))
@@ -97,7 +97,7 @@ def make_session(
     # instead of values drifted by earlier switches.
     llm_settings = dict(settings)
     llm_settings["stream"] = effective_stream
-    return AgentSession(
+    return Session(
         project_dir=abs_project,
         client=client,
         model=model,
@@ -128,8 +128,8 @@ def make_session_with_mcp(
     config_path: str | None = None,
     model: str | None = None,
     stream: bool | None = None,
-) -> AgentSession:
-    """Create an AgentSession and connect its configured MCP servers.
+) -> Session:
+    """Create a Session and connect its configured MCP servers.
 
     Wraps ``make_session``: the session's MCP servers are connected and
     their tools registered before the session is returned (discovery

python_agent_harness/client.py

@@ -237,7 +237,7 @@ def clone(self) -> Client:
         connection failure (or Ctrl-C abort) would tear down a
         sibling's in-flight request on the same client.  Each
         concurrent sub-agent clones its own client (see
-        ``AgentSession.run_subagent``), keeping pools and the abort
+        ``Session.run_subagent``), keeping pools and the abort
         flag strictly per-request.  The log file is shared so one
         session's LLM interactions stay in one log.
         """

python_agent_harness/mcp/manager.py

@@ -6,7 +6,7 @@
 subprocess pipes, anyio memory streams — to a fresh loop each time and
 break on the next call).
 
-Lifecycle (mirrors the session lifecycle; see ``AgentSession``)::
+Lifecycle (mirrors the session lifecycle; see ``Session``)::
 
     manager = MCPManager(config)
     failures = manager.connect_all()     # connect every configured server

python_agent_harness/session_store.py python_agent_harness/persistence.pypython_agent_harness/session_store.py renamed to python_agent_harness/persistence.py

@@ -99,7 +99,7 @@ def title_from_filename(session_file: str) -> str | None:
     return title
 
 
-class SessionStore:
+class SessionPersistence:
     """Saves/restores sessions for one agent session."""
 
     def __init__(

python_agent_harness/prompts.py

@@ -330,7 +330,7 @@ def assemble_agent_prompt(
     parts: list[str] = []
     if include_context:
         # lazy import: harness imports this module at call time
-        from .agent_session import find_context_dir
+        from .session import find_context_dir
 
         # the project's AGENTS.md files are just context files that live
         # outside the context directory — same block format, same section
@@ -464,7 +464,7 @@ def compact_summary(
     """Ask the model to summarize *conversation* using the compact prompt.
 
     Shared by the in-loop compaction (``AgentLoop.compact``) and the
-    manual /compact command (``AgentSession.compact_conversation``).
+    manual /compact command (``Session.compact_conversation``).
     Returns the summary text with the reasoning preamble stripped, or
     None when the response carries no text.  Client exceptions
     propagate to the caller, which owns the failure handling

python_agent_harness/agent_session.py python_agent_harness/session.pypython_agent_harness/agent_session.py renamed to python_agent_harness/session.py

@@ -1,4 +1,4 @@
-"""AgentSession: the runtime hub wiring tools, plan mode.
+"""Session: the runtime hub wiring tools, plan mode.
 
 The session implements the ToolContext-facing API (sub-agents,
 questions) and the agent-loop-facing API (client, calibrator, plan
@@ -20,9 +20,9 @@
 from .mcp.config import MCPConfig
 from .mcp.manager import MCPManager
 from .models import AgentMode
+from .persistence import SessionPersistence, escape_role_headers
 from .planmode import PlanMode
 from .prompts import index_skills
-from .session_store import SessionStore, escape_role_headers
 from .subagent import run_subagent
 from .token_estimator import TokenCalibrator
 from .tools import Registry, ToolContext
@@ -63,7 +63,7 @@ def find_context_dir(project_dir: str, configured: str | None = None) -> str | N
     return None
 
 
-class AgentSession:
+class Session:
     """One interactive agent session (a "buffer" in elisp terms)."""
 
     def __init__(
@@ -158,7 +158,7 @@ def __init__(
         # active clones are tracked so cancel()/close() can reach them.
         self._subagent_clients_lock = threading.Lock()
         self._active_subagent_clients: list[Client] = []
-        self.store = SessionStore(
+        self.store = SessionPersistence(
             project_dir=project_dir,
             model=model,
             backend=backend,

python_agent_harness/subagent.py

@@ -36,7 +36,7 @@ def run_subagent(
     """Run a sub-agent task; return a result string (never raises).
 
     ``client`` (when given) is the per-invocation dedicated client
-    (see ``AgentSession.run_subagent``); the loop falls back to the
+    (see ``Session.run_subagent``); the loop falls back to the
     session's shared sub-agent client otherwise.
     """
     session = parent_session