teddy-cli 0.1.15__tar.gz → 0.1.16.dev1149__tar.gz

{teddy_cli-0.1.15 → teddy_cli-0.1.16.dev1149}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: teddy-cli
-Version: 0.1.15
+Version: 0.1.16.dev1149
 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.15 → teddy_cli-0.1.16.dev1149}/pyproject.toml

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

@@ -11,6 +11,8 @@ import typer
 from teddy_executor.core.domain.models import (
     ExecutionReport,
 )
+from teddy_executor.core.ports.outbound.config_service import IConfigService
+from teddy_executor.core.ports.outbound.system_environment import ISystemEnvironment
 
 if TYPE_CHECKING:
     from teddy_executor.core.ports.inbound.plan_parser import IPlanParser
@@ -42,13 +44,6 @@ def get_container():
     return _get_container()
 
 
-def _apply_ui_mode_override(container, ui_mode_bool: bool) -> None:
-    from teddy_executor.container import register_reviewer
-
-    mode = "tui" if ui_mode_bool else "console"
-    register_reviewer(container, ui_mode=mode)
-
-
 logging.basicConfig(
     level=logging.INFO,
     format="%(message)s",
@@ -57,6 +52,54 @@ logging.basicConfig(
 )
 
 
+def _resolve_yolo(yolo: Optional[bool], config_service: IConfigService) -> bool:
+    """Resolve the effective YOLO mode (single-sourced across commands).
+
+    An explicit flag always wins (``--yolo`` / ``-y`` -> ``True``,
+    ``--no-yolo`` / ``-n`` -> ``False``). When the flag is unset, the mode
+    falls back to the ``yolo_default`` config setting (code default ``False``).
+    """
+    if yolo is not None:
+        return yolo
+    return bool(config_service.get_setting("yolo_default", False))
+
+
+def _resolve_setup_editor(
+    system_env: ISystemEnvironment,
+    interactive: bool,
+    message: Optional[str],
+    pipeline: bool,
+) -> bool:
+    """Resolve whether the one-time editor setup should run (Slice 00-26).
+
+    The editor gate keys on "will the session actually read the terminal"
+    rather than on the approval (``interactive``) flag: setup runs only when a
+    terminal is attached (``system_env.isatty``), the run is not a pipeline,
+    and the session will either enter the approval loop (``interactive``) or
+    block on the opening-message prompt (``message is None``). This lets a yolo
+    run without ``-m`` configure its editor once, while fully-specified batch
+    runs (``-y -m``), pipeline runs, and non-TTY (CI/piped) runs stay
+    prompt-free.
+    """
+    return system_env.isatty() and not pipeline and (interactive or message is None)
+
+
+def _resolve_setup_api_key(
+    system_env: ISystemEnvironment,
+    pipeline: bool,
+) -> bool:
+    """Resolve whether the interactive LLM API-key setup should run.
+
+    Unlike the optional editor, the LLM API key is REQUIRED, so its gate is
+    deliberately WIDER: setup runs whenever a terminal is attached and the run
+    is not a pipeline. There is intentionally no ``interactive``/``-m`` clause --
+    a fully-specified batch run (``-y -m``) on a TTY still prompts, because the
+    session cannot proceed without a key. Pipeline runs remain the clean
+    automation path (they hard-error by design).
+    """
+    return system_env.isatty() and not pipeline
+
+
 def _ensure_project_initialized(container, root_dir: str | None = None) -> None:
     """Lazily performs project anchoring and initialization.
 
@@ -110,8 +153,11 @@ def _ensure_project_initialized(container, root_dir: str | None = None) -> None:
 OPT_NO_COPY = typer.Option(
     False, "--no-copy", help="Do not copy the output to the clipboard."
 )
-OPT_UI_MODE = typer.Option(
-    None, "--tui/--console", help="Force TUI or Console mode.", show_default=False
+OPT_PIPELINE = typer.Option(
+    False,
+    "--pipeline",
+    "-p",
+    help="Pipeline mode: auto-approve all actions, requires -m, exits after first ## Message.",
 )
 
 
@@ -121,28 +167,28 @@ def start(  # noqa: PLR0913
     agent: str = typer.Option(
         "pathfinder", "--agent", "-a", help="Agent prompt to use."
     ),
-    yolo: bool = typer.Option(
-        False, "--yolo", "-y", help="Auto-approve all actions (non-interactive mode)."
-    ),
-    pipeline: bool = typer.Option(
-        False,
-        "--pipeline",
-        "-p",
-        help="Pipeline mode: auto-approve all actions, requires -m, exits after first ## Message.",
+    yolo: Optional[bool] = typer.Option(
+        None,
+        "--yolo/--no-yolo",
+        "-y/-n",
+        help=(
+            "Auto-approve all actions (non-interactive). "
+            "--no-yolo / -n forces interactive mode."
+        ),
     ),
-    yes: bool = typer.Option(False, "--yes", hidden=True),
-    no_interactive: bool = typer.Option(False, "--no-interactive", hidden=True),
-    non_interactive: bool = typer.Option(False, "--non-interactive", hidden=True),
+    pipeline: bool = OPT_PIPELINE,
     no_copy: bool = OPT_NO_COPY,
-    ui_mode: Optional[bool] = OPT_UI_MODE,
     message: Optional[str] = typer.Option(
         None, "-m", "--message", help="Instruction for the first turn."
     ),
-    context: Optional[str] = typer.Option(
+    context: Optional[list[str]] = typer.Option(
         None,
         "--context",
         "-c",
-        help="Comma-separated list of additional files/dirs for context.",
+        help=(
+            "Additional files/dirs for context. Repeatable (-c a.py -c b.md); "
+            'comma-separated values are also accepted (-c "a.py,b.md").'
+        ),
     ),
     model: Optional[str] = typer.Option(None, "--model", help="LLM model override."),
     provider: Optional[str] = typer.Option(
@@ -159,16 +205,30 @@ def start(  # noqa: PLR0913
 
     container = get_container()
     _ensure_project_initialized(container)
-    if ui_mode is not None:
-        _apply_ui_mode_override(container, ui_mode)
-
-    additional_context = context.split(",") if context else None
+    config_service = container.resolve(IConfigService)
+
+    additional_context = (
+        [
+            path.strip()
+            for occurrence in context
+            for path in occurrence.split(",")
+            if path.strip()
+        ]
+        if context
+        else None
+    )
 
+    interactive = not (_resolve_yolo(yolo, config_service) or pipeline)
+    system_env = container.resolve(ISystemEnvironment)
     handle_new_session(
         container=container,
         name=name,
         agent=agent,
-        interactive=not (yolo or pipeline or yes or no_interactive or non_interactive),
+        interactive=interactive,
+        setup_editor=_resolve_setup_editor(
+            system_env, interactive=interactive, message=message, pipeline=pipeline
+        ),
+        setup_api_key=_resolve_setup_api_key(system_env, pipeline=pipeline),
         no_copy=no_copy,
         message=message,
         pipeline=pipeline,
@@ -294,15 +354,13 @@ def update(
         typer.echo("To apply prompt updates, run: teddy init prompts")
     elif experimental:
         typer.echo(f"A new experimental version {latest} is available.")
-        typer.echo(
-            "To upgrade, run: uv tool install teddy-cli --pre --force --index-url https://test.pypi.org/simple/ --extra-index-url https://pypi.org/simple/ --index-strategy unsafe-best-match"
-        )
+        typer.echo("To upgrade, run: uv tool install teddy-cli --pre --force")
         typer.echo("To apply prompt updates, run: teddy init prompts")
     else:
         typer.echo(f"A new version {latest} is available.")
-        # A pre-release install comes from the TestPyPI experimental channel.
-        # `uv tool upgrade` cannot reliably move the tool off that index back to
-        # PyPI, so force a reinstall from the default index instead.
+        # A pre-release install comes from PyPI with a dev version (--pre).
+        # `uv tool upgrade` cannot reliably move the tool off --pre back to
+        # stable, so force a reinstall from the default index instead.
         if is_prerelease(current):
             typer.echo("To upgrade, run: uv tool install teddy-cli --force")
         else:
@@ -372,14 +430,16 @@ def create_parser_for_plan(plan_content: str) -> IPlanParser:
 @app.command()
 def resume(  # noqa: PLR0913
     path: Optional[str] = typer.Argument(None, help="Path to session or turn."),
-    yolo: bool = typer.Option(
-        False, "--yolo", "-y", help="Auto-approve all actions (non-interactive mode)."
+    yolo: Optional[bool] = typer.Option(
+        None,
+        "--yolo/--no-yolo",
+        "-y/-n",
+        help=(
+            "Auto-approve all actions (non-interactive). "
+            "--no-yolo / -n forces interactive mode."
+        ),
     ),
-    yes: bool = typer.Option(False, "--yes", hidden=True),
-    no_interactive: bool = typer.Option(False, "--no-interactive", hidden=True),
-    non_interactive: bool = typer.Option(False, "--non-interactive", hidden=True),
     no_copy: bool = OPT_NO_COPY,
-    ui_mode: Optional[bool] = OPT_UI_MODE,
     model: Optional[str] = typer.Option(None, "--model", help="LLM model override."),
     provider: Optional[str] = typer.Option(
         None, "--provider", help="LLM provider override."
@@ -387,28 +447,44 @@ def resume(  # noqa: PLR0913
     api_key: Optional[str] = typer.Option(
         None, "--api-key", help="LLM API key override."
     ),
+    message: Optional[str] = typer.Option(
+        None,
+        "--message",
+        "-m",
+        help=(
+            "Inject a user request/reply without interactive prompting "
+            "(e.g. to continue after interrupting a --yolo run)."
+        ),
+    ),
+    pipeline: bool = OPT_PIPELINE,
 ):
     """
     Intelligently resumes the last turn of a session or starts a new one.
     """
-    from teddy_executor.adapters.inbound.cli_helpers import apply_ui_mode_override
     from teddy_executor.adapters.inbound.session_cli_handlers import (
         handle_resume_session,
     )
 
     container = get_container()
     _ensure_project_initialized(container)
-    if ui_mode is not None:
-        apply_ui_mode_override(container, ui_mode)
+    config_service = container.resolve(IConfigService)
 
+    interactive = not (_resolve_yolo(yolo, config_service) or pipeline)
+    system_env = container.resolve(ISystemEnvironment)
     handle_resume_session(
         container=container,
         path=path,
-        interactive=not (yolo or yes or no_interactive or non_interactive),
+        interactive=interactive,
+        setup_editor=_resolve_setup_editor(
+            system_env, interactive=interactive, message=message, pipeline=pipeline
+        ),
+        setup_api_key=_resolve_setup_api_key(system_env, pipeline=pipeline),
         no_copy=no_copy,
         model=model,
         provider=provider,
         api_key=api_key,
+        message=message,
+        pipeline=pipeline,
     )
 
 
@@ -417,17 +493,19 @@ def execute(  # noqa: PLR0913
     plan_file: Optional[Path] = typer.Argument(
         None, help="Root-relative path to the plan file (.md).", show_default=False
     ),
-    yolo: bool = typer.Option(
-        False, "--yolo", "-y", help="Auto-approve all actions (non-interactive mode)."
+    yolo: Optional[bool] = typer.Option(
+        None,
+        "--yolo/--no-yolo",
+        "-y/-n",
+        help=(
+            "Auto-approve all actions (non-interactive). "
+            "--no-yolo / -n forces interactive mode."
+        ),
     ),
-    yes: bool = typer.Option(False, "--yes", hidden=True),
-    no_interactive: bool = typer.Option(False, "--no-interactive", hidden=True),
-    non_interactive: bool = typer.Option(False, "--non-interactive", hidden=True),
     no_copy: bool = OPT_NO_COPY,
     plan_content: Optional[str] = typer.Option(
         None, "--plan-content", help="Plan content.", show_default=False
     ),
-    ui_mode: Optional[bool] = OPT_UI_MODE,
     message: Optional[str] = typer.Option(
         None, "-m", "--message", help="Optional instruction for the report."
     ),
@@ -436,7 +514,6 @@ def execute(  # noqa: PLR0913
     Executes a Markdown plan file (from path or clipboard) and generates an execution report.
     """
     from teddy_executor.adapters.inbound.cli_helpers import (
-        apply_ui_mode_override,
         get_plan_content,
         handle_report_output,
     )
@@ -444,13 +521,12 @@ def execute(  # noqa: PLR0913
     from teddy_executor.core.ports.inbound.run_plan_use_case import IRunPlanUseCase
 
     report: Optional[ExecutionReport] = None
-    interactive_mode = not (yolo or yes or no_interactive or non_interactive)
     start_time = datetime.now(timezone.utc)
 
     container = get_container()
     _ensure_project_initialized(container)
-    if ui_mode is not None:
-        apply_ui_mode_override(container, ui_mode)
+    config_service = container.resolve(IConfigService)
+    interactive_mode = not _resolve_yolo(yolo, config_service)
 
     try:
         final_plan_content = get_plan_content(plan_content, plan_file)

{teddy_cli-0.1.15 → teddy_cli-0.1.16.dev1149}/src/teddy_executor/adapters/inbound/cli_helpers.py

@@ -241,14 +241,6 @@ def handle_report_output(
             raise typer.Exit(code=1)
 
 
-def apply_ui_mode_override(container: Container, ui_mode_bool: bool) -> None:
-    """Applies a UI mode override to the container."""
-    from teddy_executor.container import register_reviewer
-
-    mode = "tui" if ui_mode_bool else "console"
-    register_reviewer(container, ui_mode=mode)
-
-
 def prewarm_imports() -> None:
     """
     Pre-warm heavy imports to reduce first-run latency.
@@ -260,5 +252,14 @@ def prewarm_imports() -> None:
         import pyperclip  # noqa: F401
         from bs4 import BeautifulSoup  # noqa: F401
         from ddgs import DDGS  # noqa: F401
+        import tiktoken  # noqa: F401
+
+        try:
+            tiktoken.get_encoding("cl100k_base")
+        except Exception:
+            logger.warning(
+                "Failed to prewarm tiktoken encoding (best-effort)",
+                exc_info=True,
+            )
     except ImportError:
         pass