teddy-cli 0.1.17.dev1301__tar.gz → 0.1.17.dev1303__tar.gz

{teddy_cli-0.1.17.dev1301 → teddy_cli-0.1.17.dev1303}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1301"
+version = "0.1.17.dev1303"
 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.dev1301 → teddy_cli-0.1.17.dev1303}/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)
@@ -1146,7 +1168,7 @@ def handle_resume_session(  # noqa: PLR0913
 
         # 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}")
+        typer.echo(f"Resuming session: {session_relative_path}")
 
         # 5. Agent switch: if -a/--agent provided, update session agent permanently
         if agent:
@@ -1163,15 +1185,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.dev1301 → teddy_cli-0.1.17.dev1303}/src/teddy_executor/core/services/init_service.py

@@ -146,6 +146,35 @@ class InitService(IInitUseCase):
         """Returns a filename's case-folded stem for identity comparison."""
         return Path(filename).stem.casefold()
 
+    def _present_stems(self, dest_dir: str) -> set[str]:
+        """Returns the case-folded stems of every entry in ``dest_dir``.
+
+        Returns an empty set when ``dest_dir`` is absent, because the file-system
+        adapter raises ``FileNotFoundError`` when asked to list a missing
+        directory. Single-sources the directory scan shared by the prompt copy
+        routine and the drift check.
+        """
+        if not self._file_system.path_exists(dest_dir):
+            return set()
+        return {
+            self._stem_key(name) for name in self._file_system.list_directory(dest_dir)
+        }
+
+    def _entry_is_present(
+        self, target_path: str, filename: str, present_stems: set[str]
+    ) -> bool:
+        """True when the exact file OR a same-stem sibling exists in the directory.
+
+        ``present_stems`` carries the case-folded stems of the directory entries,
+        so a same-stem file under ANY extension counts as present. An empty set
+        means the caller disabled stem identity or the directory holds no
+        same-stem entry. Single-sources the stem-membership predicate shared by
+        the prompt copy routine and the drift check.
+        """
+        return self._file_system.path_exists(target_path) or (
+            self._stem_key(filename) in present_stems
+        )
+
     def _prune_same_stem(self, dest_dir: str, filename: str) -> None:
         """Removes same-stem files with a different name (stem identity).
 
@@ -183,20 +212,11 @@ class InitService(IInitUseCase):
         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()
-        )
+        present_stems = self._present_stems(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) or (
-                stem_identity and self._stem_key(fname) in same_stems
-            )
+            exists = self._entry_is_present(target_path, fname, present_stems)
             if not exists or (overwrite and fname not in create_only):
                 content = resolve_content(fname)
                 if content is not None:
@@ -353,6 +373,7 @@ class InitService(IInitUseCase):
         dest_dir: str,
         filenames: Sequence[str],
         resolve_bundled: Callable[[str], str | None],
+        stem_identity: bool = False,
     ) -> tuple[tuple[str, ...], tuple[str, ...]]:
         """Partitions ``filenames`` into (edited, missing) against bundled defaults.
 
@@ -360,14 +381,26 @@ class InitService(IInitUseCase):
         user copy exists, a bundled default is resolvable, and the two contents
         differ. Unresolvable bundled defaults are skipped (never reported as
         drift). Order is preserved from ``filenames`` for deterministic output.
+
+        When ``stem_identity`` is set (prompt checks only), a destination entry
+        sharing an entry's stem under ANY extension (e.g. a pre-migration
+        ``.xml``) counts as PRESENT and is reported as EDITED. Such a file
+        diverges from the bundled ``.md`` default, so it is not missing. This
+        mirrors the stem identity used by the prompt copy routine.
         """
         edited: list[str] = []
         missing: list[str] = []
+        present_stems = self._present_stems(dest_dir) if stem_identity else set()
         for fname in filenames:
             user_path = f"{dest_dir}/{fname}"
-            if not self._file_system.path_exists(user_path):
+            if not self._entry_is_present(user_path, fname, present_stems):
                 missing.append(fname)
                 continue
+            if not self._file_system.path_exists(user_path):
+                # Present only as a same-stem sibling (e.g. a stale ``.xml``);
+                # it diverges from the bundled ``.md`` default.
+                edited.append(fname)
+                continue
             bundled_content = resolve_bundled(fname)
             if bundled_content is None:
                 continue
@@ -389,6 +422,7 @@ class InitService(IInitUseCase):
             dest_dir=".teddy/prompts",
             filenames=_PROMPT_FILES,
             resolve_bundled=lambda fname: self._get_default_content(f"prompts/{fname}"),
+            stem_identity=True,
         )
         edited_templates, missing_templates = self._classify_drift(
             dest_dir="docs/templates",

{teddy_cli-0.1.17.dev1301 → teddy_cli-0.1.17.dev1303}/src/teddy_executor/resources/templates/vertical-slice.md

@@ -80,5 +80,10 @@ Free-form notes recording decisions, deviations, or discoveries during implement
 <!-- Do NOT include running automated tests here; those are covered by the automated test suite. -->
 
 **Format:**
-- [ ] **[Title]:** Run `command <args>` and verify output contains `expected output`.
-- [ ] **[Title]:** Navigate to `[View/Screen]`, trigger `[Action]`, and confirm `[Observed State/Element]`.
+- [ ] **Title:**
+    Run `command <args>`.
+    Verify output contains `expected output`.
+- [ ] **Title:**
+    Navigate to `[View/Screen]`.
+    Trigger `[Action]`.
+    Confirm `[Observed State/Element]`.