agent-cli 0.68.4__py3-none-any.whl → 0.69.0__py3-none-any.whl

agent_cli/dev/skill/SKILL.md

@@ -34,14 +34,19 @@ Do NOT spawn when:
 
 ## Core command
 
-For short prompts:
+For new features (starts from origin/main):
 ```bash
-agent-cli dev new <branch-name> --agent --prompt "Fix the login bug"
+agent-cli dev new <branch-name> --agent --prompt "Implement the new feature..."
+```
+
+For work on current branch (review, test, fix) - use `--from HEAD`:
+```bash
+agent-cli dev new <branch-name> --from HEAD --agent --prompt "Review/test/fix..."
 ```
 
 For longer prompts (recommended for multi-line or complex instructions):
 ```bash
-agent-cli dev new <branch-name> --agent --prompt-file path/to/prompt.md
+agent-cli dev new <branch-name> --from HEAD --agent --prompt-file path/to/prompt.md
 ```
 
 This creates:
@@ -129,7 +134,7 @@ Each agent works independently in its own branch. Results can be reviewed and me
 | `--agent` / `-a` | Start AI coding agent after creation |
 | `--prompt` / `-p` | Initial prompt for the agent (short prompts only) |
 | `--prompt-file` / `-P` | Read prompt from file (recommended for longer prompts) |
-| `--from` / `-f` | Base branch (default: origin/main) |
+| `--from` / `-f` | Base ref (default: origin/main). **Use `--from HEAD` when reviewing/testing current branch!** |
 | `--with-agent` | Specific agent: claude, aider, codex, gemini |
 | `--agent-args` | Extra arguments for the agent |
 

agent_cli/dev/skill/examples.md

@@ -20,7 +20,68 @@ Each prompt for a spawned agent should follow this structure:
 5. **Focused scope** - Keep solutions minimal, implement only what's requested
 6. **Structured report** - Write conclusions to `.claude/REPORT.md`
 
-## Scenario 1: Multi-feature implementation
+## Scenario 1: Code review of current branch
+
+**User request**: "Review the code on this branch" or "Spawn an agent to review my changes"
+
+**CRITICAL**: Use `--from HEAD` (or the branch name) so the review agent has access to the changes!
+
+```bash
+# Review the current branch - MUST use --from HEAD
+agent-cli dev new review-changes --from HEAD --agent --prompt "Review the code changes on this branch.
+
+<workflow>
+- Run git diff origin/main...HEAD to identify all changes
+- Read changed files in parallel to understand context
+- Check CLAUDE.md for project-specific guidelines
+- Test changes with real services if applicable
+</workflow>
+
+<code_exploration>
+- Use git diff origin/main...HEAD to see the full diff
+- Read each changed file completely before judging
+- Look at surrounding code to understand patterns
+- Check existing tests to understand expected behavior
+</code_exploration>
+
+<context>
+Code review catches issues before merge. Focus on real problems - not style nitpicks. Apply these criteria:
+- Code cleanliness: Is the implementation clean and well-structured?
+- DRY principle: Does it avoid duplication?
+- Code reuse: Are there parts that should be reused from other places?
+- Organization: Is everything in the right place?
+- Consistency: Is it in the same style as other parts of the codebase?
+- Simplicity: Is it over-engineered? Remember KISS and YAGNI. No dead code paths, no defensive programming.
+- No pointless wrappers: Functions that just call another function should be inlined.
+- User experience: Does it provide a good user experience?
+- Tests: Are tests meaningful or just trivial coverage?
+- Live tests: Test changes with real services if applicable.
+- Rules: Does the code follow CLAUDE.md guidelines?
+</context>
+
+<scope>
+Review only - identify issues but do not fix them. Write findings to report.
+</scope>
+
+<report>
+Write your review to .claude/REPORT.md:
+
+## Summary
+[Overall assessment of the changes]
+
+## Issues Found
+| Severity | File:Line | Issue | Suggestion |
+|----------|-----------|-------|------------|
+| Critical/High/Medium/Low | path:123 | description | fix |
+
+## Positive Observations
+[What's well done]
+</report>"
+```
+
+**Common mistake**: Forgetting `--from HEAD` means the agent starts from `origin/main` and won't see any of the branch changes!
+
+## Scenario 2: Multi-feature implementation
 
 **User request**: "Implement user auth, payment processing, and email notifications"
 
@@ -169,7 +230,7 @@ After verifying tests pass, write to .claude/REPORT.md with summary, files chang
 </report>"
 ```
 
-## Scenario 2: Test-driven development
+## Scenario 3: Test-driven development
 
 **User request**: "Add a caching layer with comprehensive tests"
 
@@ -289,7 +350,7 @@ After ALL tests pass, write to .claude/REPORT.md:
 </report>"
 ```
 
-## Scenario 3: Large refactoring by module
+## Scenario 4: Large refactoring by module
 
 **User request**: "Refactor the API to use consistent error handling"
 
@@ -357,7 +418,7 @@ After tests pass and linting is clean, write to .claude/REPORT.md:
 </report>"
 ```
 
-## Scenario 4: Documentation and implementation in parallel
+## Scenario 5: Documentation and implementation in parallel
 
 **User request**: "Add a plugin system with documentation"
 

agent_cli/install/extras.py

@@ -60,13 +60,15 @@ def _get_current_uv_tool_extras() -> list[str]:
     return []
 
 
-def _install_via_uv_tool(extras: list[str]) -> bool:
+def _install_via_uv_tool(extras: list[str], *, quiet: bool = False) -> bool:
     """Reinstall agent-cli via uv tool with the specified extras."""
     current_version = get_version("agent-cli").split("+")[0]  # Strip local version
     extras_str = ",".join(extras)
     package_spec = f"agent-cli[{extras_str}]=={current_version}"
     python_version = f"{sys.version_info.major}.{sys.version_info.minor}"
     cmd = ["uv", "tool", "install", package_spec, "--force", "--python", python_version]
+    if quiet:
+        cmd.append("-q")
     console.print(f"Running: [cyan]{' '.join(cmd)}[/]")
     result = subprocess.run(cmd, check=False)
     return result.returncode == 0
@@ -93,7 +95,7 @@ def _install_extras_impl(extras: list[str], *, quiet: bool = False) -> bool:
     if _is_uv_tool_install():
         current_extras = _get_current_uv_tool_extras()
         new_extras = sorted(set(current_extras) | set(extras))
-        return _install_via_uv_tool(new_extras)
+        return _install_via_uv_tool(new_extras, quiet=quiet)
 
     cmd = _install_cmd()
     for extra in extras:
@@ -120,7 +122,7 @@ def install_extras_programmatic(extras: list[str], *, quiet: bool = False) -> bo
     return bool(valid) and _install_extras_impl(valid, quiet=quiet)
 
 
-@app.command("install-extras", rich_help_panel="Installation")
+@app.command("install-extras", rich_help_panel="Installation", no_args_is_help=True)
 def install_extras(
     extras: Annotated[list[str] | None, typer.Argument(help="Extras to install")] = None,
     list_extras: Annotated[
@@ -135,10 +137,10 @@ def install_extras(
     """Install optional extras (rag, memory, vad, etc.) with pinned versions.
 
     Examples:
-        agent-cli install-extras rag           # Install RAG dependencies
-        agent-cli install-extras memory vad    # Install multiple extras
-        agent-cli install-extras --list        # Show available extras
-        agent-cli install-extras --all         # Install all extras
+        - `agent-cli install-extras rag`           # Install RAG dependencies
+        - `agent-cli install-extras memory vad`    # Install multiple extras
+        - `agent-cli install-extras --list`        # Show available extras
+        - `agent-cli install-extras --all`         # Install all extras
 
     """
     available = _available_extras()

agent_cli/memory/_files.py

@@ -9,7 +9,6 @@ from pathlib import Path
 from typing import TYPE_CHECKING
 from uuid import uuid4
 
-import yaml
 from pydantic import ValidationError
 
 from agent_cli.core.utils import atomic_write_text
@@ -218,6 +217,8 @@ def load_snapshot(snapshot_path: Path) -> dict[str, MemoryFileRecord]:
 
 def _render_front_matter(doc_id: str, metadata: MemoryMetadata) -> str:
     """Return YAML front matter string."""
+    import yaml  # noqa: PLC0415
+
     meta_dict = metadata.model_dump(exclude_none=True)
     meta_dict = {"id": doc_id, **meta_dict}
     yaml_block = yaml.safe_dump(meta_dict, sort_keys=False)
@@ -233,6 +234,8 @@ def _split_front_matter(text: str) -> tuple[dict | None, str]:
         return None, text
     yaml_part = text[3:end]
     try:
+        import yaml  # noqa: PLC0415
+
         meta = yaml.safe_load(yaml_part) or {}
     except Exception:
         return None, text

agent_cli/memory/_indexer.py

@@ -6,8 +6,6 @@ import logging
 from dataclasses import dataclass, field
 from typing import TYPE_CHECKING
 
-from watchfiles import Change
-
 from agent_cli.core.watch import watch_directory
 from agent_cli.memory._files import (
     _DELETED_DIRNAME,
@@ -24,6 +22,7 @@ if TYPE_CHECKING:
     from pathlib import Path
 
     from chromadb import Collection
+    from watchfiles import Change
 
 LOGGER = logging.getLogger(__name__)
 
@@ -108,6 +107,8 @@ async def watch_memory_store(collection: Collection, root: Path, *, index: Memor
 
 
 def _handle_change(change: Change, path: Path, collection: Collection, index: MemoryIndex) -> None:
+    from watchfiles import Change  # noqa: PLC0415
+
     if path.suffix == ".tmp":
         return
 

agent_cli/memory/_ingest.py

@@ -9,8 +9,6 @@ from time import perf_counter
 from typing import TYPE_CHECKING
 from uuid import uuid4
 
-import httpx
-
 from agent_cli.memory._git import commit_changes
 from agent_cli.memory._persistence import delete_memory_files, persist_entries, persist_summary
 from agent_cli.memory._prompt import (
@@ -58,6 +56,7 @@ async def extract_salient_facts(
     if not user_message and not assistant_message:
         return []
 
+    import httpx  # noqa: PLC0415
     from pydantic_ai import Agent  # noqa: PLC0415
     from pydantic_ai.exceptions import AgentRunError, UnexpectedModelBehavior  # noqa: PLC0415
     from pydantic_ai.models.openai import OpenAIChatModel  # noqa: PLC0415
@@ -174,16 +173,18 @@ async def reconcile_facts(
             if f.strip()
         ]
         return entries, [], {}
-    id_map: dict[int, str] = {idx: mem.id for idx, mem in enumerate(existing)}
-    existing_json = [{"id": idx, "text": mem.content} for idx, mem in enumerate(existing)]
-    existing_ids = set(id_map.keys())
 
+    import httpx  # noqa: PLC0415
     from pydantic_ai import Agent, ModelRetry, PromptedOutput  # noqa: PLC0415
     from pydantic_ai.exceptions import AgentRunError, UnexpectedModelBehavior  # noqa: PLC0415
     from pydantic_ai.models.openai import OpenAIChatModel  # noqa: PLC0415
     from pydantic_ai.providers.openai import OpenAIProvider  # noqa: PLC0415
     from pydantic_ai.settings import ModelSettings  # noqa: PLC0415
 
+    id_map: dict[int, str] = {idx: mem.id for idx, mem in enumerate(existing)}
+    existing_json = [{"id": idx, "text": mem.content} for idx, mem in enumerate(existing)]
+    existing_ids = set(id_map.keys())
+
     provider = OpenAIProvider(api_key=api_key or "dummy", base_url=openai_base_url)
     model_cfg = OpenAIChatModel(
         model_name=model,

agent_cli/memory/_streaming.py

@@ -4,8 +4,6 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any
 
-import httpx
-
 from agent_cli.core.sse import extract_content_from_chunk, parse_chunk
 
 if TYPE_CHECKING:
@@ -20,6 +18,8 @@ async def stream_chat_sse(
     request_timeout: float = 120.0,
 ) -> AsyncGenerator[str, None]:
     """Stream Server-Sent Events from an OpenAI-compatible chat completion endpoint."""
+    import httpx  # noqa: PLC0415
+
     url = f"{openai_base_url.rstrip('/')}/chat/completions"
     async with (
         httpx.AsyncClient(timeout=request_timeout) as client,

agent_cli/rag/_indexer.py

@@ -5,8 +5,6 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING
 
-from watchfiles import Change
-
 from agent_cli.core.watch import watch_directory
 from agent_cli.rag._indexing import index_file, remove_file
 from agent_cli.rag._utils import should_ignore_path
@@ -15,6 +13,7 @@ if TYPE_CHECKING:
     from pathlib import Path
 
     from chromadb import Collection
+    from watchfiles import Change
 
 LOGGER = logging.getLogger(__name__)
 
@@ -50,6 +49,8 @@ def _handle_change(
     file_hashes: dict[str, str],
     file_mtimes: dict[str, float],
 ) -> None:
+    from watchfiles import Change  # noqa: PLC0415
+
     try:
         if change == Change.deleted:
             LOGGER.info("[deleted] Removing from index: %s", file_path.name)

agent_cli/rag/api.py

@@ -24,6 +24,7 @@ from agent_cli.rag.models import ChatRequest  # noqa: TC001
 if TYPE_CHECKING:
     from pathlib import Path
 
+
 LOGGER = logging.getLogger(__name__)
 
 

agent_cli/server/cli.py

@@ -9,15 +9,13 @@ from pathlib import Path  # noqa: TC003 - Typer needs this at runtime
 from typing import Annotated
 
 import typer
-from rich.console import Console
 
 from agent_cli.cli import app as main_app
 from agent_cli.core.deps import requires_extras
 from agent_cli.core.process import set_process_title
+from agent_cli.core.utils import console, err_console
 from agent_cli.server.common import setup_rich_logging
 
-console = Console()
-err_console = Console(stderr=True)
 logger = logging.getLogger(__name__)
 
 # Check for optional dependencies at call time (not module load time)
@@ -295,7 +293,7 @@ def whisper_cmd(  # noqa: PLR0912, PLR0915
 
     """
     # Setup Rich logging for consistent output
-    setup_rich_logging(log_level, console=console)
+    setup_rich_logging(log_level)
 
     valid_backends = ("auto", "faster-whisper", "mlx")
     if backend not in valid_backends:
@@ -614,7 +612,7 @@ def tts_cmd(  # noqa: PLR0915
 
     """
     # Setup Rich logging for consistent output
-    setup_rich_logging(log_level, console=console)
+    setup_rich_logging(log_level)
 
     valid_backends = ("auto", "piper", "kokoro")
     if backend not in valid_backends:

agent_cli/server/common.py

@@ -9,10 +9,10 @@ import logging
 from contextlib import asynccontextmanager
 from typing import TYPE_CHECKING, Any, Protocol
 
-from rich.console import Console
 from rich.logging import RichHandler
 
 from agent_cli import constants
+from agent_cli.core.utils import console
 
 if TYPE_CHECKING:
     import wave
@@ -128,7 +128,7 @@ def configure_app(app: FastAPI) -> None:
         return await log_requests_middleware(request, call_next)
 
 
-def setup_rich_logging(log_level: str = "info", *, console: Console | None = None) -> None:
+def setup_rich_logging(log_level: str = "info") -> None:
     """Configure logging to use Rich for consistent, pretty output.
 
     This configures:
@@ -141,11 +141,10 @@ def setup_rich_logging(log_level: str = "info", *, console: Console | None = Non
 
     """
     level = getattr(logging, log_level.upper(), logging.INFO)
-    rich_console = console or Console()
 
     # Create Rich handler with clean format
     handler = RichHandler(
-        console=rich_console,
+        console=console,
         show_time=True,
         show_level=True,
         show_path=False,  # Don't show file:line - too verbose

agent_cli/server/whisper/backends/faster_whisper.py

@@ -6,6 +6,7 @@ import asyncio
 import logging
 import tempfile
 from concurrent.futures import ProcessPoolExecutor
+from dataclasses import dataclass
 from multiprocessing import get_context
 from pathlib import Path
 from typing import Any, Literal
@@ -19,6 +20,24 @@ from agent_cli.server.whisper.backends.base import (
 logger = logging.getLogger(__name__)
 
 
+# --- Subprocess state (only used within subprocess worker) ---
+# This state persists across function calls within the subprocess because:
+# 1. Model loading is expensive and must be reused across transcription calls
+# 2. CTranslate2 models cannot be pickled/passed through IPC queues
+# 3. The subprocess is long-lived (ProcessPoolExecutor reuses workers)
+
+
+@dataclass
+class _SubprocessState:
+    """Container for subprocess-local state. Not shared with main process."""
+
+    model: Any = None
+    device: str | None = None
+
+
+_state = _SubprocessState()
+
+
 # --- Subprocess worker functions (run in isolated process) ---
 
 
@@ -40,28 +59,22 @@ def _load_model_in_subprocess(
         cpu_threads=cpu_threads,
         download_root=download_root,
     )
-    return str(model.model.device)
+
+    # Store in subprocess state for reuse across transcription calls
+    _state.model = model
+    _state.device = str(model.model.device)
+
+    return _state.device
 
 
 def _transcribe_in_subprocess(
-    model_name: str,
-    device: str,
-    compute_type: str,
-    cpu_threads: int,
-    download_root: str | None,
     audio_bytes: bytes,
     kwargs: dict[str, Any],
 ) -> dict[str, Any]:
-    """Run transcription in subprocess. Model is loaded fresh each call."""
-    from faster_whisper import WhisperModel  # noqa: PLC0415
-
-    model = WhisperModel(
-        model_name,
-        device=device,
-        compute_type=compute_type,
-        cpu_threads=cpu_threads,
-        download_root=download_root,
-    )
+    """Run transcription in subprocess. Reuses model from _state."""
+    if _state.model is None:
+        msg = "Model not loaded in subprocess. Call _load_model_in_subprocess first."
+        raise RuntimeError(msg)
 
     # Write audio to temp file - faster-whisper needs a file path
     with tempfile.NamedTemporaryFile(suffix=".wav", delete=False) as tmp:
@@ -69,7 +82,7 @@ def _transcribe_in_subprocess(
         tmp_path = tmp.name
 
     try:
-        segments, info = model.transcribe(tmp_path, **kwargs)
+        segments, info = _state.model.transcribe(tmp_path, **kwargs)
         segment_list = list(segments)  # Consume lazy generator
     finally:
         Path(tmp_path).unlink(missing_ok=True)
@@ -195,16 +208,10 @@ class FasterWhisperBackend:
             "word_timestamps": word_timestamps,
         }
 
-        download_root = str(self._config.cache_dir) if self._config.cache_dir else None
         loop = asyncio.get_running_loop()
         result = await loop.run_in_executor(
             self._executor,
             _transcribe_in_subprocess,
-            self._config.model_name,
-            self._config.device,
-            self._config.compute_type,
-            self._config.cpu_threads,
-            download_root,
             audio,
             kwargs,
         )

agent_cli/services/llm.py

@@ -6,7 +6,6 @@ import sys
 import time
 from typing import TYPE_CHECKING
 
-import pyperclip
 from rich.live import Live
 
 from agent_cli.core.utils import console, live_timer, print_error_message, print_output_panel
@@ -156,6 +155,8 @@ async def get_llm_response(
         result_text = result.output
 
         if clipboard:
+            import pyperclip  # noqa: PLC0415
+
             pyperclip.copy(result_text)
             logger.info("Copied result to clipboard.")
 

{agent_cli-0.68.4.dist-info → agent_cli-0.69.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.68.4
+Version: 0.69.0
 Summary: A suite of AI-powered command-line tools for text correction, audio transcription, and voice assistance.
 Project-URL: Homepage, https://github.com/basnijholt/agent-cli
 Author-email: Bas Nijholt <bas@nijho.lt>
@@ -13,6 +13,7 @@ Requires-Dist: pydantic
 Requires-Dist: pyperclip
 Requires-Dist: rich
 Requires-Dist: setproctitle
+Requires-Dist: typer
 Requires-Dist: typer-slim[standard]
 Provides-Extra: audio
 Requires-Dist: numpy; extra == 'audio'
@@ -20,9 +21,10 @@ Requires-Dist: sounddevice>=0.4.6; extra == 'audio'
 Requires-Dist: wyoming>=1.5.2; extra == 'audio'
 Provides-Extra: dev
 Requires-Dist: markdown-code-runner>=2.7.0; extra == 'dev'
+Requires-Dist: markdown-gfm-admonition; extra == 'dev'
 Requires-Dist: notebook; extra == 'dev'
+Requires-Dist: pre-commit-uv>=4.1.4; extra == 'dev'
 Requires-Dist: pre-commit>=3.0.0; extra == 'dev'
-Requires-Dist: pydantic-ai-slim[openai]; extra == 'dev'
 Requires-Dist: pylint>=3.0.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.20.0; extra == 'dev'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
@@ -31,6 +33,7 @@ Requires-Dist: pytest-timeout; extra == 'dev'
 Requires-Dist: pytest>=7.0.0; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
 Requires-Dist: versioningit; extra == 'dev'
+Requires-Dist: zensical; extra == 'dev'
 Provides-Extra: faster-whisper
 Requires-Dist: fastapi[standard]; extra == 'faster-whisper'
 Requires-Dist: faster-whisper>=1.0.0; extra == 'faster-whisper'
@@ -70,7 +73,6 @@ Requires-Dist: fastapi[standard]; extra == 'server'
 Provides-Extra: speed
 Requires-Dist: audiostretchy>=1.3.0; extra == 'speed'
 Provides-Extra: test
-Requires-Dist: pydantic-ai-slim[openai]; extra == 'test'
 Requires-Dist: pytest-asyncio>=0.20.0; extra == 'test'
 Requires-Dist: pytest-cov>=4.0.0; extra == 'test'
 Requires-Dist: pytest-mock; extra == 'test'
@@ -496,9 +498,12 @@ agent-cli install-extras rag memory vad
 
  Install optional extras (rag, memory, vad, etc.) with pinned versions.
 
- Examples: agent-cli install-extras rag           # Install RAG dependencies agent-cli
- install-extras memory vad    # Install multiple extras agent-cli install-extras --list
- # Show available extras agent-cli install-extras --all         # Install all extras
+ Examples:
+
+  • agent-cli install-extras rag           # Install RAG dependencies
+  • agent-cli install-extras memory vad    # Install multiple extras
+  • agent-cli install-extras --list        # Show available extras
+  • agent-cli install-extras --all         # Install all extras
 
 ╭─ Arguments ────────────────────────────────────────────────────────────────────────────╮
 │   extras      [EXTRAS]...  Extras to install                                           │