Refactor to make file name more reasonable.

Author: beacoder

README.md

@@ -121,14 +121,14 @@ clobber the next run's state (per-run cancellation identity).
 python_agent_harness/
 ├── agent.py        agent loop (supervision, nudges, compaction)
 ├── client.py       OpenAI-compatible streaming client (httpx)
-├── tokenizer.py    CJK-aware token estimation + calibration
+├── token_estimator.py  CJK-aware token estimation + calibration
 ├── safety.py       path guards + bash policy tiers
 ├── undo.py         file snapshots / undo
 ├── cache.py        tool-result cache + dedup
 ├── planmode.py     build/plan mode + plan file lifecycle
-├── compaction.py   compact frame / anchored summary
-├── session.py      session persistence + titles
-├── harness.py      AgentSession (wiring hub)
+├── prompts.py      prompt loading + system prompt assembly
+├── session_store.py  session persistence + titles
+├── agent_session.py  AgentSession (wiring hub)
 ├── commands.py     init/review/custom command definitions
 ├── cli.py          argparse entry points
 ├── tui.py          rich + prompt_toolkit TUI

python_agent_harness/__init__.py

@@ -1,6 +1,6 @@
 """python-agent-harness: a Python port of the gptel-agent-harness."""
 
-from .harness import AgentSession
+from .agent_session import AgentSession
 from .models import AgentMode, Message, ToolCall, ToolSpec
 
 __version__ = "0.1.0"

python_agent_harness/agent.py

@@ -19,13 +19,13 @@
 from typing import Any
 
 from . import config
-from .compaction import last_user_request, read_prompt_file
+from .prompts import last_user_request, read_prompt_file
 from .models import Message, ToolCall
-from .tokenizer import context_window_for, estimate_payload_tokens
+from .token_estimator import context_window_for, estimate_payload_tokens
 
 
 class AgentLoop:
-    """Runs one agent session until terminal or max rounds."""
+    """Runs one agent session until terminal (main) or max rounds (sub-agent)."""
 
     def __init__(
         self,
@@ -47,7 +47,9 @@ def __init__(
         else:
             attr = "system_prompt" if top_level else "subagent_system_prompt"
             self.system = getattr(session, attr, None)
-        self.max_rounds = max_rounds
+        # max_rounds only bounds sub-agent loops: the main agent runs until
+        # the model gives a terminal response or the user aborts it (Ctrl-C)
+        self.max_rounds = max_rounds if not top_level else None
         self.pending: list[ToolCall] = []
         self.error: str | None = None
         self.harness_injected: bool = False
@@ -234,7 +236,7 @@ def run(self) -> str | None:
 
     def _run(self, rounds: int) -> str | None:
         session = self.session
-        while rounds < self.max_rounds:
+        while self.max_rounds is None or rounds < self.max_rounds:
             rounds += 1
             if self._is_cancelled():
                 return None
@@ -306,7 +308,8 @@ def safe_delta(text: str) -> None:
                 return f"Error: {self.error or 'unknown error'}"
             return assistant.text()
 
-        # round budget exhausted, or an API error broke the loop
+        # round budget exhausted (sub-agents only), or an API error broke
+        # the loop
         if self.error:
             return self.error
         return self.messages[-1].text() if self.messages else None

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

@@ -19,9 +19,9 @@
 from .models import AgentMode
 from .planmode import PlanMode
 from .safety import BashPolicy, SafetyViolation, check_path
-from .session import SessionStore
+from .session_store import SessionStore
 from .subagent import run_subagent
-from .tokenizer import TokenCalibrator
+from .token_estimator import TokenCalibrator
 from .tools import Registry, ToolContext
 from .undo import UndoStack
 
@@ -428,7 +428,7 @@ def switch_to_plan(self) -> None:
         self.registry.register(PlanExit())
 
     def _mode_prompts(self) -> dict[str, str]:
-        from .compaction import read_prompt_file
+        from .prompts import read_prompt_file
 
         return {
             "plan": read_prompt_file("plan.txt"),
@@ -475,7 +475,7 @@ def generate_session_title(self) -> None:
             return
         store.title_pending = True
         try:
-            from .compaction import read_prompt_file
+            from .prompts import read_prompt_file
             from .models import Message as Msg
 
             system = read_prompt_file("title.txt")
@@ -542,7 +542,7 @@ def compact_conversation(self) -> tuple[bool, str]:
         replaced by the summary frame + the last real user request, the
         cache epoch is reset, and the session file is refreshed.
         """
-        from .compaction import last_user_request, read_prompt_file
+        from .prompts import last_user_request, read_prompt_file
         from .models import Message as Msg
 
         messages = self.last_messages or []
@@ -585,7 +585,7 @@ def summarize_conversation(self) -> str:
         text is sent with the summary prompt, and the result is appended
         as an assistant message plus a session save.
         """
-        from .compaction import read_prompt_file
+        from .prompts import read_prompt_file
         from .models import Message as Msg
 
         messages = self.last_messages or []

python_agent_harness/cli.py

@@ -27,8 +27,8 @@
 from .commands import (
     SessionCommand, find_command, load_custom_commands,
 )
-from .harness import AgentSession
-from .session import SessionStore
+from .agent_session import AgentSession
+from .session_store import SessionStore
 from .tools import default_registry
 
 
@@ -58,8 +58,8 @@ def make_session(
         model=model,
         timeout=settings["timeout"],
     )
-    from .compaction import assemble_agent_prompt, load_agent_prompt
-    from .harness import find_skill_dir
+    from .prompts import assemble_agent_prompt, load_agent_prompt
+    from .agent_session import find_skill_dir
 
     abs_project = os.path.abspath(project_dir)
     skill_dir = find_skill_dir(abs_project, paths.get("skill_path"))
@@ -162,7 +162,7 @@ def _adopt(session: AgentSession, kw: dict) -> AgentSession:
     # The command's prompt becomes the "actual agent prompt"; the
     # project context + task-completion rules are kept in front of it.
     if kw.get("system_prompt") is not None:
-        from .compaction import assemble_agent_prompt
+        from .prompts import assemble_agent_prompt
 
         session.system_prompt = assemble_agent_prompt(
             session.project_dir, kw["system_prompt"],
@@ -187,8 +187,8 @@ def cmd_sessions(args: argparse.Namespace) -> int:
 
 
 def cmd_restore(args: argparse.Namespace) -> int:
-    from .session import SessionStore as Store
-    from .session import title_from_filename
+    from .session_store import SessionStore as Store
+    from .session_store import title_from_filename
 
     path = args.file
     if not path and args.latest:

python_agent_harness/commands.py

@@ -11,7 +11,7 @@
 from pathlib import Path
 
 from .agent import run_agent_loop
-from .compaction import read_prompt_file
+from .prompts import read_prompt_file
 from .models import Message
 
 PROMPTS_DIR = Path(__file__).parent / "prompts"
@@ -88,7 +88,7 @@ def run(
         )
         # the command prompt is the "actual agent prompt"; the project
         # context and task-completion rules are kept in front of it
-        from .compaction import assemble_agent_prompt
+        from .prompts import assemble_agent_prompt
 
         context_path = getattr(session, "_configured_context_path", None)
         system = assemble_agent_prompt(cwd, prompt, context_path=context_path)

python_agent_harness/config.py

@@ -148,7 +148,7 @@
 TEMPERATURE = 0.0
 
 # ---- sub-agents ---------------------------------------------------------------
-SUBAGENT_MAX_ROUNDS = 40
+SUBAGENT_MAX_ROUNDS = 60
 
 # ---- TUI preview limits -------------------------------------------------------
 TOOL_RESULT_PREVIEW_LINES = 5    # max lines of a tool result shown in the TUI

python_agent_harness/compaction.py python_agent_harness/prompts.pypython_agent_harness/compaction.py renamed to python_agent_harness/prompts.py

@@ -1,9 +1,11 @@
-"""Context compaction.
-
-Ported from gptel-agent-harness.el: on high context usage, abort the
-current round, summarize the whole conversation (compact.txt as system
-prompt, tools disabled), wrap the summary in a compact frame, reset the
-cache epoch, and resume with the last user request.
+"""Prompt loading and assembly.
+
+Ported from gptel-agent-harness.el: loads bundled prompt files
+(agent/subagent/commands), strips YAML frontmatter, discovers skills
+for the {{SKILLS}} placeholder, assembles the effective system prompt
+from project context files + task-completion rules + agent prompt, and
+provides last_user_request() for the compaction flow (summarize the
+conversation and resume with the last user request).
 """
 
 from __future__ import annotations
@@ -183,7 +185,7 @@ def assemble_agent_prompt(
     parts: list[str] = []
     if include_context:
         # lazy import: harness imports this module at call time
-        from .harness import find_context_dir
+        from .agent_session import find_context_dir
 
         context_block = load_context_files(find_context_dir(project_dir, context_path))
         if context_block:

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

@@ -9,7 +9,7 @@
 
 from . import config
 from .agent import run_agent_loop
-from .compaction import load_agent_prompt
+from .prompts import load_agent_prompt
 from .models import Message