python-agent-harness 1.5.5.3__tar.gz → 1.5.5.4__tar.gz

{python_agent_harness-1.5.5.3/python_agent_harness.egg-info → python_agent_harness-1.5.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-agent-harness
-Version: 1.5.5.3
+Version: 1.5.5.4
 Summary: A lightweight, hackable mini-OpenCode written in Python.
 Author-email: Huming Chen <chenhuming@gmail.com>
 License-Expression: MIT

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-agent-harness"
-version = "1.5.5.3"
+version = "1.5.5.4"
 description = "A lightweight, hackable mini-OpenCode written in Python."
 authors = [
     {name = "Huming Chen", email = "chenhuming@gmail.com"}

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/python_agent_harness/__init__.py

@@ -5,7 +5,7 @@ from .mcp.manager import MCPManager
 from .models import AgentMode, Message, ToolCall, ToolSpec
 from .session import Session
 
-__version__ = "1.5.5.3"
+__version__ = "1.5.5.4"
 
 __all__ = [
     "Session",

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/python_agent_harness/cli.py

@@ -125,7 +125,11 @@ def make_session(
     )
     if default_agent and default_agent != RESERVED_AGENT_NAME:
         ok, msg = session.switch_agent(default_agent)
-        if not ok:
+        if ok:
+            # record the applied agent so saved sessions restore it;
+            # switch_agent("default") clears it again
+            session.store.agent = default_agent
+        else:
             # A typo'd/missing default_agent must not silently start the
             # session with the built-in prompt — record the config error
             # so the TUI can surface it (see Tui.run).

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/python_agent_harness/persistence.py

@@ -112,9 +112,11 @@ class SessionPersistence:
         max_tokens: int | None = None,
         tool_names: list[str] | None = None,
         round_times: list[float] | None = None,
+        agent: str | None = None,
     ) -> None:
         self.project_dir = project_dir
         self.model = model
+        self.agent = agent
         self.system_prompt = system_prompt
         self.temperature = temperature
         self.max_tokens = max_tokens
@@ -171,6 +173,7 @@ class SessionPersistence:
         pairs = [
             ("python-agent-harness--project-dir", self.project_dir),
             ("python-agent-harness--model", self.model),
+            ("python-agent-harness--agent", self.agent),
         ]
         for name, value in pairs:
             if value is None:

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/python_agent_harness/session.py

@@ -162,6 +162,12 @@ class Session:
         # cache build simultaneously — double-checked locking prevents
         # redundant filesystem scans and the data race on the cache tuple
         self._skill_index_lock = threading.Lock()
+        # NOTE: the store does NOT record ``default_agent`` here: the
+        # store's agent must reflect the agent actually applied, and
+        # only a successful switch_agent() can guarantee that (a typo'd
+        # default_agent is reported as a startup warning and the session
+        # keeps the built-in prompt).  cli.make_session applies the
+        # default_agent right after construction, which sets it.
         self.store = SessionPersistence(
             project_dir=project_dir,
             model=model,
@@ -731,6 +737,7 @@ class Session:
         if name == RESERVED_AGENT_NAME:
             self.system_prompt = self._default_system_prompt
             self.store.system_prompt = self._default_system_prompt
+            self.store.agent = None
             return True, "switched to default agent"
 
         agents = discover_agents()
@@ -749,6 +756,7 @@ class Session:
             context_path=self._configured_context_path,
         )
         self.store.system_prompt = self.system_prompt
+        self.store.agent = name
         return True, f"switched to {name}"
 
     # ------------------------------------------------------------------

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/python_agent_harness/tools/diffapply.py

@@ -48,7 +48,7 @@ class _Hunk:
         """(kind, content-without-newline) for the lines that must exist
         in the old file (' ' context and '-' removed lines)."""
         return [
-            (kind, content.rstrip("\n")) for kind, content, _ in self.body if kind in (" ", "-")
+            (kind, content.rstrip("\r\n")) for kind, content, _ in self.body if kind in (" ", "-")
         ]
 
 
@@ -142,7 +142,7 @@ def _match_hunk(hunk: _Hunk, file_lines: list[str]) -> int | None:
         mismatches = 0
         ok = True
         for i, (kind, content) in enumerate(old_seq):
-            file_content = file_lines[p + i].rstrip("\n")
+            file_content = file_lines[p + i].rstrip("\r\n")
             if kind == "-":
                 if file_content != content:
                     ok = False

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/python_agent_harness/tools/grep_win.py

@@ -98,12 +98,17 @@ class GrepWindows(Grep):
             files = [Path(path)]
         else:
             root = Path(path)
-            files = (
-                p
-                for p in root.rglob("*")
-                if p.is_file()
-                and not any(part.startswith(".") for part in p.relative_to(root).parts[:-1])
-            )
+            collected: list[Path] = []
+            try:
+                for p in root.rglob("*"):
+                    if not p.is_file():
+                        continue
+                    if any(part.startswith(".") for part in p.relative_to(root).parts[:-1]):
+                        continue
+                    collected.append(p)
+            except OSError:
+                pass
+            files = collected
 
         for file_path in files:
             if match_count >= max_matches:
@@ -124,7 +129,7 @@ class GrepWindows(Grep):
                         start = max(0, i - 1 - context)
                         end = min(len(lines), i + context)
                         for j in range(start, end):
-                            marker = ":" if j + 1 != i else ":"
+                            marker = "-" if j + 1 != i else ":"
                             results.append(f"{file_path}:{j + 1}{marker}{lines[j].rstrip()}")
                         results.append("")  # blank line between matches with context
                     else:

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/python_agent_harness/tui/commands.py

@@ -119,7 +119,7 @@ class CommandMixin:
                 "/review [project] [commit|branch|PR] review code changes\n"
                 "/explain [project] [target]          explain code\n"
                 "/sessions                            list saved sessions\n"
-                "/restore [path | title | --latest | latest]   restore a saved session\n"
+                "/restore [path | title | --latest | latest]   restore a saved session (conversation + agent + model)\n"
                 "/model [name]                        switch LLM model profile\n"
                 "/agent [name]                        switch agent system prompt\n"
                 "Ctrl-C cancels the current execution (app stays open); "
@@ -642,6 +642,59 @@ class CommandMixin:
         title = title_from_filename(path)
         if title:
             self.session.store.title = title
+        # Restore agent if saved
+        agent = meta.get("python-agent-harness--agent")
+        if agent:
+            try:
+                success, msg = self.session.switch_agent(agent)
+                if success:
+                    self.console.print(f"[green]{msg}[/green]")
+                else:
+                    self.console.print(f"[yellow]warning: {msg}[/yellow]")
+            except Exception as e:
+                self.console.print(f"[yellow]warning: could not restore agent: {e}[/yellow]")
+        # Restore model if saved: /model's profile switching is the
+        # canonical path — it also fixes base_url/api_key/temperature
+        # and other settings that a bare model-name change would leave
+        # pointing at the wrong endpoint.  The metadata stores the raw
+        # model name, so first try it as a profile name, then fall back
+        # to a profile whose model matches; without a matching profile
+        # the current model stays active (profile names are not saved).
+        model = meta.get("python-agent-harness--model")
+        if model:
+            try:
+                if model == self.session.model:
+                    # Already the active model: nothing to do, no noise.
+                    pass
+                elif model == self.session.llm_settings.get("model"):
+                    # The saved model is the session-start default: the
+                    # "default" pseudo-profile restores exactly those
+                    # original llm settings (profile names were not saved,
+                    # so there is no better match).
+                    success, msg = self.session.switch_model("default")
+                    self.console.print(f"[green]{msg}[/green]")
+                else:
+                    success, msg = self.session.switch_model(model)
+                    if not success:
+                        profile = next(
+                            (
+                                name
+                                for name, p in self.session.model_profiles.items()
+                                if p.get("model") == model
+                            ),
+                            None,
+                        )
+                        if profile:
+                            success, msg = self.session.switch_model(profile)
+                    if success:
+                        self.console.print(f"[green]{msg}[/green]")
+                    else:
+                        self.console.print(
+                            f"[yellow]warning: model {model!r} has no matching profile, "
+                            f"keeping current model[/yellow]"
+                        )
+            except Exception as e:
+                self.console.print(f"[yellow]warning: could not restore model: {e}[/yellow]")
         # Replace conversation history: a new generation.  Invalidate any
         # worker still winding down from a cancelled run so its salvaged
         # history can't clobber the restored session.
@@ -650,11 +703,11 @@ class CommandMixin:
         self.session.last_messages = list(messages)
         self.session.clear_todos()
         self._history_dirty = True
-        model = meta.get("python-agent-harness--model", "?")
         project = meta.get("python-agent-harness--project-dir", "?")
+        agent_display = meta.get("python-agent-harness--agent", "default")
         self.console.print(
             f"[green]restored:[/green] {os.path.basename(path)} "
-            f"(model={model}, project={project}, {len(messages)} messages)"
+            f"(model={model}, agent={agent_display}, project={project}, {len(messages)} messages)"
         )
 
     @staticmethod
@@ -664,13 +717,15 @@ class CommandMixin:
         The save format is markdown with **role**: content blocks
         separated by blank lines.
 
-        ``tool`` blocks are dropped: the saved markdown does not keep
-        ``tool_call_id``/``name`` (assistant tool calls are flattened to
-        plain text), so a restored ``role="tool"`` message would form an
-        API-invalid payload (a tool message with no preceding assistant
-        ``tool_calls``).  The following assistant reply already
-        summarizes the results, so dropping them loses no essential
-        context.
+        ``tool`` and ``system`` blocks are dropped: the saved markdown
+        does not keep ``tool_call_id``/``name`` (assistant tool calls are
+        flattened to plain text), so a restored ``role="tool"`` message
+        would form an API-invalid payload (a tool message with no
+        preceding assistant ``tool_calls``).  A restored ``system``
+        message would duplicate the live system prompt the client
+        prepends on every request.  The following assistant reply
+        already summarizes the results, so dropping them loses no
+        essential context.
 
         Body lines that merely look like a block header are escaped by
         the renderer (see `escape_role_headers`) and unescaped here, so
@@ -687,9 +742,10 @@ class CommandMixin:
             header = split_role_header(line)
             if header is not None:
                 role, rest = header
-                # Save the previous block (tool blocks are dropped:
-                # their tool_call_id/name were not persisted)
-                if current_role is not None and current_role != "tool":
+                # Save the previous block (tool blocks lose their
+                # tool_call_id/name; system blocks would duplicate the
+                # live system prompt the client prepends per request)
+                if current_role is not None and current_role not in ("tool", "system"):
                     content = "\n".join(current_lines).strip()
                     if content:
                         messages.append(Message(role=current_role, content=content))
@@ -698,8 +754,8 @@ class CommandMixin:
                 continue
             current_lines.append(unescape_role_header(line))
 
-        # Don't forget the last block (tool blocks are dropped)
-        if current_role is not None and current_role != "tool":
+        # Don't forget the last block (tool/system blocks dropped, see above)
+        if current_role is not None and current_role not in ("tool", "system"):
             content = "\n".join(current_lines).strip()
             if content:
                 messages.append(Message(role=current_role, content=content))

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4/python_agent_harness.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-agent-harness
-Version: 1.5.5.3
+Version: 1.5.5.4
 Summary: A lightweight, hackable mini-OpenCode written in Python.
 Author-email: Huming Chen <chenhuming@gmail.com>
 License-Expression: MIT

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/tests/test_custom_agents.py

@@ -163,6 +163,25 @@ class TestSwitchAgent(unittest.TestCase):
         session.switch_agent("default")
         self.assertEqual(session.store.system_prompt, "original prompt")
 
+    def test_switch_updates_store_agent(self):
+        """switch_agent must keep store.agent in sync so every auto-save
+        records the currently active agent in the metadata block."""
+        session = _make_session(system_prompt="original prompt")
+        self.assertIsNone(session.store.agent)  # no custom agent yet
+        session.switch_agent("reviewer")
+        self.assertEqual(session.store.agent, "reviewer")
+        session.switch_agent("default")
+        self.assertIsNone(session.store.agent)  # default = no custom agent
+
+    def test_failed_switch_leaves_store_agent_untouched(self):
+        """A failed switch (unknown name) must not change store.agent:
+        the metadata must never record an agent that is not active."""
+        session = _make_session(system_prompt="original prompt")
+        session.switch_agent("reviewer")
+        ok, _ = session.switch_agent("nonexistent")
+        self.assertFalse(ok)
+        self.assertEqual(session.store.agent, "reviewer")
+
 
 class TestDefaultAgentConfig(unittest.TestCase):
     """config.load_default_agent: reading the default_agent setting."""
@@ -286,6 +305,30 @@ class TestMakeSessionWithDefaultAgent(unittest.TestCase):
             p.write_text(json.dumps({"default_agent": "reviewer"}), encoding="utf-8")
             session = make_session("/tmp", config_path=str(p))
             self.assertEqual(session.startup_warnings, [])
+            session.close()
+
+    def test_valid_default_agent_recorded_in_store(self):
+        """A successfully applied default_agent is recorded in store.agent,
+        so saved sessions restore it.  A typo'd one must NOT be recorded:
+        the metadata must never name an agent that is not active."""
+        from python_agent_harness.cli import make_session
+
+        with tempfile.TemporaryDirectory() as d:
+            p = Path(d) / "config.json"
+            p.write_text(json.dumps({"default_agent": "reviewer"}), encoding="utf-8")
+            session = make_session("/tmp", config_path=str(p))
+            try:
+                self.assertEqual(session.store.agent, "reviewer")
+            finally:
+                session.close()
+        with tempfile.TemporaryDirectory() as d:
+            p = Path(d) / "config.json"
+            p.write_text(json.dumps({"default_agent": "no-such-agent"}), encoding="utf-8")
+            session = make_session("/tmp", config_path=str(p))
+            try:
+                self.assertIsNone(session.store.agent)
+            finally:
+                session.close()
 
 
 class TestMcpFailuresAsStartupWarnings(unittest.TestCase):

{python_agent_harness-1.5.5.3 → python_agent_harness-1.5.5.4}/tests/test_persistence.py

@@ -59,6 +59,22 @@ class TestSession(unittest.TestCase):
         store = SessionPersistence(project_dir="/tmp/proj", model="m")
         self.assertNotIn("round-times", store.metadata_block())
 
+    def test_agent_persisted_in_metadata(self):
+        """A session with an active custom agent records it in the
+        metadata block so /restore can reapply it."""
+        store = SessionPersistence(project_dir="/tmp/proj", model="m", agent="reviewer")
+        meta = store.metadata_block()
+        self.assertIn("python-agent-harness--agent", meta)
+        text = "conversation...\n\n" + meta + "\n"
+        parsed = SessionPersistence.parse_metadata(text)
+        self.assertEqual(parsed["python-agent-harness--agent"], "reviewer")
+
+    def test_agent_absent_when_none(self):
+        """No custom agent -> no agent line in the metadata block, so
+        old sessions and default-agent sessions parse identically."""
+        store = SessionPersistence(project_dir="/tmp/proj", model="m", agent=None)
+        self.assertNotIn("python-agent-harness--agent", store.metadata_block())
+
     def test_save_and_restore_flow(self):
         import os
         import tempfile