teddy-cli 0.1.17.dev1424__tar.gz → 0.1.17.dev1426__tar.gz

{teddy_cli-0.1.17.dev1424 → teddy_cli-0.1.17.dev1426}/PKG-INFO

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

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

@@ -119,15 +119,14 @@ def _display_init_drift(container) -> None:
     Bare ``teddy init`` reuses the SAME advice ``teddy start`` prints, so its
     "unchanged" summary cannot mislead: it flags drifted prompts and missing
     templates and names the actionable ``teddy init prompts`` /
-    ``teddy init templates`` commands. The two shared helpers are imported
-    lazily, and they are advisory only -- they never block the command.
+    ``teddy init templates`` commands. The helper is imported lazily, and it is
+    advisory only -- it never blocks the command.
     """
     from teddy_executor.adapters.inbound.session_cli_handlers import (
-        _display_checks_footer,
         _display_drift_notification,
     )
 
-    _display_checks_footer(_display_drift_notification(container))
+    _display_drift_notification(container)
 
 
 def _resolve_config_or_exit(container) -> IConfigService:

{teddy_cli-0.1.17.dev1424 → teddy_cli-0.1.17.dev1426}/src/teddy_executor/adapters/inbound/session_cli_handlers.py

@@ -245,49 +245,29 @@ def _check_git_initialized() -> None:
     )
 
 
-def _warn_disabled_workspace_steps(config_service: IConfigService) -> None:
-    """Print one warning per disabled workspace step with a real consequence.
-
-    A disabled hook installer warns because the unskippable post-commit test
-    gate then depends on a hook that never landed. A disabled git init warns
-    only when the workspace is not already a repository, because an existing
-    repository needs no initialization.
-    """
-    if not config_service.get_setting("workspace.pre-commit", True):
-        typer.secho(
-            "⚠ Pre-commit hook installation is disabled. "
-            "The post-commit test gate will not run.",
-            fg=typer.colors.YELLOW,
-            err=True,
-        )
-    init_disabled = not config_service.get_setting("workspace.init", True)
-    if init_disabled and not (Path.cwd() / ".git").exists():
-        typer.secho(
-            "⚠ Git repository not initialized. Version control actions will fail.",
-            fg=typer.colors.YELLOW,
-            err=True,
-        )
-
-
 def _run_health_checks(config_service: IConfigService) -> None:
     """Run each startup health check the workspace toggles allow.
 
-    A disabled step is skipped, and ``_warn_disabled_workspace_steps`` reports
-    the ones that carry a real consequence.
+    A disabled step is skipped without a warning, because the setting is the
+    user's own choice and needs no reminder.
     """
     if config_service.get_setting("workspace.pre-commit", True):
         _ensure_commit_hooks()
     if config_service.get_setting("workspace.init", True):
         _check_git_initialized()
-    _warn_disabled_workspace_steps(config_service)
 
 
 _GIT_PULL_TIMEOUT_SECONDS = 15
-_PULL_SKIPPED_WARNING = "⚠ Workspace pull skipped."
-_PULL_TIMEOUT_WARNING = "⚠ Workspace pull timed out."
-_PULL_GIT_UNAVAILABLE_WARNING = "⚠ Workspace pull skipped; git is unavailable."
+_PULL_DETACHED_HEAD_WARNING = "⚠ Workspace pull skipped: detached HEAD."
+_PULL_NO_UPSTREAM_WARNING = "⚠ Workspace pull skipped: no upstream branch."
+_PULL_IN_PROGRESS_WARNING = "⚠ Workspace pull skipped: Git operation in progress."
+_PULL_NOT_A_REPOSITORY_WARNING = "⚠ Workspace pull skipped: not a Git repository."
+_PULL_FAILED_WARNING = "⚠ Workspace pull failed."
+_PULL_GIT_UNAVAILABLE_WARNING = "⚠ Workspace pull failed: git is unavailable."
+_PULL_TIMEOUT_WARNING = (
+    f"⚠ Workspace pull timed out after {_GIT_PULL_TIMEOUT_SECONDS}s."
+)
 _PULL_UP_TO_DATE_NOTICE = "✓ Workspace up-to-date with remote"
-_PULL_SKIPPED_NOTICE = "✓ Workspace pull skipped"
 _IN_PROGRESS_GIT_MARKERS = (
     "rebase-merge",
     "rebase-apply",
@@ -305,30 +285,21 @@ def _warn_pull(message: str) -> None:
     typer.secho(message, fg=typer.colors.YELLOW, err=True)
 
 
-def _notice_pull(message: str) -> None:
-    """Print one green pull notice.
-
-    The checkmark line joins the startup block, so it carries no trailing
-    blank and never uses the warning color.
-    """
-    typer.secho(message, fg=typer.colors.GREEN, err=True)
-
-
 def _pull_workspace_on_start(
     config_service: IConfigService,
     run_func: Optional[Callable[..., Any]] = None,
 ) -> None:
     """Fast-forward the workspace before starting a new session.
 
-    The pull runs only when ``workspace.pull`` is enabled and the workspace is
-    a Git repository, so a disabled toggle or a non-repository directory stays
-    silent. A detached HEAD, a missing upstream, or an in-progress operation
-    reports one generic checkmark notice, because the user needs a pull outcome
-    on every run without the diagnostic detail. A dirty worktree, a failed
-    pull, a timeout, or an unavailable git binary reports one warning and
-    leaves the workspace unchanged. A successful fast-forward names the number
-    of commits it moved, and a pull that moves no commit confirms the workspace
-    is up to date.
+    The pull runs only when ``workspace.pull`` is enabled, so a disabled toggle
+    stays silent because the user opted out. Every other outcome warns once and
+    names its cause, so a skipped or failed pull never carries a checkmark. A
+    detached HEAD, a missing upstream, an in-progress operation, a dirty
+    worktree, or a missing repository reports why the workspace stayed
+    unchanged. A failed pull, a timeout, or an unavailable git binary reports
+    the failure. A successful fast-forward names the number of commits it
+    moved, and a pull that moves no commit confirms the workspace is up to
+    date.
 
     The Git process is injected through ``run_func`` so every decision is
     testable without spawning a real repository.
@@ -336,6 +307,7 @@ def _pull_workspace_on_start(
     if not config_service.get_setting("workspace.pull", True):
         return
     if not (Path.cwd() / ".git").exists():
+        _warn_pull(_PULL_NOT_A_REPOSITORY_WARNING)
         return
     git_run = run_func or subprocess.run
     try:
@@ -350,16 +322,12 @@ def _fast_forward_workspace(git_run: Callable[..., Any]) -> None:
     """Run the pull decision table through the injected Git runner.
 
     Each precondition is probed before the pull so an unsafe state never
-    reaches ``git pull``. A dirty worktree reports one warning, while every
-    other unsafe state reports one generic checkmark notice so the user always
-    sees a pull outcome.
+    reaches ``git pull``. Every skip reports its cause as one warning, so the
+    user always sees a pull outcome.
     """
-    skip = _pull_skip_reason(git_run)
-    if skip is not None:
-        if skip:
-            _warn_pull(_PULL_SKIPPED_WARNING)
-        else:
-            _notice_pull(_PULL_SKIPPED_NOTICE)
+    skip_message = _pull_skip_message(git_run)
+    if skip_message is not None:
+        _warn_pull(skip_message)
         return
     before = _read_head(git_run)
     result = git_run(
@@ -370,52 +338,60 @@ def _fast_forward_workspace(git_run: Callable[..., Any]) -> None:
         timeout=_GIT_PULL_TIMEOUT_SECONDS,
     )
     if result.returncode != 0:
-        _warn_pull(_PULL_SKIPPED_WARNING)
+        _warn_pull(_PULL_FAILED_WARNING)
         return
     _report_fast_forward(git_run, before, _read_head(git_run))
 
 
-def _pull_skip_reason(git_run: Callable[..., Any]) -> Optional[bool]:
-    """Return the skip severity, or None when the pull may proceed.
+def _pull_skip_message(git_run: Callable[..., Any]) -> Optional[str]:
+    """Return the warning text for a skip, or None when the pull may proceed.
 
-    Every skip prints one generic notice, so the caller only needs to know
-    whether an attention-worthy warning replaces it. The boolean marks a
-    warning (``True``) versus a checkmark notice (``False``). A dirty worktree
-    returns the warning, because tracked changes can conflict.
+    Every skip names its own cause, because the user needs to know why the
+    workspace stayed unchanged. A dirty worktree reports how many tracked
+    files block the fast-forward.
     """
     git_dir = Path.cwd() / ".git"
     if any((git_dir / marker).exists() for marker in _IN_PROGRESS_GIT_MARKERS):
-        return False
+        return _PULL_IN_PROGRESS_WARNING
     detached = git_run(
         ["git", "symbolic-ref", "-q", "HEAD"],
         capture_output=True,
         timeout=_GIT_PULL_TIMEOUT_SECONDS,
     )
     if detached.returncode != 0:
-        return False
+        return _PULL_DETACHED_HEAD_WARNING
     upstream = git_run(
         ["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
         capture_output=True,
         timeout=_GIT_PULL_TIMEOUT_SECONDS,
     )
     if upstream.returncode != 0:
-        return False
+        return _PULL_NO_UPSTREAM_WARNING
     status = git_run(
         ["git", "status", "--porcelain"],
         capture_output=True,
         text=True,
         timeout=_GIT_PULL_TIMEOUT_SECONDS,
     )
+    # Porcelain prints exactly one line per tracked path, so the line count is
+    # the file count. A path that is both staged and modified still yields one
+    # line with two status columns.
     tracked_changes = [
         line
         for line in status.stdout.splitlines()
         if line and not line.startswith("??")
     ]
     if tracked_changes:
-        return True
+        return _format_uncommitted_warning(len(tracked_changes))
     return None
 
 
+def _format_uncommitted_warning(count: int) -> str:
+    """Name how many tracked files block the fast-forward."""
+    noun = "file" if count == 1 else "files"
+    return f"⚠ Workspace pull skipped: {count} uncommitted {noun}."
+
+
 def _read_head(git_run: Callable[..., Any]) -> str:
     """Read the current commit id through the injected Git runner."""
     return git_run(
@@ -457,8 +433,7 @@ def _start_background_update_check(container: Container) -> list[str]:
 
     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.
+    The returned list names the update checks that fired.
     """
     import threading
 
@@ -472,9 +447,8 @@ def _start_background_update_check(container: Container) -> list[str]:
     return _display_update_notification(container, cache_path)
 
 
-def _run_startup_preamble(  # noqa: PLR0913  # Each parameter is an explicit startup gate.
+def _run_startup_preamble(
     container: Container,
-    fired: list[str],
     agent: Optional[str] = None,
     setup_editor: Optional[bool] = None,
     setup_api_key: Optional[bool] = None,
@@ -484,11 +458,10 @@ def _run_startup_preamble(  # noqa: PLR0913  # Each parameter is an explicit sta
 
     The order is fixed so the banner layout cannot drift: health checks, the
     start-only workspace fast-forward line, one separator blank line, 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 and enables
-    ``pull_workspace``; ``resume`` leaves the agent ``None`` and keeps the pull
-    off.
+    ``Checking configurations...`` line, then the preflight check. ``start``
+    forwards its ``agent`` so the preflight validates the agent prompt and
+    enables ``pull_workspace``; ``resume`` leaves the agent ``None`` and keeps
+    the pull off.
     """
     config_service = container.resolve(IConfigService)
     _run_health_checks(config_service)
@@ -497,15 +470,12 @@ def _run_startup_preamble(  # noqa: PLR0913  # Each parameter is an explicit sta
     # One separator groups the checkmark block above with the notices below.
     typer.echo("", err=True)
     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,
-        )
+    _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:
@@ -798,32 +768,6 @@ def _display_drift_notification(container: Container) -> list[str]:
     return fired
 
 
-def _display_checks_footer(keys: list[str]) -> None:
-    """Emit the shared disable-footer naming the checks that just fired.
-
-    No-op when no check fired. Otherwise prints exactly ONE plain (uncolored)
-    line so the user can discover how to silence the notifications they saw,
-    ordering the deduped keys by the canonical check sequence.
-    """
-    if not keys:
-        return
-
-    canonical = ("checks.prompts", "checks.templates", "checks.update")
-    unique = set(keys)
-    ordered = [key for key in canonical if key in unique]
-
-    if len(ordered) == 1:
-        typer.echo(
-            f"You can disable this check in .teddy/config.yaml: {ordered[0]}.",
-            err=True,
-        )
-    else:
-        typer.echo(
-            f"You can disable these checks in .teddy/config.yaml: {', '.join(ordered)}.",
-            err=True,
-        )
-
-
 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
@@ -886,7 +830,7 @@ def handle_new_session(  # noqa: PLR0913
     max_cost: Optional[float] = None,
 ):
     """Logic for the 'start' command."""
-    fired = _start_background_update_check(container)
+    _start_background_update_check(container)
 
     try:
         # 0. Pipeline mode requires an initial message
@@ -898,10 +842,9 @@ def handle_new_session(  # noqa: PLR0913
         # 1. Ensure project is initialized
         container.resolve(IInitUseCase).ensure_initialized()
 
-        # 2. Shared startup preamble (health checks + preflight + footer)
+        # 2. Shared startup preamble (health checks + preflight)
         _run_startup_preamble(
             container,
-            fired,
             agent=agent,
             setup_editor=setup_editor,
             setup_api_key=setup_api_key,
@@ -1570,13 +1513,12 @@ def handle_resume_session(  # noqa: PLR0913
     max_cost: Optional[float] = None,
 ):
     """Logic for the 'resume' command."""
-    fired = _start_background_update_check(container)
+    _start_background_update_check(container)
 
     try:
-        # 1. Shared startup preamble (health checks + preflight + footer)
+        # 1. Shared startup preamble (health checks + preflight)
         _run_startup_preamble(
             container,
-            fired,
             setup_editor=setup_editor,
             setup_api_key=setup_api_key,
         )