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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agent-cli
-Version: 0.81.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.81.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.81.0 → agent_cli-0.82.0}/agent_cli/config.py

@@ -344,7 +344,8 @@ def _flatten_nested_sections(cfg: dict[str, Any], prefix: str = "") -> dict[str,
             scalar_items = {k: v for k, v in value.items() if not isinstance(v, dict)}
             if scalar_items:
                 result[full_key] = scalar_items
-            result.update(_flatten_nested_sections(value, full_key))
+            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.81.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/_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