aider-ce 0.88.20__py3-none-any.whl

aider/tools/git_show.py

@@ -0,0 +1,51 @@
+from aider.repo import ANY_GIT_ERROR
+
+schema = {
+    "type": "function",
+    "function": {
+        "name": "GitShow",
+        "description": "Show various types of objects (blobs, trees, tags, and commits).",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "object": {
+                    "type": "string",
+                    "description": "The object to show. Defaults to HEAD.",
+                },
+            },
+            "required": [],
+        },
+    },
+}
+
+# Normalized tool name for lookup
+NORM_NAME = "gitshow"
+
+
+def _execute_git_show(coder, object="HEAD"):
+    """
+    Show various types of objects (blobs, trees, tags, and commits).
+    """
+    if not coder.repo:
+        return "Not in a git repository."
+
+    try:
+        return coder.repo.repo.git.show(object)
+    except ANY_GIT_ERROR as e:
+        coder.io.tool_error(f"Error running git show: {e}")
+        return f"Error running git show: {e}"
+
+
+def process_response(coder, params):
+    """
+    Process the GitShow tool response.
+
+    Args:
+        coder: The Coder instance
+        params: Dictionary of parameters
+
+    Returns:
+        str: Result message
+    """
+    object = params.get("object", "HEAD")
+    return _execute_git_show(coder, object)

aider/tools/git_status.py

@@ -0,0 +1,46 @@
+from aider.repo import ANY_GIT_ERROR
+
+schema = {
+    "type": "function",
+    "function": {
+        "name": "GitStatus",
+        "description": "Show the working tree status.",
+        "parameters": {
+            "type": "object",
+            "properties": {},
+            "required": [],
+        },
+    },
+}
+
+# Normalized tool name for lookup
+NORM_NAME = "gitstatus"
+
+
+def _execute_git_status(coder):
+    """
+    Show the working tree status.
+    """
+    if not coder.repo:
+        return "Not in a git repository."
+
+    try:
+        return coder.repo.repo.git.status()
+    except ANY_GIT_ERROR as e:
+        coder.io.tool_error(f"Error running git status: {e}")
+        return f"Error running git status: {e}"
+
+
+def process_response(coder, params):
+    """
+    Process the GitStatus tool response.
+
+    Args:
+        coder: The Coder instance
+        params: Dictionary of parameters (should be empty for GitStatus)
+
+    Returns:
+        str: Result message
+    """
+    # GitStatus tool has no parameters to validate
+    return _execute_git_status(coder)

aider/tools/grep.py

@@ -0,0 +1,256 @@
+import shutil
+from pathlib import Path
+
+import oslex
+
+from aider.run_cmd import run_cmd_subprocess
+
+schema = {
+    "type": "function",
+    "function": {
+        "name": "Grep",
+        "description": "Search for a pattern in files.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "pattern": {
+                    "type": "string",
+                    "description": "The pattern to search for.",
+                },
+                "file_pattern": {
+                    "type": "string",
+                    "description": "Glob pattern for files to search. Defaults to '*'.",
+                },
+                "directory": {
+                    "type": "string",
+                    "description": "Directory to search in. Defaults to '.'.",
+                },
+                "use_regex": {
+                    "type": "boolean",
+                    "description": "Whether to use regex. Defaults to False.",
+                },
+                "case_insensitive": {
+                    "type": "boolean",
+                    "description": (
+                        "Whether to perform a case-insensitive search. Defaults to False."
+                    ),
+                },
+                "context_before": {
+                    "type": "integer",
+                    "description": "Number of lines to show before a match. Defaults to 5.",
+                },
+                "context_after": {
+                    "type": "integer",
+                    "description": "Number of lines to show after a match. Defaults to 5.",
+                },
+            },
+            "required": ["pattern"],
+        },
+    },
+}
+
+# Normalized tool name for lookup
+NORM_NAME = "grep"
+
+
+def _find_search_tool():
+    """Find the best available command-line search tool (rg, ag, grep)."""
+    if shutil.which("rg"):
+        return "rg", shutil.which("rg")
+    elif shutil.which("ag"):
+        return "ag", shutil.which("ag")
+    elif shutil.which("grep"):
+        return "grep", shutil.which("grep")
+    else:
+        return None, None
+
+
+def _execute_grep(
+    coder,
+    pattern,
+    file_pattern="*",
+    directory=".",
+    use_regex=False,
+    case_insensitive=False,
+    context_before=5,
+    context_after=5,
+):
+    """
+    Search for lines matching a pattern in files within the project repository.
+    Uses rg (ripgrep), ag (the silver searcher), or grep, whichever is available.
+
+    Args:
+        coder: The Coder instance.
+        pattern (str): The pattern to search for.
+        file_pattern (str, optional): Glob pattern to filter files. Defaults to "*".
+        directory (str, optional): Directory to search within relative to repo root. Defaults to ".".
+        use_regex (bool, optional): Whether the pattern is a regular expression. Defaults to False.
+        case_insensitive (bool, optional): Whether the search should be case-insensitive. Defaults to False.
+        context_before (int, optional): Number of context lines to show before matches. Defaults to 5.
+        context_after (int, optional): Number of context lines to show after matches. Defaults to 5.
+
+    Returns:
+        str: Formatted result indicating success or failure, including matching lines or error message.
+    """
+    repo = coder.repo
+    if not repo:
+        coder.io.tool_error("Not in a git repository.")
+        return "Error: Not in a git repository."
+
+    tool_name, tool_path = _find_search_tool()
+    if not tool_path:
+        coder.io.tool_error("No search tool (rg, ag, grep) found in PATH.")
+        return "Error: No search tool (rg, ag, grep) found."
+
+    try:
+        search_dir_path = Path(repo.root) / directory
+        if not search_dir_path.is_dir():
+            coder.io.tool_error(f"Directory not found: {directory}")
+            return f"Error: Directory not found: {directory}"
+
+        # Build the command arguments based on the available tool
+        cmd_args = [tool_path]
+
+        # Common options or tool-specific equivalents
+        if tool_name in ["rg", "grep"]:
+            cmd_args.append("-n")  # Line numbers for rg and grep
+        # ag includes line numbers by default
+
+        if tool_name in ["rg"]:
+            cmd_args.append("--heading")  # Filename above output for ripgrep
+
+        # Context lines (Before and After)
+        if context_before > 0:
+            # All tools use -B for lines before
+            cmd_args.extend(["-B", str(context_before)])
+        if context_after > 0:
+            # All tools use -A for lines after
+            cmd_args.extend(["-A", str(context_after)])
+
+        # Case sensitivity
+        if case_insensitive:
+            cmd_args.append("-i")  # Add case-insensitivity flag for all tools
+
+        # Pattern type (regex vs fixed string)
+        if use_regex:
+            if tool_name == "grep":
+                cmd_args.append("-E")  # Use extended regex for grep
+            # rg and ag use regex by default, no flag needed for basic ERE
+        else:
+            if tool_name == "rg":
+                cmd_args.append("-F")  # Fixed strings for rg
+            elif tool_name == "ag":
+                cmd_args.append("-Q")  # Literal/fixed strings for ag
+            elif tool_name == "grep":
+                cmd_args.append("-F")  # Fixed strings for grep
+
+        # File filtering
+        if (
+            file_pattern != "*"
+        ):  # Avoid adding glob if it's the default '*' which might behave differently
+            if tool_name == "rg":
+                cmd_args.extend(["-g", file_pattern])
+            elif tool_name == "ag":
+                cmd_args.extend(["-G", file_pattern])
+            elif tool_name == "grep":
+                # grep needs recursive flag when filtering
+                cmd_args.append("-r")
+                cmd_args.append(f"--include={file_pattern}")
+        elif tool_name == "grep":
+            # grep needs recursive flag even without include filter
+            cmd_args.append("-r")
+
+        # Directory exclusion (rg and ag respect .gitignore/.git by default)
+        if tool_name == "grep":
+            cmd_args.append("--exclude-dir=.git")
+
+        # Add pattern and directory path
+        cmd_args.extend([pattern, str(search_dir_path)])
+
+        # Convert list to command string for run_cmd_subprocess
+        command_string = oslex.join(cmd_args)
+
+        coder.io.tool_output(f"⚙️ Executing {tool_name}: {command_string}")
+
+        # Use run_cmd_subprocess for execution
+        # Note: rg, ag, and grep return 1 if no matches are found, which is not an error for this tool.
+        exit_status, combined_output = run_cmd_subprocess(
+            command_string, verbose=coder.verbose, cwd=coder.root  # Execute in the project root
+        )
+
+        # Format the output for the result message
+        output_content = combined_output or ""
+
+        # Handle exit codes (consistent across rg, ag, grep)
+        if exit_status == 0:
+            # Limit output size if necessary
+            max_output_lines = 50  # Consider making this configurable
+            output_lines = output_content.splitlines()
+            if len(output_lines) > max_output_lines:
+                truncated_output = "\n".join(output_lines[:max_output_lines])
+                result_message = (
+                    f"Found matches (truncated):\n```text\n{truncated_output}\n..."
+                    f" ({len(output_lines) - max_output_lines} more lines)\n```"
+                )
+            elif not output_content:
+                # Should not happen if return code is 0, but handle defensively
+                coder.io.tool_warning(f"{tool_name} returned 0 but produced no output.")
+                result_message = "No matches found (unexpected)."
+            else:
+                result_message = f"Found matches:\n```text\n{output_content}\n```"
+            return result_message
+
+        elif exit_status == 1:
+            # Exit code 1 means no matches found - this is expected behavior, not an error.
+            return "No matches found."
+        else:
+            # Exit code > 1 indicates an actual error
+            error_message = f"{tool_name.capitalize()} command failed with exit code {exit_status}."
+            if output_content:
+                # Truncate error output as well if it's too long
+                error_limit = 1000  # Example limit for error output
+                if len(output_content) > error_limit:
+                    output_content = output_content[:error_limit] + "\n... (error output truncated)"
+                error_message += f" Output:\n{output_content}"
+            coder.io.tool_error(error_message)
+            return f"Error: {error_message}"
+
+    except Exception as e:
+        # Add command_string to the error message if it's defined
+        cmd_str_info = f"'{command_string}' " if "command_string" in locals() else ""
+        coder.io.tool_error(f"Error executing {tool_name} command {cmd_str_info}: {str(e)}")
+        return f"Error executing {tool_name}: {str(e)}"
+
+
+def process_response(coder, params):
+    """
+    Process the Grep tool response.
+
+    Args:
+        coder: The Coder instance
+        params: Dictionary of parameters
+
+    Returns:
+        str: Result message
+    """
+    pattern = params.get("pattern")
+    file_pattern = params.get("file_pattern", "*")  # Default to all files
+    directory = params.get("directory", ".")  # Default to current directory
+    use_regex = params.get("use_regex", False)  # Default to literal search
+    case_insensitive = params.get("case_insensitive", False)  # Default to case-sensitive
+    context_before = params.get("context_before", 5)
+    context_after = params.get("context_after", 5)
+
+    if pattern is not None:
+        return _execute_grep(
+            coder,
+            pattern,
+            file_pattern,
+            directory,
+            use_regex,
+            case_insensitive,
+            context_before,
+            context_after,
+        )
+    else:
+        return "Error: Missing required 'pattern' parameter for Grep"

aider/tools/indent_lines.py

@@ -0,0 +1,221 @@
+from .tool_utils import (
+    ToolError,
+    apply_change,
+    determine_line_range,
+    find_pattern_indices,
+    format_tool_result,
+    generate_unified_diff_snippet,
+    handle_tool_error,
+    select_occurrence_index,
+    validate_file_for_edit,
+)
+
+schema = {
+    "type": "function",
+    "function": {
+        "name": "IndentLines",
+        "description": "Indent a block of lines in a file.",
+        "parameters": {
+            "type": "object",
+            "properties": {
+                "file_path": {"type": "string"},
+                "start_pattern": {"type": "string"},
+                "end_pattern": {"type": "string"},
+                "line_count": {"type": "integer"},
+                "indent_levels": {"type": "integer", "default": 1},
+                "near_context": {"type": "string"},
+                "occurrence": {"type": "integer", "default": 1},
+                "change_id": {"type": "string"},
+                "dry_run": {"type": "boolean", "default": False},
+            },
+            "required": ["file_path", "start_pattern"],
+        },
+    },
+}
+
+# Normalized tool name for lookup
+NORM_NAME = "indentlines"
+
+
+def _execute_indent_lines(
+    coder,
+    file_path,
+    start_pattern,
+    end_pattern=None,
+    line_count=None,
+    indent_levels=1,
+    near_context=None,
+    occurrence=1,
+    change_id=None,
+    dry_run=False,
+):
+    """
+    Indent or unindent a block of lines in a file using utility functions.
+
+    Parameters:
+    - coder: The Coder instance
+    - file_path: Path to the file to modify
+    - start_pattern: Pattern marking the start of the block to indent (line containing this pattern)
+    - end_pattern: Optional pattern marking the end of the block (line containing this pattern)
+    - line_count: Optional number of lines to indent (alternative to end_pattern)
+    - indent_levels: Number of levels to indent (positive) or unindent (negative)
+    - near_context: Optional text nearby to help locate the correct instance of the start_pattern
+    - occurrence: Which occurrence of the start_pattern to use (1-based index, or -1 for last)
+    - change_id: Optional ID for tracking the change
+    - dry_run: If True, simulate the change without modifying the file
+
+    Returns a result message.
+    """
+    tool_name = "IndentLines"
+    try:
+        # 1. Validate file and get content
+        abs_path, rel_path, original_content = validate_file_for_edit(coder, file_path)
+        lines = original_content.splitlines()
+
+        # 2. Find the start line
+        pattern_desc = f"Start pattern '{start_pattern}'"
+        if near_context:
+            pattern_desc += f" near context '{near_context}'"
+        start_pattern_indices = find_pattern_indices(lines, start_pattern, near_context)
+        start_line_idx = select_occurrence_index(start_pattern_indices, occurrence, pattern_desc)
+
+        # 3. Determine the end line
+        start_line, end_line = determine_line_range(
+            coder=coder,
+            file_path=rel_path,
+            lines=lines,
+            start_pattern_line_index=start_line_idx,
+            end_pattern=end_pattern,
+            line_count=line_count,
+            target_symbol=None,  # IndentLines uses patterns, not symbols
+            pattern_desc=pattern_desc,
+        )
+
+        # 4. Validate and prepare indentation
+        try:
+            indent_levels = int(indent_levels)
+        except ValueError:
+            raise ToolError(f"Invalid indent_levels value: '{indent_levels}'. Must be an integer.")
+
+        indent_str = " " * 4  # Assume 4 spaces per level
+        modified_lines = list(lines)
+
+        # Apply indentation logic (core logic remains)
+        for i in range(start_line, end_line + 1):
+            if indent_levels > 0:
+                modified_lines[i] = (indent_str * indent_levels) + modified_lines[i]
+            elif indent_levels < 0:
+                spaces_to_remove = abs(indent_levels) * len(indent_str)
+                current_leading_spaces = len(modified_lines[i]) - len(modified_lines[i].lstrip(" "))
+                actual_remove = min(spaces_to_remove, current_leading_spaces)
+                if actual_remove > 0:
+                    modified_lines[i] = modified_lines[i][actual_remove:]
+
+        new_content = "\n".join(modified_lines)
+
+        if original_content == new_content:
+            coder.io.tool_warning("No changes made: indentation would not change file")
+            return "Warning: No changes made (indentation would not change file)"
+
+        # 5. Generate diff for feedback
+        diff_snippet = generate_unified_diff_snippet(original_content, new_content, rel_path)
+        num_occurrences = len(start_pattern_indices)
+        occurrence_str = f"occurrence {occurrence} of " if num_occurrences > 1 else ""
+        action = "indent" if indent_levels > 0 else "unindent"
+        levels = abs(indent_levels)
+        level_text = "level" if levels == 1 else "levels"
+        num_lines = end_line - start_line + 1
+
+        # 6. Handle dry run
+        if dry_run:
+            dry_run_message = (
+                f"Dry run: Would {action} {num_lines} lines ({start_line + 1}-{end_line + 1}) by"
+                f" {levels} {level_text} (based on {occurrence_str}start pattern '{start_pattern}')"
+                f" in {file_path}."
+            )
+            return format_tool_result(
+                coder,
+                tool_name,
+                "",
+                dry_run=True,
+                dry_run_message=dry_run_message,
+                diff_snippet=diff_snippet,
+            )
+
+        # 7. Apply Change (Not dry run)
+        metadata = {
+            "start_line": start_line + 1,
+            "end_line": end_line + 1,
+            "start_pattern": start_pattern,
+            "end_pattern": end_pattern,
+            "line_count": line_count,
+            "indent_levels": indent_levels,
+            "near_context": near_context,
+            "occurrence": occurrence,
+        }
+        final_change_id = apply_change(
+            coder,
+            abs_path,
+            rel_path,
+            original_content,
+            new_content,
+            "indentlines",
+            metadata,
+            change_id,
+        )
+
+        coder.files_edited_by_tools.add(rel_path)
+
+        # 8. Format and return result
+        action_past = "Indented" if indent_levels > 0 else "Unindented"
+        success_message = (
+            f"{action_past} {num_lines} lines by {levels} {level_text} (from {occurrence_str}start"
+            f" pattern) in {file_path}"
+        )
+        return format_tool_result(
+            coder, tool_name, success_message, change_id=final_change_id, diff_snippet=diff_snippet
+        )
+    except ToolError as e:
+        # Handle errors raised by utility functions (expected errors)
+        return handle_tool_error(coder, tool_name, e, add_traceback=False)
+    except Exception as e:
+        # Handle unexpected errors
+        return handle_tool_error(coder, tool_name, e)
+
+
+def process_response(coder, params):
+    """
+    Process the IndentLines tool response.
+
+    Args:
+        coder: The Coder instance
+        params: Dictionary of parameters
+
+    Returns:
+        str: Result message
+    """
+    file_path = params.get("file_path")
+    start_pattern = params.get("start_pattern")
+    end_pattern = params.get("end_pattern")
+    line_count = params.get("line_count")
+    indent_levels = params.get("indent_levels", 1)
+    near_context = params.get("near_context")
+    occurrence = params.get("occurrence", 1)
+    change_id = params.get("change_id")
+    dry_run = params.get("dry_run", False)
+
+    if file_path is not None and start_pattern is not None:
+        return _execute_indent_lines(
+            coder,
+            file_path,
+            start_pattern,
+            end_pattern,
+            line_count,
+            indent_levels,
+            near_context,
+            occurrence,
+            change_id,
+            dry_run,
+        )
+    else:
+        return "Error: Missing required parameters for IndentLines (file_path, start_pattern)"