teddy-cli 0.1.17.dev1217__tar.gz → 0.1.17.dev1219__tar.gz

{teddy_cli-0.1.17.dev1217 → teddy_cli-0.1.17.dev1219}/PKG-INFO

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

@@ -1,6 +1,6 @@
 [project]
 name = "teddy-cli"
-version = "0.1.17.dev1217"
+version = "0.1.17.dev1219"
 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.dev1217 → teddy_cli-0.1.17.dev1219}/src/teddy_executor/adapters/inbound/session_cli_handlers.py

@@ -369,55 +369,109 @@ def _orchestrate_session_loop(
         signal.signal(signal.SIGINT, previous_handler)
 
 
-def _display_drift_notification(container: Container) -> None:
+def _format_drift_clause(
+    noun_singular: str,
+    noun_plural: str,
+    target_dir: str,
+    edited: Sequence[str],
+    missing: Sequence[str],
+) -> str:
+    """Builds the count-aware 'what drifted' clause for ONE notification channel.
+
+    Distinguishes CHANGED from MISSING files and singularises on a single file,
+    e.g. ``2 prompts in .teddy/prompts/ differ from this version's defaults``,
+    ``1 prompt in .teddy/prompts/ is missing``, or ``3 prompts in .teddy/prompts/
+    differ from this version's defaults (1 changed, 2 missing)``.
+    """
+    changed = len(edited)
+    missing_count = len(missing)
+    total = changed + missing_count
+    noun = noun_singular if total == 1 else noun_plural
+    if changed and missing_count:
+        differ = "differs" if total == 1 else "differ"
+        return (
+            f"{total} {noun} in {target_dir} {differ} from this version's defaults "
+            f"({changed} changed, {missing_count} missing)"
+        )
+    if changed:
+        differ = "differs" if total == 1 else "differ"
+        return f"{total} {noun} in {target_dir} {differ} from this version's defaults"
+    is_are = "is" if total == 1 else "are"
+    return f"{total} {noun} in {target_dir} {is_are} missing"
+
+
+def _display_drift_notification(container: Container) -> list[str]:
     """Advises the restore command when user prompts/templates have drifted.
 
     Compares the user's ``.teddy/prompts/`` and ``docs/templates/`` against the
-    bundled defaults (via ``IInitUseCase.check_drift``) and, when they have
-    drifted (edited or missing), emits a yellow, actionable advice naming the
-    restore command(s). Advisory only: it runs on the preflight HEALTHY path and
-    never blocks the session. Gated by the checks.prompts_templates config
-    toggle (defaults to enabled).
+    bundled defaults (via ``IInitUseCase.check_drift``) and, for EACH channel that
+    is BOTH enabled AND drifted, emits exactly ONE yellow, count-aware advice line
+    naming the restore command. The prompts channel is emitted before the
+    templates channel. Returns the list of config keys whose check actually fired
+    (``checks.prompts`` / ``checks.templates``) so a shared disable-footer can
+    name them. Advisory only: it runs on the preflight HEALTHY path and never
+    blocks the session. Each channel is gated by its own config toggle
+    (``checks.prompts`` / ``checks.templates``), both defaulting to enabled.
     """
     config = container.resolve(IConfigService)
-    if not config.get_setting("checks.prompts_templates", True):
-        return
-
     report = container.resolve(IInitUseCase).check_drift()
-    if not report.has_drift:
-        return
-
-    commands: list[str] = []
-    if report.prompts_drifted:
-        commands.append("teddy init prompts")
-    if report.templates_drifted:
-        commands.append("teddy init templates")
-
-    typer.echo(
-        typer.style(
-            "ℹ Prompt/template drift detected. To restore the bundled "
-            f"defaults, run: {' and '.join(commands)}\n",
-            fg=typer.colors.YELLOW,
+    fired: list[str] = []
+
+    if config.get_setting("checks.prompts", True) and report.prompts_drifted:
+        clause = _format_drift_clause(
+            "prompt",
+            "prompts",
+            ".teddy/prompts/",
+            report.edited_prompts,
+            report.missing_prompts,
         )
-    )
+        typer.echo(
+            typer.style(
+                f"ℹ {clause}. To overwrite, run: teddy init prompts\n",
+                fg=typer.colors.YELLOW,
+            )
+        )
+        fired.append("checks.prompts")
+
+    if config.get_setting("checks.templates", True) and report.templates_drifted:
+        clause = _format_drift_clause(
+            "template",
+            "templates",
+            "docs/templates/",
+            report.edited_templates,
+            report.missing_templates,
+        )
+        typer.echo(
+            typer.style(
+                f"ℹ {clause}. To overwrite, run: teddy init templates\n",
+                fg=typer.colors.YELLOW,
+            )
+        )
+        fired.append("checks.templates")
+
+    return fired
 
 
-def _display_update_notification(container: Container, cache_path: Path) -> None:
+def _display_update_notification(container: Container, cache_path: Path) -> list[str]:
     """Check the update cache and display a non-blocking notification
     if a newer version is available. Called on session startup, after
     the background check thread has been started. Gated by the
     checks.update config toggle (defaults to enabled); a disabled toggle
-    suppresses the notification only -- the background fetch still runs."""
+    suppresses the notification only -- the background fetch still runs.
+
+    Returns ``["checks.update"]`` when a newer version is actually
+    displayed, else ``[]`` so the shared disable-footer can name the
+    fired check."""
     config = container.resolve(IConfigService)
     if not config.get_setting("checks.update", True):
-        return
+        return []
     try:
         cache = read_update_cache(cache_path)
         if cache is None:
-            return
+            return []
         latest = cache.get("latest_version", "")
         if not latest:
-            return
+            return []
         current = get_current_version()
         if compare_versions(current, latest):
             # A pre-release install comes from the PyPI experimental channel (--pre).
@@ -434,11 +488,13 @@ def _display_update_notification(container: Container, cache_path: Path) -> None
                     fg=typer.colors.YELLOW,
                 )
             )
+            return ["checks.update"]
     except Exception:
         import logging
 
         logger = logging.getLogger(__name__)
         logger.debug("Failed to display update notification", exc_info=True)
+    return []
 
 
 def handle_new_session(  # noqa: PLR0913