teddy-cli 0.1.17.dev1205__tar.gz → 0.1.17.dev1207__tar.gz

{teddy_cli-0.1.17.dev1205 → teddy_cli-0.1.17.dev1207}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: teddy-cli
-Version: 0.1.17.dev1205
+Version: 0.1.17.dev1207
 Summary: A local-first, file-based AI coding workflow that applies the UNIX philosophy to AI collaboration.
 Author: Raphael Atteritano
 License: AGPL-3.0-only

{teddy_cli-0.1.17.dev1205 → teddy_cli-0.1.17.dev1207}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1205"
+version = "0.1.17.dev1207"
 description = "A local-first, file-based AI coding workflow that applies the UNIX philosophy to AI collaboration."
 authors = [{ name = "Raphael Atteritano" }]
 license = { text = "AGPL-3.0-only" }

{teddy_cli-0.1.17.dev1205 → teddy_cli-0.1.17.dev1207}/src/teddy_executor/core/services/prompt_manager.py

@@ -95,20 +95,14 @@ class PromptManager(IPromptManager):
         return None
 
     def _resolve_agent_prompt_content(self, agent_name: str, turn_path: Path) -> str:
-        """Resolves the agent-specific prompt XML from the filesystem hierarchy.
+        """Resolves the agent-specific prompt XML from the canonical
+        ``.teddy/prompts/`` directory (the user-editable source).
 
-        Searches the session root first, then the canonical ``.teddy/prompts/``
-        directory. Returns an empty string (with a warning) when no prompt file
-        is found, preserving the graceful-degradation contract.
+        Returns an empty string (with a warning) when no prompt file is found,
+        preserving the graceful-degradation contract. Session-root prompts are
+        resolved by the caller (``fetch_system_prompt``), which returns them
+        verbatim rather than re-composing them.
         """
-        # 1. Try Session-Root override (Current standard)
-        session_root_prompt = self._find_prompt_file(
-            turn_path.parent.as_posix(), agent_name
-        )
-        if session_root_prompt:
-            return self._file_system_manager.read_file(session_root_prompt)
-
-        # 2. Try .teddy/prompts/ (canonical source, user-editable)
         teddy_prompt_dir = (
             turn_path.parent.parent.parent.parent / ".teddy" / "prompts"
         ).as_posix()
@@ -117,9 +111,8 @@ class PromptManager(IPromptManager):
             return self._file_system_manager.read_file(teddy_prompt_path)
 
         logging.getLogger(__name__).warning(
-            "PromptManager: Failed to resolve system prompt for agent '%s' (searched %s and %s)",
+            "PromptManager: Failed to resolve system prompt for agent '%s' (searched %s)",
             agent_name,
-            session_root_prompt,
             teddy_prompt_path,
         )
         return ""
@@ -144,6 +137,17 @@ class PromptManager(IPromptManager):
         return resource.read_text(encoding="utf-8")
 
     def fetch_system_prompt(self, agent_name: str, turn_path: Path) -> str:
+        # Option A: the session-root prompt file IS the composed system prompt
+        # (written by SessionService at session creation / agent switch). Return
+        # it verbatim -- never re-compose, to avoid a duplicate header and MRP.
+        session_root_prompt = self._find_prompt_file(
+            turn_path.parent.as_posix(), agent_name
+        )
+        if session_root_prompt:
+            return self._file_system_manager.read_file(session_root_prompt)
+
+        # Lazy-compose fallback (legacy session or manually deleted file):
+        # assemble from the canonical ``.teddy/prompts/`` source.
         content = self._resolve_agent_prompt_content(agent_name, turn_path)
         if not content:
             # No agent prompt resolved: preserve the historical empty-string

{teddy_cli-0.1.17.dev1205 → teddy_cli-0.1.17.dev1207}/src/teddy_executor/core/services/session_service.py

@@ -61,10 +61,20 @@ class SessionService(ISessionManager):
             f"{session_root}/session.context", clean_context
         )
 
-        # 2. Prompt population — read from .teddy/prompts/ (canonical source)
-        prompt_filename, prompt_content = self._resolve_agent_prompt(options.agent_name)
+        # 2. Prompt population — compose the full system prompt and persist it.
+        # `_resolve_agent_prompt` validates the agent and resolves the target
+        # filename; `PromptManager.fetch_system_prompt` assembles the composed
+        # system prompt (agent-name header + agent XML + MRP). Because the
+        # session root is still empty here, this forces the compose path from
+        # `.teddy/prompts/`. Persisting the composed value makes the session
+        # root hold the exact prompt sent to the model, which later turns reuse
+        # verbatim (Option A).
+        prompt_filename, _raw_prompt = self._resolve_agent_prompt(options.agent_name)
+        composed_prompt = self._prompt_manager.fetch_system_prompt(
+            options.agent_name, Path(turn_dir)
+        )
         self._file_system_manager.write_file(
-            f"{session_root}/{prompt_filename}", prompt_content
+            f"{session_root}/{prompt_filename}", composed_prompt
         )
 
         # 3. Metadata persistence
@@ -524,9 +534,10 @@ class SessionService(ISessionManager):
 
     def set_session_agent(self, session_name: str, agent_name: str) -> None:
         """
-        Permanently changes the session's agent. Updates meta.yaml
-        with the new agent_name and replaces the session's prompt
-        XML with the new agent's prompt from .teddy/prompts/.
+        Permanently changes the session's agent. Updates meta.yaml with the
+        new agent_name and replaces the session's prompt XML with the
+        RECOMPOSED system prompt for the new agent (agent-name header + agent
+        XML + MRP), so later turns reuse it verbatim (Option A).
         """
         session_root = f".teddy/sessions/{session_name}"
         latest_turn_path = self.get_latest_turn(session_name)
@@ -536,12 +547,21 @@ class SessionService(ISessionManager):
         meta["agent_name"] = agent_name
         self.save_turn_meta(latest_turn_path, meta)
 
-        # 2. Find new prompt in .teddy/prompts/ (mirrors create_session pattern)
-        prompt_filename, prompt_content = self._resolve_agent_prompt(agent_name)
+        # 2. Resolve the target filename (validates the agent) and recompose the
+        #    full system prompt. Option A: switching agents must recompose
+        #    (agent-name header + agent XML + MRP) via the prompt manager and
+        #    persist THAT composed value -- never the raw `.teddy/prompts/`
+        #    content -- so later turns reuse it verbatim. Because the session
+        #    root does not yet hold the new agent's file, the prompt manager
+        #    takes the lazy-compose path from `.teddy/prompts/`.
+        prompt_filename, _raw_prompt = self._resolve_agent_prompt(agent_name)
+        composed_prompt = self._prompt_manager.fetch_system_prompt(
+            agent_name, Path(latest_turn_path)
+        )
 
         # 3. Write prompt to session root (overwrite any existing file with same stem)
         self._file_system_manager.write_file(
-            f"{session_root}/{prompt_filename}", prompt_content
+            f"{session_root}/{prompt_filename}", composed_prompt
         )
 
         # 4. Remove stale prompt files (any file in session root whose stem matches a