teddy-cli 0.1.17.dev1290__tar.gz → 0.1.17.dev1292__tar.gz

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: teddy-cli
-Version: 0.1.17.dev1290
+Version: 0.1.17.dev1292
 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.dev1290 → teddy_cli-0.1.17.dev1292}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1290"
+version = "0.1.17.dev1292"
 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.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/__main__.py

@@ -112,6 +112,31 @@ def _resolve_setup_api_key(
     return system_env.isatty() and not pipeline
 
 
+def _run_init_setup_gates(container) -> None:
+    """Run the interactive setup gates after ``teddy init`` scaffolding.
+
+    Bare ``teddy init`` and ``teddy init config`` scaffold (or reset) the
+    ``.teddy`` configuration, then run the SAME one-time setup as ``teddy
+    start``: the required LLM API-key prompt (when the key is missing and the
+    configured model requires one) and the optional editor selection (when no
+    editor is configured). Both gates reuse the existing preflight helpers, so
+    no prompt logic is duplicated. The gates are TTY-gated: a non-interactive
+    run (stdin is not a TTY) prompts for neither, keeping automated and CI
+    invocations clean.
+    """
+    from teddy_executor.adapters.inbound.session_cli_handlers import (
+        _ensure_api_key_configured,
+        _validate_editor_config,
+    )
+
+    system_env = container.resolve(ISystemEnvironment)
+    if not system_env.isatty():
+        return
+    config_service = container.resolve(IConfigService)
+    _ensure_api_key_configured(config_service, setup_api_key=True)
+    _validate_editor_config(container)
+
+
 def _ensure_project_initialized(container, root_dir: str | None = None) -> None:
     """Lazily performs project anchoring and initialization.
 
@@ -275,12 +300,13 @@ def init_callback(ctx: typer.Context):
     init_use_case = container.resolve(IInitUseCase)
     summary = init_use_case.ensure_initialized()
     typer.echo(f"TeDDy initialized in .teddy folder. {summary}")
+    _run_init_setup_gates(container)
 
 
 @init_app.command()
 def prompts():
     """
-    Overwrites bundled prompt XMLs in .teddy/prompts/ with defaults.
+    Overwrites bundled prompt Markdown files in .teddy/prompts/ with defaults.
     """
     from teddy_executor.core.ports.inbound.init import IInitUseCase
 
@@ -301,6 +327,7 @@ def config():
     init_use_case = container.resolve(IInitUseCase)
     status = init_use_case.ensure_config_initialized(overwrite=True)
     typer.echo(status)
+    _run_init_setup_gates(container)
 
 
 @init_app.command()
@@ -427,7 +454,8 @@ def get_prompt(
     Retrieves and displays the composed system prompt for a specified agent.
 
     The output matches the system prompt the agent actually receives: the
-    agent-name header, the agent-specific XML, and the shared MRP base prompt.
+    agent-specific content and the shared Markdown MRP base prompt, separated
+    by a Markdown horizontal rule.
     """
     from teddy_executor.adapters.inbound.cli_helpers import echo_and_copy
     from teddy_executor.core.ports.outbound.prompt_manager import IPromptManager

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/adapters/inbound/session_cli_handlers.py

@@ -17,7 +17,8 @@ from teddy_executor.core.ports.outbound.user_interactor import IUserInteractor
 from teddy_executor.core.ports.outbound.session_loop_guard import ISessionLoopGuard
 from teddy_executor.core.ports.outbound.config_service import IConfigService
 from teddy_executor.core.ports.outbound.session_repository import ISessionRepository
-from teddy_executor.core.utils.interrupt_guard import INTERRUPT_REASON, InterruptGuard
+from teddy_executor.core.utils.interrupt_guard import InterruptGuard
+from teddy_executor.core.utils.session_notices import format_interrupt_notice
 from teddy_executor.core.utils.string import canonical_agent_name, slugify
 from teddy_executor.adapters.inbound.cli_formatter import format_project_context
 from teddy_executor.adapters.inbound.cli_helpers import (
@@ -358,7 +359,10 @@ def _orchestrate_session_loop(  # noqa: PLR0913
             # the orchestrator's turn-transition path. EXIT the session so the
             # user regains control instead of auto-advancing to the next turn.
             if interrupt_guard.interrupted.is_set():
-                typer.secho(INTERRUPT_REASON, fg=typer.colors.YELLOW)
+                typer.secho(
+                    format_interrupt_notice(interrupt_guard.source),
+                    fg=typer.colors.YELLOW,
+                )
                 break
 
             cumulative_cost = float(report.metadata.get("cumulative_cost", 0.0))
@@ -376,7 +380,10 @@ def _orchestrate_session_loop(  # noqa: PLR0913
         # Immediate-exit semantics (Task Brief): Ctrl+C while nothing is in
         # flight (prompts, planning) terminates the session with a notice —
         # no report is generated and nothing is mutated.
-        typer.secho(INTERRUPT_REASON, fg=typer.colors.YELLOW)
+        typer.secho(
+            format_interrupt_notice(interrupt_guard.source),
+            fg=typer.colors.YELLOW,
+        )
     finally:
         # Caller-owned restoration contract: restore the SIGINT disposition
         # that preceded the guard's install() when the turn loop ends. Stop the
@@ -704,14 +711,11 @@ def _run_cli_preflight_check(
     from teddy_executor.core.ports.outbound.prompt_manager import IPromptManager
 
     # API-key setup runs BEFORE the LLM client is resolved so its transient
-    # config-service instance reads the freshly-persisted on-disk state.
+    # config-service instance reads the freshly-persisted on-disk state. The
+    # gate itself is single-sourced in ``_ensure_api_key_configured`` so the
+    # ``init`` command shares identical gating.
     config_service = container.resolve(IConfigService)
-    if (
-        setup_api_key
-        and _is_llm_api_key_missing(config_service)
-        and _llm_model_requires_api_key(config_service)
-    ):
-        _prompt_for_api_key(config_service)
+    _ensure_api_key_configured(config_service, setup_api_key)
 
     llm_client = container.resolve(ILlmClient)
     # Perform local validation only to ensure fast CLI startup.
@@ -743,6 +747,27 @@ def _run_cli_preflight_check(
     raise ConfigurationError(error_msg)
 
 
+def _ensure_api_key_configured(
+    config_service: IConfigService,
+    setup_api_key: Optional[bool],
+) -> None:
+    """Runs the interactive API-key gate when the key is missing and required.
+
+    The gate fires only when ``setup_api_key`` is truthy, the resolved
+    ``llm.api_key`` is absent or blank, AND the configured model actually
+    requires a provider key (key-requiredness is delegated to litellm). It is
+    ADDITIVE and inert by default (``setup_api_key`` of ``None``/``False`` ->
+    skip), so callers that never opt in are unaffected. Single-sourced so
+    ``_run_cli_preflight_check`` and the ``init`` command share identical gating.
+    """
+    if (
+        setup_api_key
+        and _is_llm_api_key_missing(config_service)
+        and _llm_model_requires_api_key(config_service)
+    ):
+        _prompt_for_api_key(config_service)
+
+
 def _is_llm_api_key_missing(config_service: IConfigService) -> bool:
     """True when the resolved ``llm.api_key`` is absent or blank.
 
@@ -801,7 +826,8 @@ def _prompt_for_api_key(config_service: IConfigService) -> None:
     typer.secho("LLM API Key", fg=typer.colors.CYAN, bold=True, err=True)
     typer.echo("", err=True)
     typer.secho(
-        "\u26a0 No LLM API key configured. Paste your provider key below.",
+        "\u26a0 No LLM API key configured. Paste your key below.\n"
+        "OpenRouter is the default provider. To use a different provider, change llm.model in .teddy/config.yaml.",
         fg=typer.colors.YELLOW,
         err=True,
     )

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/container.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import os
+import signal
 import time
 
 import punq
@@ -31,6 +33,20 @@ def create_container() -> punq.Container:
     return container
 
 
+def _record_quit_source(container: punq.Container) -> None:
+    """Record the bare-`q` source on the shared guard, then self-deliver SIGINT.
+
+    Invoked from the quit-key listener's reader thread when `q` is pressed.
+    Recording the source lets the boundary notice name `q` instead of the
+    default `Ctrl+C`; the self-delivered SIGINT then drives the shared guard's
+    already-tested WAITING/EXECUTING branch unchanged.
+    """
+    from teddy_executor.core.utils.interrupt_guard import InterruptGuard
+
+    container.resolve(InterruptGuard).record_source("q")
+    os.kill(os.getpid(), signal.SIGINT)
+
+
 def _register_services(container: punq.Container) -> None:
     """Registers core application services."""
     from teddy_executor.core.ports.inbound.edit_simulator import IEditSimulator
@@ -176,7 +192,9 @@ def _register_orchestration_services(container: punq.Container) -> None:
     # so ONE instance serves the boundary's install/restore window.
     container.register(
         IQuitKeyListener,
-        factory=lambda: TerminalQuitKeyListener(),
+        factory=lambda: TerminalQuitKeyListener(
+            on_quit=lambda: _record_quit_source(container)
+        ),
         scope=punq.Scope.singleton,
     )
     container.register(

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/domain/models/drift_report.py

@@ -13,7 +13,7 @@ from dataclasses import dataclass
 class DriftReport:
     """Immutable summary of user files that diverge from bundled defaults.
 
-    Each field holds the *basenames* (e.g. ``pathfinder.xml``) of the affected
+    Each field holds the *basenames* (e.g. ``pathfinder.md``) of the affected
     files, preserving the canonical manifest order for deterministic output.
     """
 

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/ports/inbound/init.py

@@ -23,7 +23,7 @@ class IInitUseCase(ABC):
     @abstractmethod
     def ensure_prompts_initialized(self, overwrite: bool = False) -> str:
         """
-        Ensures prompt XML files are present in the .teddy/prompts/ directory.
+        Ensures prompt Markdown files are present in the .teddy/prompts/ directory.
 
         Args:
             overwrite: If True, always overwrite existing prompt files with defaults.
@@ -69,7 +69,7 @@ class IInitUseCase(ABC):
         Compares the user's prompts and templates against the bundled defaults.
 
         Returns:
-            A DriftReport enumerating which ``.teddy/prompts/*.xml`` and
+            A DriftReport enumerating which ``.teddy/prompts/*.md`` and
             ``docs/templates/*.md`` files are edited or missing relative to the
             bundled defaults.
         """

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/ports/outbound/prompt_manager.py

@@ -41,9 +41,9 @@ class IPromptManager(ABC):
     def compose_system_prompt(self, _agent_name: str) -> Optional[str]:
         """Composes the full system prompt for an agent without a turn path.
 
-        Resolves the agent-specific content and assembles it (agent-name
-        header + agent XML + shared MRP base prompt). Returns ``None`` when no
-        content can be resolved.
+        Resolves the agent-specific content and assembles it (agent content +
+        ``---`` separator + shared Markdown MRP base prompt). Returns ``None``
+        when no content can be resolved.
         """
         ...
 

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/ports/outbound/session_manager.py

@@ -129,6 +129,6 @@ class ISessionManager(Protocol):
         """
         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/.
+        file with the new agent's prompt from .teddy/prompts/.
         """
         ...

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/services/init_service.py

@@ -1,7 +1,9 @@
 import logging
 import os
 from collections.abc import Callable, Sequence
+from dataclasses import dataclass
 from importlib import resources
+from pathlib import Path
 
 import yaml
 
@@ -53,20 +55,33 @@ _TEMPLATE_FILES = [
     "pre-commit.md",
 ]
 
-# Bundled prompt XMLs copied into a project's ``.teddy/prompts/`` by
+# Bundled Markdown prompts copied into a project's ``.teddy/prompts/`` by
 # ``_init_prompts`` and compared by ``check_drift``. Kept as a fixed manifest
 # (mirroring ``_TEMPLATE_FILES``) so the copy routine and the drift check share
 # one single source of truth.
 _PROMPT_FILES = [
-    "architect.xml",
-    "assistant.xml",
-    "debugger.xml",
-    "developer.xml",
-    "pathfinder.xml",
-    "prototyper.xml",
+    "architect.md",
+    "assistant.md",
+    "debugger.md",
+    "developer.md",
+    "pathfinder.md",
+    "prototyper.md",
 ]
 
 
+@dataclass(frozen=True)
+class _CopyPolicy:
+    """Optional copy behaviours for ``_copy_bundled_files``.
+
+    Groups the two optional behaviours (the config copy's create-only files and
+    the prompt copy's stem identity) so the shared helper keeps a small
+    signature, mirroring the project's ``*Ports`` dataclasses.
+    """
+
+    create_only: frozenset[str] = frozenset()
+    stem_identity: bool = False
+
+
 class InitService(IInitUseCase):
     """
     Service for initializing projects.
@@ -126,13 +141,30 @@ class InitService(IInitUseCase):
             return f"overwritten ({count} files)"
         return f"updated ({count} files)"
 
+    @staticmethod
+    def _stem_key(filename: str) -> str:
+        """Returns a filename's case-folded stem for identity comparison."""
+        return Path(filename).stem.casefold()
+
+    def _prune_same_stem(self, dest_dir: str, filename: str) -> None:
+        """Removes same-stem files with a different name (stem identity).
+
+        After writing ``filename`` into ``dest_dir``, any other entry sharing its
+        stem (e.g. a stale ``.xml`` beside the new ``.md``) is removed so two
+        same-stem files never coexist after a write.
+        """
+        stem = self._stem_key(filename)
+        for name in self._file_system.list_directory(dest_dir):
+            if name != filename and self._stem_key(name) == stem:
+                self._file_system.remove_file(f"{dest_dir}/{name}")
+
     def _copy_bundled_files(
         self,
         dest_dir: str,
         filenames: Sequence[str],
         resolve_content: Callable[[str], str | None],
         overwrite: bool,
-        create_only: frozenset[str] = frozenset(),
+        policy: _CopyPolicy = _CopyPolicy(),
     ) -> str:
         """Copies bundled resources into ``dest_dir`` via the file-system port.
 
@@ -141,17 +173,36 @@ class InitService(IInitUseCase):
         in ``create_only``, which are written only when absent. Content is
         supplied by ``resolve_content``; a ``None`` result silently skips a
         missing bundled resource. Returns the shared copy-result status string.
+
+        When ``stem_identity`` is set (prompt copies only), a destination entry
+        sharing an entry's stem under ANY extension counts as present, and an
+        overwrite removes any same-stem file with a different name so a stale
+        ``.xml`` is replaced by the new ``.md`` instead of being left beside it.
         """
+        create_only = policy.create_only
+        stem_identity = policy.stem_identity
         if not self._file_system.path_exists(dest_dir):
             self._file_system.create_directory(dest_dir)
+        same_stems = (
+            {
+                self._stem_key(name)
+                for name in self._file_system.list_directory(dest_dir)
+            }
+            if stem_identity
+            else set()
+        )
         count = 0
         for fname in filenames:
             target_path = f"{dest_dir}/{fname}"
-            exists = self._file_system.path_exists(target_path)
+            exists = self._file_system.path_exists(target_path) or (
+                stem_identity and self._stem_key(fname) in same_stems
+            )
             if not exists or (overwrite and fname not in create_only):
                 content = resolve_content(fname)
                 if content is not None:
                     self._file_system.write_file(target_path, content)
+                    if stem_identity:
+                        self._prune_same_stem(dest_dir, fname)
                     count += 1
         return self._format_init_status(count, overwrite)
 
@@ -188,11 +239,15 @@ class InitService(IInitUseCase):
             filenames=["config.yaml", ".gitignore", "init.context", ".env"],
             resolve_content=self._get_default_content,
             overwrite=overwrite,
-            create_only=_CREATE_ONLY_CONFIG_FILES,
+            policy=_CopyPolicy(create_only=_CREATE_ONLY_CONFIG_FILES),
         )
 
     def _init_prompts(self, overwrite: bool = False) -> str:
-        """Copies bundled prompt XMLs to .teddy/prompts/.
+        """Copies bundled Markdown prompts to .teddy/prompts/.
+
+        A destination file sharing a prompt's stem under any extension counts as
+        present; on ``overwrite`` the ``.md`` is written and any stale same-stem
+        file (e.g. a pre-migration ``.xml``) is removed.
 
         Args:
             overwrite: If True, always overwrite existing files. If False, only write missing ones.
@@ -205,6 +260,7 @@ class InitService(IInitUseCase):
             filenames=_PROMPT_FILES,
             resolve_content=lambda fname: self._get_default_content(f"prompts/{fname}"),
             overwrite=overwrite,
+            policy=_CopyPolicy(stem_identity=True),
         )
 
     def _init_templates(self, overwrite: bool = False) -> str:
@@ -247,7 +303,7 @@ class InitService(IInitUseCase):
 
     def ensure_prompts_initialized(self, overwrite: bool = True) -> str:
         """
-        Ensures prompt XML files are present in the .teddy/prompts/ directory.
+        Ensures prompt Markdown files are present in the .teddy/prompts/ directory.
 
         Args:
             overwrite: If True, always overwrite existing prompt files with defaults.
@@ -322,7 +378,7 @@ class InitService(IInitUseCase):
     def check_drift(self) -> DriftReport:
         """Compares the user's prompts and templates against bundled defaults.
 
-        Reports which ``.teddy/prompts/*.xml`` and ``docs/templates/*.md`` files
+        Reports which ``.teddy/prompts/*.md`` and ``docs/templates/*.md`` files
         have been EDITED away from their bundled default and which are MISSING,
         so the CLI preflight can advise ``teddy init prompts`` /
         ``teddy init templates``. An absent ``.teddy/prompts/`` directory simply

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/services/prompt_manager.py

@@ -8,15 +8,15 @@ import yaml
 from teddy_executor.core.ports.outbound.file_system_manager import IFileSystemManager
 from teddy_executor.core.ports.outbound.user_interactor import IUserInteractor
 from teddy_executor.core.ports.outbound.prompt_manager import IPromptManager
+from teddy_executor.core.utils.paths import prefer_markdown
 from teddy_executor.core.utils.serialization import scrub_dict_for_serialization
-from teddy_executor.core.utils.string import canonical_agent_name
 
 # The bundled Markdown Response Protocol base prompt. It lives OUTSIDE
 # ``config/prompts/`` so it is never grouped with the user-overridable agent
 # prompts, and is loaded as a package resource rather than via the file system
 # port.
 _MRP_PACKAGE = "teddy_executor.resources"
-_MRP_FILENAME = "MRP.xml"
+_MRP_FILENAME = "MRP.md"
 
 
 class PromptManager(IPromptManager):
@@ -34,7 +34,7 @@ class PromptManager(IPromptManager):
         self._user_interactor = user_interactor
         # Injectable resource seam: a Traversable (or any object exposing the
         # ``Traversable`` contract — ``is_file`` + ``read_text``) that anchors
-        # ``MRP.xml``. When ``None``, the bundled package resource is resolved
+        # ``MRP.md``. When ``None``, the bundled package resource is resolved
         # lazily. Tests inject a real ``pathlib.Path`` to avoid global patching.
         self._mrp_resource_root = mrp_resource_root
 
@@ -87,16 +87,26 @@ class PromptManager(IPromptManager):
         return resolved
 
     def _find_prompt_file(self, directory: str, agent_name: str) -> Optional[str]:
-        """Searches a directory for a file with the given agent name (any extension)."""
+        """Searches a directory for a file with the given agent name.
+
+        Extension-agnostic, but when several files share the stem the Markdown
+        file wins so a pre-authored ``.md`` prompt overrides a stale ``.xml``
+        regardless of directory listing order.
+        """
         if not self._file_system_manager.path_exists(directory):
             return None
-        for f in self._file_system_manager.list_directory(directory):
-            if Path(f).stem.casefold() == agent_name.casefold():
-                return f"{directory}/{f}"
-        return None
+        matches = [
+            f
+            for f in self._file_system_manager.list_directory(directory)
+            if Path(f).stem.casefold() == agent_name.casefold()
+        ]
+        preferred = prefer_markdown(matches)
+        if preferred is None:
+            return None
+        return f"{directory}/{preferred}"
 
     def _resolve_agent_prompt_content(self, agent_name: str, turn_path: Path) -> str:
-        """Resolves the agent-specific prompt XML from the canonical
+        """Resolves the agent-specific prompt content from the canonical
         ``.teddy/prompts/`` directory (the user-editable source).
 
         Returns an empty string (with a warning) when no prompt file is found,
@@ -155,27 +165,27 @@ class PromptManager(IPromptManager):
             # contract (no header, no MRP) rather than fabricating a prompt.
             return ""
 
-        return self._assemble_composed_prompt(agent_name, content)
+        return self._assemble_composed_prompt(content)
 
-    def _assemble_composed_prompt(self, agent_name: str, content: str) -> str:
-        """Assembles a composed system prompt from an agent name and content.
+    def _assemble_composed_prompt(self, content: str) -> str:
+        """Assembles a composed system prompt from agent content.
 
-        Prepends the canonical agent-name header, then appends the shared MRP
-        base prompt AFTER the agent-specific content. A resolved prompt that
-        already carries its own ``<response_format>`` (e.g. a customized
-        ``.teddy/prompts/`` override) keeps the header but skips the MRP block.
+        Appends the shared MRP base prompt AFTER the agent-specific content,
+        separated by a Markdown horizontal rule (``---``) padded by a blank line
+        above and below. A resolved prompt that already carries its own
+        ``<response_format>`` (e.g. a customized ``.teddy/prompts/`` override) is
+        returned UNCHANGED, without the MRP block or the separator.
         """
-        assembled = f"Agent Name: {canonical_agent_name(agent_name)}\n\n{content}"
-
         # Legacy compatibility: a resolved prompt that already carries its own
         # response format (e.g. a customized ``.teddy/prompts/`` override) is
-        # returned without the shared MRP block, but keeps the agent-name header.
+        # returned unchanged, without the shared MRP block.
         if "<response_format>" in content:
-            return assembled
+            return content
 
-        # Both the agent-specific XML and the MRP block live inside the
-        # assembled ``<system>`` prompt; MRP is appended AFTER the agent content.
-        return f"{assembled}\n\n{self._load_mrp_base_prompt()}"
+        # Both the agent content and the MRP block live inside the assembled
+        # ``<system>`` prompt; MRP is appended AFTER the agent content, separated
+        # by a Markdown horizontal rule padded by a blank line above and below.
+        return f"{content}\n\n---\n\n{self._load_mrp_base_prompt()}"
 
     def compose_system_prompt(self, agent_name: str) -> Optional[str]:
         """Composes the full system prompt for an agent WITHOUT a turn path.
@@ -187,7 +197,7 @@ class PromptManager(IPromptManager):
         content = self.get_prompt_content(agent_name)
         if not content:
             return None
-        return self._assemble_composed_prompt(agent_name, content)
+        return self._assemble_composed_prompt(content)
 
     def log_telemetry(self, token_count: Any, turn_cost: Any) -> float:
         def safe_float(v: Any, default: float = 0.0) -> float:

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/services/session_orchestrator.py

@@ -14,6 +14,7 @@ from teddy_executor.core.ports.inbound.run_plan_use_case import IRunPlanUseCase
 from teddy_executor.core.ports.outbound.file_system_manager import IFileSystemManager
 from teddy_executor.core.services.session_replanner import SessionReplanner
 from teddy_executor.core.utils.io import Tee as _Tee
+from teddy_executor.core.utils.session_notices import format_termination_notice
 from teddy_executor.core.utils.terminal import emit_user_message
 import typer
 
@@ -304,12 +305,10 @@ class SessionOrchestrator(IRunPlanUseCase):
                 )
                 if user_reply is not None and not user_reply.strip():
                     typer.secho(
-                        "\nSession terminated (empty message).",
-                        fg=typer.colors.RED,
-                        err=True,
-                    )
-                    typer.secho(
-                        "To continue the session, use `teddy resume [session_path]`.",
+                        format_termination_notice(
+                            "Session terminated (empty message)."
+                        ),
+                        fg=typer.colors.YELLOW,
                         err=True,
                     )
                     return None  # type: ignore
@@ -334,9 +333,9 @@ class SessionOrchestrator(IRunPlanUseCase):
             elif is_session and plan_path:
                 report = self._handle_aborted_session(report, plan)
                 if report is None:
-                    typer.secho("\nSession terminated.", fg=typer.colors.RED, err=True)
                     typer.secho(
-                        "To continue the session, use `teddy resume [session_path]`.",
+                        format_termination_notice("Session terminated."),
+                        fg=typer.colors.YELLOW,
                         err=True,
                     )
                     return None  # type: ignore

{teddy_cli-0.1.17.dev1290 → teddy_cli-0.1.17.dev1292}/src/teddy_executor/core/services/session_service.py

@@ -17,7 +17,7 @@ from teddy_executor.core.ports.outbound.session_manager import (
 from teddy_executor.core.ports.outbound.session_repository import ISessionRepository
 from teddy_executor.core.ports.outbound.prompt_manager import IPromptManager
 from teddy_executor.core.ports.outbound.time_service import ITimeService
-from teddy_executor.core.utils.paths import normalize_resource_path
+from teddy_executor.core.utils.paths import normalize_resource_path, prefer_markdown
 from teddy_executor.core.utils.string import canonical_agent_name, slugify
 
 
@@ -65,7 +65,7 @@ class SessionService(ISessionManager):
         # 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
+        # system prompt (agent content + `---` separator + 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
@@ -166,11 +166,12 @@ class SessionService(ISessionManager):
                 )
             raise ValueError(msg)
 
-        prompt_filename = None
-        for f in self._file_system_manager.list_directory(prompts_dir):
-            if Path(f).stem.casefold() == agent_name.casefold():
-                prompt_filename = f
-                break
+        matches = [
+            f
+            for f in self._file_system_manager.list_directory(prompts_dir)
+            if Path(f).stem.casefold() == agent_name.casefold()
+        ]
+        prompt_filename = prefer_markdown(matches)
 
         if prompt_filename is None:
             available = self._prompt_manager.get_available_agents()
@@ -523,9 +524,9 @@ 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
-        RECOMPOSED system prompt for the new agent (agent-name header + agent
-        XML + MRP), so later turns reuse it verbatim (Option A).
+        new agent_name and replaces the session's prompt file with the
+        RECOMPOSED system prompt for the new agent (agent content + `---`
+        separator + 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)
@@ -537,7 +538,7 @@ class SessionService(ISessionManager):
 
         # 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
+        #    (agent content + `---` separator + 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