teddy-cli 0.1.17.dev1302__tar.gz → 0.1.17.dev1306__tar.gz

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: teddy-cli
-Version: 0.1.17.dev1302
+Version: 0.1.17.dev1306
 Summary: The local-first, test-driven agentic engineering harness. Because you should own the means of development.
 Author: Raphael Atteritano
 License: AGPL-3.0-only

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1302"
+version = "0.1.17.dev1306"
 description = "The local-first, test-driven agentic engineering harness. Because you should own the means of development."
 readme = "README.md"
 keywords = [

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/adapters/inbound/session_cli_handlers.py

@@ -241,6 +241,71 @@ def _run_health_checks() -> None:
     _check_git_initialized()
 
 
+def _start_background_update_check(container: Container) -> list[str]:
+    """Start the non-blocking version check and report the update-check keys.
+
+    Both session entry points share this preamble: it spawns the daemon
+    version-fetch thread, then emits the cached update notification (if any).
+    The returned list names the checks that fired so the shared disable-footer
+    can report them.
+    """
+    import threading
+
+    cache_path = find_project_root() / ".teddy" / ".update_cache.json"
+    thread = threading.Thread(
+        target=background_check,
+        args=(cache_path,),
+        daemon=True,
+    )
+    thread.start()
+    return _display_update_notification(container, cache_path)
+
+
+def _run_startup_preamble(
+    container: Container,
+    fired: list[str],
+    agent: Optional[str] = None,
+    setup_editor: Optional[bool] = None,
+    setup_api_key: Optional[bool] = None,
+) -> None:
+    """Run the shared startup preamble for both session entry points.
+
+    The order is fixed so the banner layout cannot drift: health checks, the
+    ``Checking configurations...`` line, the preflight check (whose returned
+    keys extend ``fired``), then the shared disable-footer. ``start`` forwards
+    its ``agent`` so the preflight validates the agent prompt; ``resume``
+    leaves it ``None`` and validates no agent.
+    """
+    _run_health_checks()
+    typer.echo("Checking configurations...", err=True)
+    fired.extend(
+        _run_cli_preflight_check(
+            container,
+            agent=agent,
+            setup_editor=setup_editor,
+            setup_api_key=setup_api_key,
+        )
+    )
+    _display_checks_footer(fired)
+
+
+def _handle_startup_error(container: Container, error: Exception) -> None:
+    """Print a startup error and exit with code 1 (shared by both entry points).
+
+    A ``ConfigurationError`` additionally prints the configuration path hint.
+    """
+    from teddy_executor.core.domain.models.exceptions import ConfigurationError
+
+    if isinstance(error, ConfigurationError):
+        config_service = container.resolve(IConfigService)
+        config_path = config_service.get_config_path()
+        typer.echo(f"Error: {error}", err=True)
+        typer.echo(f"Please update your configuration at: {config_path}", err=True)
+    else:
+        typer.echo(f"Error: {error}", err=True)
+    raise typer.Exit(code=1)
+
+
 def _determine_session_name(name: Optional[str], message: Optional[str]) -> str:
     """Determine session name (slugify message if name is missing)."""
     if name:
@@ -565,17 +630,7 @@ def handle_new_session(  # noqa: PLR0913
     setup_api_key: Optional[bool] = None,
 ):
     """Logic for the 'start' command."""
-    import threading
-
-    # Start non-blocking background version check
-    cache_path = find_project_root() / ".teddy" / ".update_cache.json"
-    thread = threading.Thread(
-        target=background_check,
-        args=(cache_path,),
-        daemon=True,
-    )
-    thread.start()
-    fired = _display_update_notification(container, cache_path)
+    fired = _start_background_update_check(container)
 
     try:
         # 0. Pipeline mode requires an initial message
@@ -587,20 +642,14 @@ def handle_new_session(  # noqa: PLR0913
         # 1. Ensure project is initialized
         container.resolve(IInitUseCase).ensure_initialized()
 
-        # 2. Health checks (advisory, non-blocking)
-        _run_health_checks()
-
-        # 2. Pre-flight checks (Fail-fast before user interaction)
-        typer.echo("Checking configurations...", err=True)
-        fired.extend(
-            _run_cli_preflight_check(
-                container,
-                agent=agent,
-                setup_editor=setup_editor,
-                setup_api_key=setup_api_key,
-            )
+        # 2. Shared startup preamble (health checks + preflight + footer)
+        _run_startup_preamble(
+            container,
+            fired,
+            agent=agent,
+            setup_editor=setup_editor,
+            setup_api_key=setup_api_key,
         )
-        _display_checks_footer(fired)
         _echo_config_success(container, agent, model=model)
 
         session_manager: ISessionManager = container.resolve(ISessionManager)
@@ -635,18 +684,7 @@ def handle_new_session(  # noqa: PLR0913
         )
 
     except Exception as e:
-        from teddy_executor.core.domain.models.exceptions import ConfigurationError
-
-        if isinstance(e, ConfigurationError):
-            from teddy_executor.core.ports.outbound.config_service import IConfigService
-
-            config_service = container.resolve(IConfigService)
-            config_path = config_service.get_config_path()
-            typer.echo(f"Error: {e}", err=True)
-            typer.echo(f"Please update your configuration at: {config_path}", err=True)
-        else:
-            typer.echo(f"Error: {e}", err=True)
-        raise typer.Exit(code=1)
+        _handle_startup_error(container, e)
 
 
 def _echo_config_success(
@@ -1109,32 +1147,16 @@ def handle_resume_session(  # noqa: PLR0913
     setup_api_key: Optional[bool] = None,
 ):
     """Logic for the 'resume' command."""
-    import threading
-
-    # Start non-blocking background version check
-    cache_path = find_project_root() / ".teddy" / ".update_cache.json"
-    thread = threading.Thread(
-        target=background_check,
-        args=(cache_path,),
-        daemon=True,
-    )
-    thread.start()
-    fired = _display_update_notification(container, cache_path)
+    fired = _start_background_update_check(container)
 
     try:
-        # 1. Health checks (advisory, non-blocking)
-        _run_health_checks()
-
-        # 2. Pre-flight checks
-        typer.echo("Checking configurations...", err=True)
-        fired.extend(
-            _run_cli_preflight_check(
-                container,
-                setup_editor=setup_editor,
-                setup_api_key=setup_api_key,
-            )
+        # 1. Shared startup preamble (health checks + preflight + footer)
+        _run_startup_preamble(
+            container,
+            fired,
+            setup_editor=setup_editor,
+            setup_api_key=setup_api_key,
         )
-        _display_checks_footer(fired)
 
         # 2. Resolve session name
         session_name = _resolve_session_name(container, path)
@@ -1144,9 +1166,12 @@ def handle_resume_session(  # noqa: PLR0913
             container, session_name, model=model, api_key=api_key, agent=agent
         )
 
-        # 4. Display session path (below the Agent/Model identity block)
-        session_relative_path = str(Path(".teddy") / "sessions" / session_name)
-        typer.echo(f"\nResuming session: {session_relative_path}")
+        # 4. Display session path (below the Agent/Model identity block).
+        # `.as_posix()` keeps the banner separator-identical on every OS
+        # (Windows would otherwise emit backslashes) and matches the POSIX
+        # f-string that `create_session` returns for the `start` banner.
+        session_relative_path = (Path(".teddy") / "sessions" / session_name).as_posix()
+        typer.echo(f"Resuming session: {session_relative_path}")
 
         # 5. Agent switch: if -a/--agent provided, update session agent permanently
         if agent:
@@ -1163,15 +1188,4 @@ def handle_resume_session(  # noqa: PLR0913
         )
 
     except Exception as e:
-        from teddy_executor.core.domain.models.exceptions import ConfigurationError
-
-        if isinstance(e, ConfigurationError):
-            from teddy_executor.core.ports.outbound.config_service import IConfigService
-
-            config_service = container.resolve(IConfigService)
-            config_path = config_service.get_config_path()
-            typer.echo(f"Error: {e}", err=True)
-            typer.echo(f"Please update your configuration at: {config_path}", err=True)
-        else:
-            typer.echo(f"Error: {e}", err=True)
-        raise typer.Exit(code=1)
+        _handle_startup_error(container, e)

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/core/services/context_service.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Dict, List, Optional, Sequence
 from teddy_executor.core.domain.models import ProjectContext, ContextItem
 from teddy_executor.core.utils.markdown import (
-    get_fence_for_content,
+    embed_in_fence,
     get_language_from_path,
     is_session_file_path,
     get_session_history_display_name,
@@ -396,8 +396,7 @@ class ContextService(IGetContextUseCase):
             content = file_contents.get(path)
             if content is not None:
                 lang = get_language_from_path(path)
-                fence = get_fence_for_content(content)
-                parts.append(f"{fence}{lang}\n{content}\n{fence}")
+                parts.append(embed_in_fence(content, lang))
             else:
                 parts.append("```\n--- FILE NOT FOUND ---\n```")
         return parts
@@ -471,7 +470,6 @@ class ContextService(IGetContextUseCase):
             content = file_contents.get(path) or ""
             content_str = content.strip()
             lang = get_language_from_path(path)
-            fence = get_fence_for_content(content_str)
             parts.append(f"\n### {disp_name}")
-            parts.append(f"{fence}{lang}\n{content_str}\n{fence}")
+            parts.append(embed_in_fence(content_str, lang))
         return parts

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/core/services/markdown_report_formatter.py

@@ -7,7 +7,7 @@ from teddy_executor.core.ports.outbound.markdown_report_formatter import (
     IMarkdownReportFormatter,
 )
 from teddy_executor.core.utils.markdown import (
-    get_fence_for_content,
+    embed_in_fence,
     get_language_from_path,
 )
 
@@ -37,7 +37,7 @@ class MarkdownReportFormatter(IMarkdownReportFormatter):
                 autoescape=False,  # nosec B701
             )
             env.filters["basename"] = os.path.basename
-            env.filters["fence"] = get_fence_for_content
+            env.filters["embed_fence"] = embed_in_fence
             env.filters["language_from_path"] = get_language_from_path
 
             MarkdownReportFormatter._cached_env = env

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/core/services/parser_reporting.py

@@ -10,7 +10,7 @@ from teddy_executor.core.services.parser_infrastructure import (
 
 if TYPE_CHECKING:
     from mistletoe.block_token import Document
-from teddy_executor.core.utils.markdown import get_fence_for_content
+from teddy_executor.core.utils.markdown import embed_in_fence
 
 # Maximum length for AST node previews in error reports
 MAX_PREVIEW_LENGTH = 60
@@ -48,9 +48,10 @@ def _format_expected_structure() -> str:
         "[004] Heading (Level 2: Action Plan) —or— Heading (Level 2: Message)",
         "[005...] (If Action Plan) Heading (Level 3: Action Type) and (Action-specific AST nodes)",
     ]
-    content = "\n".join(lines) + "\n"
-    fence = get_fence_for_content(content)
-    return f"### Expected Response Structure (MRP) \n{fence}text\n{content}{fence}\n"
+    content = "\n".join(lines)
+    return (
+        f"### Expected Response Structure (MRP) \n{embed_in_fence(content, 'text')}\n"
+    )
 
 
 def format_node_name(node: Any) -> str:
@@ -137,9 +138,9 @@ def format_hybrid_ast_view(
     error_ids = {id(e.offending_node) for e in errors if e.offending_node}
     error_map = {id(e.offending_node): e.message for e in errors if e.offending_node}
     ast_text = _render_ast_view(doc, error_ids, error_map)
+    body = ast_text.rstrip("\n")
 
-    fence = get_fence_for_content(ast_text)
-    return f"### Plan AST with Highlighted Failures\n{fence}text\n{ast_text}{fence}\n"
+    return f"### Plan AST with Highlighted Failures\n{embed_in_fence(body, 'text')}\n"
 
 
 def get_action_type_from_node(plan: Plan, offending_node: Any) -> str:
@@ -270,8 +271,8 @@ def format_structural_mismatch_msg(
 
     cutoff = _get_failure_cutoff_idx(children, mismatch_idx, offending_ids)
     ast_text = _render_ast_view(doc, error_ids_set, error_map, cutoff)
-    fence = get_fence_for_content(ast_text)
-    msg += f"{fence}text\n{ast_text}{fence}\n"
+    body = ast_text.rstrip("\n")
+    msg += f"{embed_in_fence(body, 'text')}\n"
 
     msg += "\n**Hint:** Parsing often fails due to improper Code Block Formatting.\n"
     return msg

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/core/services/session_lifecycle_manager.py

@@ -17,7 +17,7 @@ from teddy_executor.core.ports.inbound.plan_parser import InvalidPlanError
 from teddy_executor.core.ports.inbound.run_plan_use_case import IRunPlanUseCase
 from teddy_executor.core.ports.outbound.session_manager import SessionState
 from teddy_executor.core.utils.io import Tee as _Tee
-from teddy_executor.core.utils.markdown import get_fence_for_content
+from teddy_executor.core.utils.markdown import embed_in_fence
 
 logger = logging.getLogger(__name__)
 
@@ -241,8 +241,7 @@ class SessionLifecycleManager:
             f"Cannot append user request: report not found at {report_path}"
         )
         content = str(self._file_system_manager.read_file(report_path)).rstrip("\n")
-        fence = get_fence_for_content(message)
-        content += f"\n\n## User Request\n{fence}text\n{message}\n{fence}\n"
+        content += f"\n\n## User Request\n{embed_in_fence(message, 'text')}\n"
         self._file_system_manager.write_file(report_path, content)
 
     def _consume_awaiting_reply(  # noqa: PLR0913

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/core/services/templates/execution_report.md.j2

@@ -15,9 +15,7 @@
 {% else %}
 ### [{{ path }}]({% if not path.startswith('/') %}/{% endif %}{{ path }})
 {% endif %}
-{{ content | fence }}{{ path | language_from_path }}
-{{ content }}
-{{ content | fence }}
+{{ content | embed_fence(path | language_from_path) }}
 {% endmacro %}
 
 {% macro render_action_summary(log) %}
@@ -63,36 +61,26 @@
 {% if log.action_type.upper() == 'MESSAGE' and log.details %}
 {% if log.details is mapping and log.details.get('content') %}
 - **User Reply:**
-{{ log.details.content | trim | fence }}
-{{ log.details.content | trim }}
-{{ log.details.content | trim | fence }}
+{{ log.details.content | trim | embed_fence('') }}
 {% else %}
 - **User Reply:**
-{{ log.details | trim | fence }}
-{{ log.details | trim }}
-{{ log.details | trim | fence }}
+{{ log.details | trim | embed_fence('') }}
 {% endif %}
 
 {% elif log.details and log.details is mapping -%}
 {% if log.details.get("stdout") -%}
 #### `stdout`
-{{ log.details.stdout | trim | fence }}text
-{{ log.details.stdout | trim }}
-{{ log.details.stdout | trim | fence }}
+{{ log.details.stdout | trim | embed_fence('text') }}
 
 {% endif -%}
 {% if log.details.get("stderr") -%}
 #### `stderr`
-{{ log.details.stderr | trim | fence }}text
-{{ log.details.stderr | trim }}
-{{ log.details.stderr | trim | fence }}
+{{ log.details.stderr | trim | embed_fence('text') }}
 
 {% endif -%}
 {% if log.details.get("diff") -%}
 #### `diff`
-{{ log.details.diff | trim | fence }}diff
-{{ log.details.diff | trim }}
-{{ log.details.diff | trim | fence }}
+{{ log.details.diff | trim | embed_fence('diff') }}
 
 {% endif -%}
 {% endif %}
@@ -229,9 +217,7 @@
   {% if cmd %}
 
 - **Command:** {% if '\n' in cmd %}
-{{ '\n' }}{{ cmd | fence }}shell
-{{ cmd }}
-{{ cmd | fence }}
+{{ '\n' }}{{ cmd | embed_fence('shell') }}
 {% else %}`{{ cmd }}`{% endif %}
   {% endif %}
 
@@ -280,9 +266,7 @@ _**Hint:** NOW you MUST use READ on the most promising results_
 {% endif %}
 
 {% if log in report_ns.inline_logs %}
-{{ log.details.content | trim | fence }}
-{{ log.details.content | trim }}
-{{ log.details.content | trim | fence }}
+{{ log.details.content | trim | embed_fence('') }}
 {% endif %}
 
 {{ render_action_blocks(log) }}
@@ -299,7 +283,5 @@ _**Hint:** NOW you MUST use READ on the most promising results_
 {% if report.user_request %}
 
 ## User Request
-{{ report.user_request | fence }}text
-{{ report.user_request }}
-{{ report.user_request | fence }}
+{{ report.user_request | embed_fence('text') }}
 {% endif %}

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/core/services/validation_rules/edit.py

@@ -22,7 +22,7 @@ from teddy_executor.core.services.validation_rules.helpers import (
     resolve_similarity_threshold,
     validate_path_is_safe,
 )
-from teddy_executor.core.utils.markdown import get_fence_for_content
+from teddy_executor.core.utils.markdown import embed_in_fence
 
 
 class EditActionValidator(BaseActionValidator):
@@ -137,7 +137,7 @@ def _validate_single_edit(
         effective_threshold = (
             threshold if threshold is not None else DEFAULT_SIMILARITY_THRESHOLD
         )
-        fence = get_fence_for_content(find_block)
+        find_embed = embed_in_fence(find_block, "")
 
         if is_ambiguous and not match_all and score >= effective_threshold:
             errors.append(
@@ -146,7 +146,7 @@ def _validate_single_edit(
                         f"The `FIND` block is ambiguous in: {file_path}\n"
                         f"**Similarity Score:** {score:.2f}\n"
                         f"**FIND Block:**\n"
-                        f"{fence}\n{find_block}\n{fence}\n"
+                        f"{find_embed}\n"
                         "**Hint:** Please provide a larger FIND block to uniquely identify the section, refactor the code to avoid duplication. Alternatively you can use `Match All: true` to change all occurrences in the file at once."
                     ),
                     file_path=str(file_path),
@@ -159,16 +159,15 @@ def _validate_single_edit(
                 f"**Similarity Score:** {score:.2f}\n"
                 f"**Similarity Threshold:** {effective_threshold:.2f}\n"
                 f"**FIND Block:**\n"
-                f"{fence}\n{find_block}\n{fence}\n"
+                f"{find_embed}\n"
             )
             if diff_text:
                 # Prepend standard diff headers for high-clarity diagnostics
                 # ndiff(find, actual) means '-' is Provided and '+' is Actual
                 formatted_diff = f"--- Provided\n+++ Actual\n{diff_text}"
-                diff_fence = get_fence_for_content(formatted_diff)
                 error_msg += (
-                    f"**Closest Match Diff:**\n{diff_fence}diff\n"
-                    f"{formatted_diff}\n{diff_fence}\n"
+                    f"**Closest Match Diff:**\n"
+                    f"{embed_in_fence(formatted_diff, 'diff')}\n"
                 )
 
             hint = _get_already_applied_hint(

{teddy_cli-0.1.17.dev1302 → teddy_cli-0.1.17.dev1306}/src/teddy_executor/core/utils/markdown.py

@@ -85,6 +85,60 @@ def get_fence_for_content(content: str) -> str:
     return "`" * fence_length
 
 
+# A Markdown code fence: up to 3 leading spaces, then a run of 3+ backticks or
+# tildes, then an optional info string (opening) or trailing whitespace (closing).
+_FENCE_RE = re.compile(r"^ {0,3}(`{3,}|~{3,})(.*)$")
+
+
+def strip_trailing_open_fence(content: str) -> str:
+    """Remove a trailing, UNCLOSED opening code fence from ``content``.
+
+    Walks the fence structure: if the content ends INSIDE an open code block,
+    that dangling opening fence line is removed. Balanced content -- including a
+    legitimate nested fence (a 4-backtick fence wrapping a 3-backtick fence) --
+    is returned byte-for-byte unchanged.
+    """
+    lines = content.split("\n")
+    open_char: str | None = None
+    open_len = 0
+    open_index: int | None = None
+
+    for index, line in enumerate(lines):
+        match = _FENCE_RE.match(line)
+        if match is None:
+            continue
+        fence = match.group(1)
+        info = match.group(2)
+        if open_char is None:
+            # Opening fence (any run >= 3 starts a block).
+            open_char = fence[0]
+            open_len = len(fence)
+            open_index = index
+        elif fence[0] == open_char and len(fence) >= open_len and not info.strip():
+            # Closing fence: same char, run at least as long, no info string.
+            open_char = None
+            open_len = 0
+            open_index = None
+
+    if open_index is None:
+        return content
+    # The content ends inside an open block: strip the dangling opening fence.
+    del lines[open_index]
+    return "\n".join(lines)
+
+
+def embed_in_fence(content: str, lang: str) -> str:
+    """Sanitize ``content``, then wrap it in a safe, dynamically-sized fence.
+
+    Strips a trailing UNCLOSED fence BEFORE deriving the wrapper fence, so a
+    degenerate run cannot amplify the wrapper. The wrapper fence is sized from
+    the sanitized content, so it can never collide with content fences.
+    """
+    sanitized = strip_trailing_open_fence(content)
+    fence = get_fence_for_content(sanitized)
+    return f"{fence}{lang}\n{sanitized}\n{fence}"
+
+
 def get_session_history_display_name(path: str) -> str | None:
     """
     Returns human-readable display name if it's a recognized session history file.