agent-cli 0.61.2__py3-none-any.whl → 0.70.2__py3-none-any.whl

agent_cli/core/deps.py

@@ -2,38 +2,190 @@
 
 from __future__ import annotations
 
-import sys
+import functools
+import json
+import os
 from importlib.util import find_spec
+from pathlib import Path
+from typing import TYPE_CHECKING, TypeVar
 
-# Dependencies that don't support Python 3.14 yet
-_PYTHON_314_INCOMPATIBLE = {"chromadb", "onnxruntime"}
+import typer
 
+from agent_cli.config import load_config
+from agent_cli.core.utils import console, print_error_message
 
-def ensure_optional_dependencies(
-    required: dict[str, str],
-    *,
-    extra_name: str,
-    install_hint: str | None = None,
-) -> None:
-    """Ensure optional dependencies are present, otherwise raise ImportError."""
-    missing = [
-        pkg_name for module_name, pkg_name in required.items() if find_spec(module_name) is None
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
+F = TypeVar("F", bound="Callable[..., object]")
+
+
+def _get_auto_install_setting() -> bool:
+    """Check if auto-install is enabled (default: True)."""
+    if os.environ.get("AGENT_CLI_NO_AUTO_INSTALL", "").lower() in ("1", "true", "yes"):
+        return False
+    return load_config().get("settings", {}).get("auto_install_extras", True)
+
+
+# Load extras from JSON file
+_EXTRAS_FILE = Path(__file__).parent.parent / "_extras.json"
+EXTRAS: dict[str, tuple[str, list[str]]] = {
+    k: (v[0], v[1]) for k, v in json.loads(_EXTRAS_FILE.read_text()).items()
+}
+
+
+def _check_package_installed(pkg: str) -> bool:
+    """Check if a single package is installed."""
+    top_module = pkg.split(".")[0]
+    try:
+        return find_spec(top_module) is not None
+    except (ValueError, ModuleNotFoundError):
+        return False
+
+
+def check_extra_installed(extra: str) -> bool:
+    """Check if packages for an extra are installed using find_spec (no actual import).
+
+    Supports `|` syntax for alternatives: "piper|kokoro" means ANY of these extras.
+    For regular extras, ALL packages must be installed.
+    """
+    # Handle "extra1|extra2" syntax - any of these extras is sufficient
+    if "|" in extra:
+        return any(check_extra_installed(e) for e in extra.split("|"))
+
+    if extra not in EXTRAS:
+        return False  # Unknown extra, trigger install attempt to surface error
+    _, packages = EXTRAS[extra]
+
+    # All packages must be installed
+    return all(_check_package_installed(pkg) for pkg in packages)
+
+
+def _format_extra_item(extra: str) -> str:
+    """Format a single extra as a list item with description."""
+    desc, _ = EXTRAS.get(extra, ("", []))
+    if desc:
+        return f"  - '{extra}' ({desc})"
+    return f"  - '{extra}'"
+
+
+def _format_install_commands(extras: list[str]) -> list[str]:
+    """Format install commands for one or more extras."""
+    combined = ",".join(extras)
+    extras_args = " ".join(extras)
+    return [
+        "Install with:",
+        f'  [bold cyan]uv tool install -p 3.13 "agent-cli\\[{combined}]"[/bold cyan]',
+        "  # or",
+        f"  [bold cyan]agent-cli install-extras {extras_args}[/bold cyan]",
     ]
+
+
+def get_install_hint(extra: str) -> str:
+    """Get install command hint for a single extra.
+
+    Supports `|` syntax for alternatives: "piper|kokoro" shows both options.
+    """
+    # Handle "extra1|extra2" syntax - show all options
+    if "|" in extra:
+        alternatives = extra.split("|")
+        lines = ["This command requires one of:"]
+        lines.extend(_format_extra_item(alt) for alt in alternatives)
+        lines.append("")
+        lines.append("Install one with:")
+        lines.extend(
+            f'  [bold cyan]uv tool install -p 3.13 "agent-cli\\[{alt}]"[/bold cyan]'
+            for alt in alternatives
+        )
+        lines.append("  # or")
+        lines.extend(
+            f"  [bold cyan]agent-cli install-extras {alt}[/bold cyan]" for alt in alternatives
+        )
+        return "\n".join(lines)
+
+    desc, _ = EXTRAS.get(extra, ("", []))
+    header = f"This command requires the '{extra}' extra"
+    if desc:
+        header += f" ({desc})"
+    header += "."
+
+    lines = [header, ""]
+    lines.extend(_format_install_commands([extra]))
+    return "\n".join(lines)
+
+
+def get_combined_install_hint(extras: list[str]) -> str:
+    """Get a combined install hint for multiple missing extras."""
+    if len(extras) == 1:
+        return get_install_hint(extras[0])
+
+    lines = ["This command requires the following extras:"]
+    lines.extend(_format_extra_item(extra) for extra in extras)
+    lines.append("")
+    lines.extend(_format_install_commands(extras))
+    return "\n".join(lines)
+
+
+def _try_auto_install(missing: list[str]) -> bool:
+    """Attempt to auto-install missing extras. Returns True if successful."""
+    from agent_cli.install.extras import install_extras_programmatic  # noqa: PLC0415
+
+    # Flatten alternatives (e.g., "piper|kokoro" -> just pick the first one)
+    extras_to_install = []
+    for extra in missing:
+        if "|" in extra:
+            # For alternatives, install the first option
+            extras_to_install.append(extra.split("|")[0])
+        else:
+            extras_to_install.append(extra)
+
+    console.print(
+        f"[yellow]Auto-installing missing extras: {', '.join(extras_to_install)}[/]",
+    )
+    return install_extras_programmatic(extras_to_install, quiet=True)
+
+
+def _check_and_install_extras(extras: tuple[str, ...]) -> list[str]:
+    """Check for missing extras and attempt auto-install. Returns list of still-missing."""
+    missing = [e for e in extras if not check_extra_installed(e)]
     if not missing:
-        return
+        return []
+
+    if not _get_auto_install_setting():
+        print_error_message(get_combined_install_hint(missing))
+        return missing
 
-    # Check if running on Python 3.14+ with incompatible dependencies
-    is_py314 = sys.version_info >= (3, 14)
-    incompatible = set(missing) & _PYTHON_314_INCOMPATIBLE
+    if not _try_auto_install(missing):
+        print_error_message("Auto-install failed.\n" + get_combined_install_hint(missing))
+        return missing
 
-    if is_py314 and incompatible:
-        msg = (
-            f"The '{extra_name}' feature requires {', '.join(sorted(incompatible))}, "
-            f"which {'does' if len(incompatible) == 1 else 'do'} not support Python 3.14 yet. "
-            f"Please use Python 3.13 or earlier for this feature."
+    console.print("[green]Installation complete![/]")
+    still_missing = [e for e in extras if not check_extra_installed(e)]
+    if still_missing:
+        print_error_message(
+            "Auto-install completed but some dependencies are still missing.\n"
+            + get_combined_install_hint(still_missing),
         )
-        raise ImportError(msg)
+    return still_missing
+
+
+def requires_extras(*extras: str) -> Callable[[F], F]:
+    """Decorator to declare required extras for a command.
+
+    Auto-installs missing extras by default. Disable via AGENT_CLI_NO_AUTO_INSTALL=1
+    or config [settings] auto_install_extras = false.
+    """
+
+    def decorator(func: F) -> F:
+        func._required_extras = extras  # type: ignore[attr-defined]
+
+        @functools.wraps(func)
+        def wrapper(*args: object, **kwargs: object) -> object:
+            if _check_and_install_extras(extras):
+                raise typer.Exit(1)
+            return func(*args, **kwargs)
+
+        wrapper._required_extras = extras  # type: ignore[attr-defined]
+        return wrapper  # type: ignore[return-value]
 
-    hint = install_hint or f"`pip install agent-cli[{extra_name}]`"
-    msg = f"Missing required dependencies for {extra_name}: {', '.join(missing)}. Please install with {hint}."
-    raise ImportError(msg)
+    return decorator

agent_cli/core/openai_proxy.py

@@ -6,13 +6,11 @@ import json
 import logging
 from typing import TYPE_CHECKING, Any, Protocol, runtime_checkable
 
-import httpx
-from fastapi import HTTPException, Request, Response
-from fastapi.responses import StreamingResponse
-
 if TYPE_CHECKING:
     from collections.abc import AsyncGenerator, Iterable
 
+    from fastapi import Request, Response
+
 LOGGER = logging.getLogger(__name__)
 
 
@@ -33,6 +31,9 @@ async def proxy_request_to_upstream(
     api_key: str | None = None,
 ) -> Response:
     """Forward a raw HTTP request to an upstream OpenAI-compatible provider."""
+    import httpx  # noqa: PLC0415
+    from fastapi import Response  # noqa: PLC0415
+
     auth_header = request.headers.get("Authorization")
     headers = {}
     if auth_header:
@@ -82,6 +83,10 @@ async def forward_chat_request(
     exclude_fields: Iterable[str] = (),
 ) -> Any:
     """Forward a chat request to a backend LLM."""
+    import httpx  # noqa: PLC0415
+    from fastapi import HTTPException  # noqa: PLC0415
+    from fastapi.responses import StreamingResponse  # noqa: PLC0415
+
     forward_payload = request.model_dump(exclude=set(exclude_fields))
     headers = {"Authorization": f"Bearer {api_key}"} if api_key else None
 

agent_cli/core/process.py

@@ -10,8 +10,6 @@ from contextlib import contextmanager
 from pathlib import Path
 from typing import TYPE_CHECKING
 
-import setproctitle
-
 if TYPE_CHECKING:
     from collections.abc import Generator
 
@@ -36,6 +34,8 @@ def set_process_title(process_name: str) -> None:
         process_name: The name of the process (e.g., 'transcribe', 'chat').
 
     """
+    import setproctitle  # noqa: PLC0415
+
     global _original_proctitle
 
     # Capture the original command line only once, before any modification

agent_cli/core/reranker.py

@@ -4,15 +4,13 @@ from __future__ import annotations
 
 import logging
 
-from huggingface_hub import hf_hub_download
-from onnxruntime import InferenceSession
-from transformers import AutoTokenizer
-
 LOGGER = logging.getLogger(__name__)
 
 
 def _download_onnx_model(model_name: str, onnx_filename: str) -> str:
     """Download the ONNX model, favoring the common `onnx/` folder layout."""
+    from huggingface_hub import hf_hub_download  # noqa: PLC0415
+
     if "/" in onnx_filename:
         return hf_hub_download(repo_id=model_name, filename=onnx_filename)
 
@@ -45,6 +43,9 @@ class OnnxCrossEncoder:
         onnx_filename: str = "model.onnx",
     ) -> None:
         """Initialize the ONNX CrossEncoder."""
+        from onnxruntime import InferenceSession  # noqa: PLC0415
+        from transformers import AutoTokenizer  # noqa: PLC0415
+
         self.model_name = model_name
 
         # Download model if needed

agent_cli/core/utils.py

@@ -18,7 +18,6 @@ from contextlib import (
 )
 from typing import TYPE_CHECKING, Any
 
-import pyperclip
 from rich.console import Console
 from rich.live import Live
 from rich.panel import Panel
@@ -40,6 +39,7 @@ if TYPE_CHECKING:
     from pathlib import Path
 
 console = Console()
+err_console = Console(stderr=True)
 
 
 def enable_json_mode() -> None:
@@ -211,8 +211,8 @@ def print_output_panel(
 
 
 def print_error_message(message: str, suggestion: str | None = None) -> None:
-    """Prints an error message in a panel."""
-    error_text = Text(message)
+    """Prints an error message in a panel with rich markup support."""
+    error_text = Text.from_markup(message)
     if suggestion:
         error_text.append("\n\n")
         error_text.append(suggestion)
@@ -233,6 +233,8 @@ def print_device_index(input_device_index: int | None, input_device_name: str |
 
 def get_clipboard_text(*, quiet: bool = False) -> str | None:
     """Get text from clipboard, with an optional status message."""
+    import pyperclip  # noqa: PLC0415
+
     text = pyperclip.paste()
     if not text:
         if not quiet:

agent_cli/core/vad.py

@@ -12,7 +12,6 @@ from agent_cli import constants
 try:
     import numpy as np
     import torch
-    from silero_vad.utils_vad import OnnxWrapper
 except ImportError as e:
     msg = (
         "silero-vad is required for the transcribe-daemon command. "
@@ -57,6 +56,8 @@ class VoiceActivityDetector:
             msg = f"Sample rate must be 8000 or 16000, got {sample_rate}"
             raise ValueError(msg)
 
+        from silero_vad.utils_vad import OnnxWrapper  # noqa: PLC0415
+
         self.sample_rate = sample_rate
         self.threshold = threshold
         self.silence_threshold_ms = silence_threshold_ms

agent_cli/core/watch.py

@@ -3,13 +3,13 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Callable
 from pathlib import Path
+from typing import TYPE_CHECKING
 
-from watchfiles import Change, awatch
+if TYPE_CHECKING:
+    from collections.abc import Callable
 
-ChangeHandler = Callable[[Change, Path], None]
-PathFilter = Callable[[Path, Path], bool]
+    from watchfiles import Change
 
 
 def _default_skip_hidden(path: Path, root: Path) -> bool:
@@ -20,10 +20,10 @@ def _default_skip_hidden(path: Path, root: Path) -> bool:
 
 async def watch_directory(
     root: Path,
-    handler: ChangeHandler,
+    handler: Callable[[Change, Path], None],
     *,
     skip_hidden: bool = True,
-    ignore_filter: PathFilter | None = None,
+    ignore_filter: Callable[[Path, Path], bool] | None = None,
     use_executor: bool = True,
 ) -> None:
     """Watch a directory for file changes and invoke handler(change, path).
@@ -38,6 +38,8 @@ async def watch_directory(
         use_executor: If True, run handler in a thread pool executor.
 
     """
+    from watchfiles import awatch  # noqa: PLC0415
+
     loop = asyncio.get_running_loop()
 
     # Determine which filter to use

agent_cli/dev/cli.py

@@ -13,7 +13,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING, Annotated, NoReturn
 
 import typer
-from rich.console import Console
 from rich.panel import Panel
 from rich.table import Table
 
@@ -21,6 +20,7 @@ from agent_cli.cli import app as main_app
 from agent_cli.cli import set_config_defaults
 from agent_cli.config import load_config
 from agent_cli.core.process import set_process_title
+from agent_cli.core.utils import console, err_console
 
 # Word lists for generating random branch names (like Docker container names)
 _ADJECTIVES = [
@@ -112,9 +112,6 @@ if TYPE_CHECKING:
     from .coding_agents.base import CodingAgent
     from .editors.base import Editor
 
-console = Console()
-err_console = Console(stderr=True)
-
 app = typer.Typer(
     name="dev",
     help="Parallel development environment manager using git worktrees.",
@@ -122,7 +119,7 @@ app = typer.Typer(
     rich_markup_mode="markdown",
     no_args_is_help=True,
 )
-main_app.add_typer(app, name="dev")
+main_app.add_typer(app, name="dev", rich_help_panel="Development")
 
 
 @app.callback()
@@ -344,6 +341,19 @@ def _launch_editor(path: Path, editor: Editor) -> None:
         _warn(f"Could not open editor: {e}")
 
 
+def _write_prompt_to_worktree(worktree_path: Path, prompt: str) -> Path:
+    """Write the prompt to .claude/TASK.md in the worktree.
+
+    This makes the task description available to the spawned agent
+    and provides a record of what was requested.
+    """
+    claude_dir = worktree_path / ".claude"
+    claude_dir.mkdir(parents=True, exist_ok=True)
+    task_file = claude_dir / "TASK.md"
+    task_file.write_text(prompt + "\n")
+    return task_file
+
+
 def _format_env_prefix(env: dict[str, str]) -> str:
     """Format environment variables as shell prefix.
 
@@ -465,7 +475,7 @@ def _launch_agent(
 
 
 @app.command("new")
-def new(  # noqa: PLR0912, PLR0915
+def new(  # noqa: C901, PLR0912, PLR0915
     branch: Annotated[
         str | None,
         typer.Argument(help="Branch name (auto-generated if not provided)"),
@@ -552,6 +562,10 @@ def new(  # noqa: PLR0912, PLR0915
     if prompt_file is not None:
         prompt = prompt_file.read_text().strip()
 
+    # If a prompt is provided, automatically enable agent mode
+    if prompt:
+        agent = True
+
     repo_root = _ensure_git_repo()
 
     # Generate branch name if not provided
@@ -627,6 +641,11 @@ def new(  # noqa: PLR0912, PLR0915
             # Only warn if user explicitly requested direnv
             _warn("direnv not installed, skipping .envrc setup")
 
+    # Write prompt to worktree (makes task available to the spawned agent)
+    if prompt:
+        task_file = _write_prompt_to_worktree(result.path, prompt)
+        _success(f"Wrote task to {task_file.relative_to(result.path)}")
+
     # Resolve editor and agent
     resolved_editor = _resolve_editor(editor, editor_name, default_editor)
     resolved_agent = _resolve_agent(agent, agent_name, default_agent)
@@ -655,10 +674,6 @@ def new(  # noqa: PLR0912, PLR0915
 
 @app.command("list")
 def list_envs(
-    porcelain: Annotated[
-        bool,
-        typer.Option("--porcelain", "-p", help="Machine-readable output"),
-    ] = False,
     json_output: Annotated[
         bool,
         typer.Option("--json", help="Output as JSON for automation"),
@@ -692,11 +707,6 @@ def list_envs(
         print(json.dumps({"worktrees": data}))
         return
 
-    if porcelain:
-        for wt in worktrees:
-            print(f"{wt.path.as_posix()}\t{wt.branch or '(detached)'}")
-        return
-
     table = Table(title="Dev Environments (Git Worktrees)")
     table.add_column("Name", style="cyan")
     table.add_column("Branch", style="green")
@@ -766,15 +776,11 @@ def _is_stale(status: worktree.WorktreeStatus, stale_days: int) -> bool:
 
 
 @app.command("status")
-def status_cmd(  # noqa: PLR0912, PLR0915
+def status_cmd(  # noqa: PLR0915
     stale_days: Annotated[
         int,
         typer.Option("--stale-days", "-s", help="Highlight worktrees inactive for N+ days"),
     ] = 7,
-    porcelain: Annotated[
-        bool,
-        typer.Option("--porcelain", "-p", help="Machine-readable output"),
-    ] = False,
     json_output: Annotated[
         bool,
         typer.Option("--json", help="Output as JSON for automation"),
@@ -818,20 +824,6 @@ def status_cmd(  # noqa: PLR0912, PLR0915
         print(json.dumps({"worktrees": data, "stale_days": stale_days}))
         return
 
-    if porcelain:
-        # Machine-readable: name\tbranch\tmodified\tstaged\tuntracked\tahead\tbehind\ttimestamp
-        for wt in worktrees:
-            status = worktree.get_worktree_status(wt.path)
-            if status:
-                print(
-                    f"{wt.name}\t{wt.branch or ''}\t"
-                    f"{status.modified}\t{status.staged}\t{status.untracked}\t"
-                    f"{status.ahead}\t{status.behind}\t{status.last_commit_timestamp or ''}",
-                )
-            else:
-                print(f"{wt.name}\t{wt.branch or ''}\t\t\t\t\t\t")
-        return
-
     table = Table(title="Dev Environment Status")
     table.add_column("Name", style="cyan")
     table.add_column("Branch", style="green")
@@ -1039,6 +1031,11 @@ def start_agent(
     if not agent.is_available():
         _error(f"{agent.name} is not installed. Install from: {agent.install_url}")
 
+    # Write prompt to worktree (makes task available to the agent)
+    if prompt:
+        task_file = _write_prompt_to_worktree(wt.path, prompt)
+        _success(f"Wrote task to {task_file.relative_to(wt.path)}")
+
     merged_args = _merge_agent_args(agent, agent_args)
     agent_env = _get_agent_env(agent)
     _info(f"Starting {agent.name} in {wt.path}...")

agent_cli/dev/coding_agents/base.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import os
 import shutil
 from abc import ABC
+from pathlib import PurePath
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
@@ -131,8 +132,6 @@ def _get_parent_process_names() -> list[str]:
     - CLI tools that set process.title (like Claude) show their name directly
     """
     try:
-        from pathlib import PurePath  # noqa: PLC0415
-
         import psutil  # noqa: PLC0415
 
         process = psutil.Process(os.getpid())