agent-cli 0.80.0__tar.gz → 0.82.0__tar.gz

{agent_cli-0.80.0 → agent_cli-0.82.0}/.pre-commit-config.yaml

@@ -8,7 +8,7 @@ repos:
       - id: end-of-file-fixer
       - id: mixed-line-ending
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: "v0.14.14"
+    rev: "v0.15.0"
     hooks:
       - id: ruff
         args: ["--fix"]

{agent_cli-0.80.0 → agent_cli-0.82.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.80.0
+Version: 0.82.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>

{agent_cli-0.80.0 → agent_cli-0.82.0}/agent_cli/_tools.py

@@ -130,7 +130,7 @@ def execute_code(code: str) -> str:
     except subprocess.CalledProcessError as e:
         return f"Error executing code: {e.stderr}"
     except FileNotFoundError:
-        return f"Error: Command not found: {code.split()[0]}"
+        return f"Error: Command not found: {code.split(maxsplit=1)[0]}"
 
 
 def add_memory(content: str, category: str = "general", tags: str = "") -> str:

{agent_cli-0.80.0 → agent_cli-0.82.0}/agent_cli/agents/chat.py

@@ -272,7 +272,7 @@ async def _handle_conversation_turn(
 
     # 6. Save history
     if history_cfg.history_dir:
-        history_path = Path(history_cfg.history_dir).expanduser()
+        history_path = Path(history_cfg.history_dir).expanduser()  # noqa: ASYNC240
         history_path.mkdir(parents=True, exist_ok=True)
         # Share the history directory with the memory tools
         os.environ["AGENT_CLI_HISTORY_DIR"] = str(history_path)
@@ -335,7 +335,7 @@ async def _async_main(
         # Load conversation history
         conversation_history = []
         if history_cfg.history_dir:
-            history_path = Path(history_cfg.history_dir).expanduser()
+            history_path = Path(history_cfg.history_dir).expanduser()  # noqa: ASYNC240
             history_path.mkdir(parents=True, exist_ok=True)
             # Share the history directory with the memory tools
             os.environ["AGENT_CLI_HISTORY_DIR"] = str(history_path)

{agent_cli-0.80.0 → agent_cli-0.82.0}/agent_cli/agents/transcribe_live.py

@@ -188,7 +188,7 @@ async def _process_segment(  # noqa: PLR0912
     if cfg.clipboard:
         import pyperclip  # noqa: PLC0415
 
-        text_to_copy = processed if processed else transcript
+        text_to_copy = processed or transcript
         pyperclip.copy(text_to_copy)
 
     # Log

{agent_cli-0.80.0 → agent_cli-0.82.0}/agent_cli/config.py

@@ -264,6 +264,9 @@ class Dev(BaseModel):
 
     default_agent: str | None = None
     default_editor: str | None = None
+    branch_name_mode: Literal["random", "auto", "ai"] = "random"
+    branch_name_agent: Literal["claude", "codex", "gemini"] | None = None
+    branch_name_timeout: float = 20.0  # seconds
     agent_args: dict[str, list[str]] | None = (
         None  # Per-agent args, e.g. {"claude": ["--dangerously-skip-permissions"]}
     )
@@ -319,17 +322,30 @@ def normalize_provider_defaults(cfg: dict[str, Any]) -> dict[str, Any]:
     return normalized
 
 
-def _replace_dashed_keys(cfg: dict[str, Any]) -> dict[str, Any]:
-    return {k.replace("-", "_"): v for k, v in cfg.items()}
+def _replace_dashed_keys(cfg: Any) -> Any:
+    """Recursively replace dashed keys in dictionaries."""
+    if isinstance(cfg, dict):
+        return {k.replace("-", "_"): _replace_dashed_keys(v) for k, v in cfg.items()}
+    return cfg
 
 
 def _flatten_nested_sections(cfg: dict[str, Any], prefix: str = "") -> dict[str, Any]:
-    """Flatten nested TOML sections: {"a": {"b": {"x": 1}}} -> {"a.b": {"x": 1}}."""
-    result = {}
+    """Flatten nested TOML sections while preserving scalar parent options.
+
+    Example:
+        {"a": {"x": 1, "b": {"y": 2}}} -> {"a": {"x": 1}, "a.b": {"y": 2}}
+        {"a": {"b": {"x": 1}}} -> {"a.b": {"x": 1}}
+
+    """
+    result: dict[str, Any] = {}
     for key, value in cfg.items():
         full_key = f"{prefix}.{key}" if prefix else key
         if isinstance(value, dict) and any(isinstance(v, dict) for v in value.values()):
-            result.update(_flatten_nested_sections(value, full_key))
+            scalar_items = {k: v for k, v in value.items() if not isinstance(v, dict)}
+            if scalar_items:
+                result[full_key] = scalar_items
+            dict_items = {k: v for k, v in value.items() if isinstance(v, dict)}
+            result.update(_flatten_nested_sections(dict_items, full_key))
         else:
             result[full_key] = value
     return result

{agent_cli-0.80.0 → agent_cli-0.82.0}/agent_cli/core/deps.py

@@ -61,7 +61,7 @@ EXTRAS: dict[str, tuple[str, list[str]]] = {
 
 def _check_package_installed(pkg: str) -> bool:
     """Check if a single package is installed."""
-    top_module = pkg.split(".")[0]
+    top_module = pkg.split(".", maxsplit=1)[0]
     try:
         return find_spec(top_module) is not None
     except (ValueError, ModuleNotFoundError):

{agent_cli-0.80.0 → agent_cli-0.82.0}/agent_cli/core/watch.py

@@ -53,7 +53,7 @@ async def watch_directory(
     async for changes in awatch(root):
         for change_type, file_path_str in changes:
             path = Path(file_path_str)
-            if path.is_dir():
+            if path.is_dir():  # noqa: ASYNC240
                 continue
 
             if should_skip is not None and should_skip(path, root):

agent_cli-0.82.0/agent_cli/dev/_branch_name.py

@@ -0,0 +1,371 @@
+"""Branch name generation for dev worktrees."""
+
+from __future__ import annotations
+
+import json
+import random
+import re
+import shutil
+import subprocess
+from typing import TYPE_CHECKING
+
+from agent_cli.core.utils import err_console
+
+from . import worktree
+
+if TYPE_CHECKING:
+    from collections.abc import Callable
+    from pathlib import Path
+
+AGENTS: tuple[str, ...] = ("claude", "codex", "gemini")
+
+_ADJECTIVES = [
+    "happy",
+    "clever",
+    "swift",
+    "bright",
+    "calm",
+    "eager",
+    "fancy",
+    "gentle",
+    "jolly",
+    "keen",
+    "lively",
+    "merry",
+    "nice",
+    "proud",
+    "quick",
+    "sharp",
+    "smart",
+    "sunny",
+    "witty",
+    "zesty",
+    "bold",
+    "cool",
+    "fresh",
+    "grand",
+]
+_NOUNS = [
+    "fox",
+    "owl",
+    "bear",
+    "wolf",
+    "hawk",
+    "lion",
+    "tiger",
+    "eagle",
+    "falcon",
+    "otter",
+    "panda",
+    "raven",
+    "shark",
+    "whale",
+    "zebra",
+    "bison",
+    "crane",
+    "dolphin",
+    "gecko",
+    "heron",
+    "koala",
+    "lemur",
+    "moose",
+    "newt",
+    "oriole",
+]
+
+_MAX_BRANCH_NAME_LEN = 80
+_MAX_BRANCH_TASK_LEN = 1200
+_CLAUDE_BRANCH_SCHEMA = json.dumps(
+    {
+        "type": "object",
+        "properties": {
+            "branch": {
+                "type": "string",
+                "pattern": r"^[a-z0-9][a-z0-9._/-]{1,79}$",
+            },
+        },
+        "required": ["branch"],
+        "additionalProperties": False,
+    },
+    separators=(",", ":"),
+)
+
+
+def _branch_exists_in_repo(repo_root: Path, branch_name: str) -> bool:
+    """Check whether a branch already exists locally or on origin."""
+    return any(worktree.check_branch_exists(branch_name, repo_root))
+
+
+def _ensure_unique_branch_name(
+    base_name: str,
+    existing_branches: set[str] | None = None,
+    *,
+    repo_root: Path | None = None,
+) -> str:
+    """Add a numeric suffix when a branch name collides."""
+    existing = existing_branches or set()
+
+    def is_available(candidate: str) -> bool:
+        if candidate in existing:
+            return False
+        return repo_root is None or not _branch_exists_in_repo(repo_root, candidate)
+
+    if is_available(base_name):
+        return base_name
+
+    for i in range(2, 100):
+        candidate = f"{base_name}-{i}"
+        if is_available(candidate):
+            return candidate
+
+    for _ in range(20):
+        candidate = f"{base_name}-{random.randint(100, 999)}"  # noqa: S311
+        if is_available(candidate):
+            return candidate
+
+    # Last resort: large range, unchecked (98 sequential + 20 random exhausted)
+    return f"{base_name}-{random.randint(1000, 9999)}"  # noqa: S311
+
+
+def _parse_json_lines(output: str) -> list[dict[str, object]]:
+    """Parse JSONL output and ignore non-JSON lines."""
+    parsed: list[dict[str, object]] = []
+    for raw_line in output.splitlines():
+        stripped_line = raw_line.strip()
+        if not stripped_line:
+            continue
+        try:
+            item = json.loads(stripped_line)
+        except json.JSONDecodeError:
+            continue
+        if isinstance(item, dict):
+            parsed.append(item)
+    return parsed
+
+
+def _extract_branch_from_claude_output(output: str) -> str | None:
+    """Extract branch name from `claude -p --output-format json` output."""
+    for event in reversed(_parse_json_lines(output)):
+        structured = event.get("structured_output")
+        if isinstance(structured, dict):
+            branch = structured.get("branch")
+            if isinstance(branch, str) and branch.strip():
+                return branch
+        result = event.get("result")
+        if isinstance(result, str) and result.strip():
+            return result
+    return None
+
+
+def _extract_branch_from_codex_output(output: str) -> str | None:
+    """Extract branch name from `codex exec --json` output."""
+    branch: str | None = None
+    for event in _parse_json_lines(output):
+        if event.get("type") != "item.completed":
+            continue
+        item = event.get("item")
+        if not isinstance(item, dict):
+            continue
+        if item.get("type") != "agent_message":
+            continue
+        text = item.get("text")
+        if isinstance(text, str) and text.strip():
+            branch = text
+    return branch
+
+
+def _extract_branch_from_gemini_output(output: str) -> str | None:
+    """Extract branch name from `gemini -p -o json` output."""
+    for raw_line in output.splitlines():
+        stripped = raw_line.strip()
+        if not stripped:
+            continue
+        try:
+            item = json.loads(stripped)
+        except json.JSONDecodeError:
+            continue
+        if isinstance(item, dict):
+            response = item.get("response")
+            if isinstance(response, str) and response.strip():
+                return response
+    return None
+
+
+def _normalize_ai_branch_candidate(candidate: str, repo_root: Path) -> str | None:
+    """Normalize model output into a safe branch slug."""
+    lines = [line.strip() for line in candidate.replace("`", "").splitlines() if line.strip()]
+    if not lines:
+        return None
+
+    branch = lines[0].strip().strip("'\"")
+    branch = re.sub(r"^(branch|name)\s*:\s*", "", branch, flags=re.IGNORECASE)
+    branch = branch.lower()
+    branch = re.sub(r"\s+", "-", branch)
+    branch = re.sub(r"[^a-z0-9._/-]", "-", branch)
+    branch = re.sub(r"/{2,}", "/", branch)
+    branch = re.sub(r"-{2,}", "-", branch)
+    branch = branch.strip("./-")
+    if len(branch) > _MAX_BRANCH_NAME_LEN:
+        branch = branch[:_MAX_BRANCH_NAME_LEN].rstrip("./-")
+    if not branch:
+        return None
+
+    try:
+        result = subprocess.run(
+            ["git", "check-ref-format", "--branch", branch],  # noqa: S607
+            cwd=repo_root,
+            check=False,
+            capture_output=True,
+            text=True,
+        )
+    except OSError:
+        return None
+    return branch if result.returncode == 0 else None
+
+
+def _build_branch_naming_prompt(
+    repo_root: Path,
+    prompt: str | None,
+    from_ref: str | None,
+) -> str:
+    """Build a constrained prompt for branch name generation."""
+    task = (prompt or "").strip()
+    if not task:
+        task = "General maintenance task."
+    if len(task) > _MAX_BRANCH_TASK_LEN:
+        task = task[:_MAX_BRANCH_TASK_LEN] + "..."
+
+    base_ref = from_ref or "default branch"
+    return (
+        "Generate exactly one git branch name.\n"
+        "Return only the branch name and nothing else.\n"
+        "Do not use tools, do not inspect files, and do not ask follow-up questions.\n"
+        "Rules:\n"
+        "- lowercase ascii only\n"
+        "- allowed characters: a-z 0-9 / - _ .\n"
+        "- no spaces, no backticks, no explanation\n"
+        "- max 80 characters\n"
+        f"Repository: {repo_root.name}\n"
+        f"Base ref: {base_ref}\n"
+        f"Task: {task}\n"
+    )
+
+
+def _generate_branch_name_with_agent(
+    agent_name: str,
+    repo_root: Path,
+    prompt: str | None,
+    from_ref: str | None,
+    timeout_seconds: float,
+) -> str | None:
+    """Run a headless agent to generate a branch name."""
+    naming_prompt = _build_branch_naming_prompt(repo_root, prompt, from_ref)
+
+    agent_commands: dict[str, tuple[list[str], Callable[[str], str | None]]] = {
+        "claude": (
+            [
+                "claude",
+                "-p",
+                "--output-format",
+                "json",
+                "--permission-mode",
+                "plan",
+                "--no-session-persistence",
+                "--json-schema",
+                _CLAUDE_BRANCH_SCHEMA,
+                naming_prompt,
+            ],
+            _extract_branch_from_claude_output,
+        ),
+        "codex": (
+            [
+                "codex",
+                "-a",
+                "never",
+                "exec",
+                "-s",
+                "read-only",
+                "--json",
+                naming_prompt,
+            ],
+            _extract_branch_from_codex_output,
+        ),
+        "gemini": (
+            ["gemini", "-p", naming_prompt, "-o", "json"],
+            _extract_branch_from_gemini_output,
+        ),
+    }
+
+    entry = agent_commands.get(agent_name)
+    if entry is None:
+        return None
+    command, extractor = entry
+
+    try:
+        result = subprocess.run(
+            command,
+            check=False,
+            capture_output=True,
+            text=True,
+            timeout=timeout_seconds,
+            cwd=repo_root,
+        )
+    except (OSError, subprocess.TimeoutExpired):
+        return None
+    if result.returncode != 0:
+        return None
+
+    raw_branch = extractor(result.stdout)
+    if not raw_branch:
+        return None
+    return _normalize_ai_branch_candidate(raw_branch, repo_root)
+
+
+def generate_ai_branch_name(
+    repo_root: Path,
+    existing_branches: set[str],
+    prompt: str | None,
+    from_ref: str | None,
+    preferred_agent: str | None,
+    timeout_seconds: float,
+) -> str | None:
+    """Generate an AI branch name, trying available agents in order."""
+    if preferred_agent:
+        agent = preferred_agent.lower().strip()
+        if agent not in AGENTS or shutil.which(agent) is None:
+            return None
+        agents = [agent]
+    else:
+        agents = [a for a in AGENTS if shutil.which(a)]
+
+    for agent_name in agents:
+        with err_console.status(f"Generating branch name with {agent_name}..."):
+            branch = _generate_branch_name_with_agent(
+                agent_name,
+                repo_root,
+                prompt,
+                from_ref,
+                timeout_seconds,
+            )
+        if branch:
+            return _ensure_unique_branch_name(
+                branch,
+                existing_branches,
+                repo_root=repo_root,
+            )
+
+    return None
+
+
+def generate_random_branch_name(
+    existing_branches: set[str] | None = None,
+    *,
+    repo_root: Path | None = None,
+) -> str:
+    """Generate a unique random branch name like 'clever-fox'.
+
+    If the name already exists, adds a numeric suffix (clever-fox-2).
+    """
+    existing = existing_branches or set()
+    base = f"{random.choice(_ADJECTIVES)}-{random.choice(_NOUNS)}"  # noqa: S311
+    return _ensure_unique_branch_name(base, existing, repo_root=repo_root)

agent_cli-0.82.0/agent_cli/dev/_output.py

@@ -0,0 +1,37 @@
+"""Console output helpers for the dev module."""
+
+from __future__ import annotations
+
+from typing import NoReturn
+
+import typer
+
+from agent_cli.core.utils import console, err_console
+
+
+def error(msg: str) -> NoReturn:
+    """Print an error message and exit."""
+    err_console.print(f"[bold red]Error:[/bold red] {msg}")
+    raise typer.Exit(1)
+
+
+def success(msg: str) -> None:
+    """Print a success message."""
+    console.print(f"[bold green]✓[/bold green] {msg}")
+
+
+def info(msg: str) -> None:
+    """Print an info message, with special styling for commands."""
+    # Style commands (messages starting with "Running: ")
+    if msg.startswith("Running: "):
+        cmd = msg[9:]  # Remove "Running: " prefix
+        # Escape brackets to prevent Rich from interpreting them as markup
+        cmd = cmd.replace("[", r"\[")
+        console.print(f"[dim]→[/dim] Running: [bold cyan]{cmd}[/bold cyan]")
+    else:
+        console.print(f"[dim]→[/dim] {msg}")
+
+
+def warn(msg: str) -> None:
+    """Print a warning message."""
+    console.print(f"[yellow]Warning:[/yellow] {msg}")

agent_cli-0.82.0/agent_cli/dev/cleanup.py

@@ -0,0 +1,112 @@
+"""Worktree cleanup operations."""
+
+from __future__ import annotations
+
+import json
+import subprocess
+from typing import TYPE_CHECKING
+
+from . import worktree
+
+if TYPE_CHECKING:
+    from pathlib import Path
+
+
+def find_worktrees_with_no_commits(repo_root: Path) -> list[worktree.WorktreeInfo]:
+    """Find worktrees whose branches have no commits ahead of the default branch."""
+    worktrees_list = worktree.list_worktrees()
+    default_branch = worktree.get_default_branch(repo_root)
+    to_remove: list[worktree.WorktreeInfo] = []
+
+    for wt in worktrees_list:
+        if wt.is_main or not wt.branch:
+            continue
+
+        # Check if branch has any commits ahead of default branch
+        result = subprocess.run(
+            ["git", "rev-list", f"{default_branch}..{wt.branch}", "--count"],  # noqa: S607
+            capture_output=True,
+            text=True,
+            cwd=repo_root,
+            check=False,
+        )
+        if result.returncode == 0 and result.stdout.strip() == "0":
+            to_remove.append(wt)
+
+    return to_remove
+
+
+def find_worktrees_with_merged_prs(
+    repo_root: Path,
+) -> list[tuple[worktree.WorktreeInfo, str]]:
+    """Find worktrees whose PRs have been merged on GitHub.
+
+    Returns a list of tuples containing (worktree_info, pr_url).
+    """
+    worktrees_list = worktree.list_worktrees()
+    to_remove: list[tuple[worktree.WorktreeInfo, str]] = []
+
+    for wt in worktrees_list:
+        if wt.is_main or not wt.branch:
+            continue
+
+        # Check if PR for this branch is merged
+        result = subprocess.run(
+            ["gh", "pr", "list", "--head", wt.branch, "--state", "merged", "--json", "number,url"],  # noqa: S607
+            capture_output=True,
+            text=True,
+            cwd=repo_root,
+            check=False,
+        )
+        if result.returncode == 0 and result.stdout.strip() not in ("", "[]"):
+            prs = json.loads(result.stdout)
+            pr_url = prs[0]["url"] if prs else ""
+            to_remove.append((wt, pr_url))
+
+    return to_remove
+
+
+def check_gh_available() -> tuple[bool, str]:
+    """Check if GitHub CLI is available and authenticated.
+
+    Returns (ok, error_message).
+    """
+    gh_version = subprocess.run(
+        ["gh", "--version"],  # noqa: S607
+        capture_output=True,
+        check=False,
+    )
+    if gh_version.returncode != 0:
+        return False, "GitHub CLI (gh) not found. Install from: https://cli.github.com/"
+
+    gh_auth = subprocess.run(
+        ["gh", "auth", "status"],  # noqa: S607
+        capture_output=True,
+        check=False,
+    )
+    if gh_auth.returncode != 0:
+        return False, "Not authenticated with GitHub. Run: gh auth login"
+
+    return True, ""
+
+
+def remove_worktrees(
+    worktrees_to_remove: list[worktree.WorktreeInfo],
+    repo_root: Path,
+    *,
+    force: bool = False,
+) -> list[tuple[str, bool, str | None]]:
+    """Remove a list of worktrees.
+
+    Returns list of (branch_name, success, error_message) tuples.
+    """
+    results: list[tuple[str, bool, str | None]] = []
+    for wt in worktrees_to_remove:
+        success, error = worktree.remove_worktree(
+            wt.path,
+            force=force,
+            delete_branch=True,
+            repo_path=repo_root,
+        )
+        results.append((wt.branch or wt.path.name, success, error))
+    return results