aider-ce 0.87.2.dev9__py3-none-any.whl

aider/tools/command.py

@@ -0,0 +1,58 @@
+# Import necessary functions
+from aider.run_cmd import run_cmd_subprocess
+
+
+def _execute_command(coder, command_string):
+    """
+    Execute a non-interactive shell command after user confirmation.
+    """
+    try:
+        # Ask for confirmation before executing.
+        # allow_never=True enables the 'Always' option.
+        # confirm_ask handles remembering the 'Always' choice based on the subject.
+        confirmed = coder.io.confirm_ask(
+            "Allow execution of this command?",
+            subject=command_string,
+            explicit_yes_required=True,  # Require explicit 'yes' or 'always'
+            allow_never=True,  # Enable the 'Always' option
+        )
+
+        if not confirmed:
+            # This happens if the user explicitly says 'no' this time.
+            # If 'Always' was chosen previously, confirm_ask returns True directly.
+            coder.io.tool_output(f"Skipped execution of shell command: {command_string}")
+            return "Shell command execution skipped by user."
+
+        # Proceed with execution if confirmed is True
+        coder.io.tool_output(f"⚙️ Executing non-interactive shell command: {command_string}")
+
+        # Use run_cmd_subprocess for non-interactive execution
+        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, include more content
+        output_content = combined_output or ""
+        # Use the existing token threshold constant as the character limit for truncation
+        output_limit = coder.large_file_token_threshold
+        if len(output_content) > output_limit:
+            # Truncate and add a clear message using the constant value
+            output_content = (
+                output_content[:output_limit]
+                + f"\n... (output truncated at {output_limit} characters, based on"
+                " large_file_token_threshold)"
+            )
+
+        if exit_status == 0:
+            return f"Shell command executed successfully (exit code 0). Output:\n{output_content}"
+        else:
+            return f"Shell command failed with exit code {exit_status}. Output:\n{output_content}"
+
+    except Exception as e:
+        coder.io.tool_error(
+            f"Error executing non-interactive shell command '{command_string}': {str(e)}"
+        )
+        # Optionally include traceback for debugging if verbose
+        # if coder.verbose:
+        #     coder.io.tool_error(traceback.format_exc())
+        return f"Error executing command: {str(e)}"

aider/tools/command_interactive.py

@@ -0,0 +1,53 @@
+# Import necessary functions
+from aider.run_cmd import run_cmd
+
+
+def _execute_command_interactive(coder, command_string):
+    """
+    Execute an interactive shell command using run_cmd (which uses pexpect/PTY).
+    """
+    try:
+        coder.io.tool_output(f"⚙️ Starting interactive shell command: {command_string}")
+        coder.io.tool_output(">>> You may need to interact with the command below <<<")
+
+        # Use run_cmd which handles PTY logic
+        exit_status, combined_output = run_cmd(
+            command_string,
+            verbose=coder.verbose,  # Pass verbose flag
+            error_print=coder.io.tool_error,  # Use io for error printing
+            cwd=coder.root,  # Execute in the project root
+        )
+
+        coder.io.tool_output(">>> Interactive command finished <<<")
+
+        # Format the output for the result message, include more content
+        output_content = combined_output or ""
+        # Use the existing token threshold constant as the character limit for truncation
+        output_limit = coder.large_file_token_threshold
+        if len(output_content) > output_limit:
+            # Truncate and add a clear message using the constant value
+            output_content = (
+                output_content[:output_limit]
+                + f"\n... (output truncated at {output_limit} characters, based on"
+                " large_file_token_threshold)"
+            )
+
+        if exit_status == 0:
+            return (
+                "Interactive command finished successfully (exit code 0)."
+                f" Output:\n{output_content}"
+            )
+        else:
+            return (
+                f"Interactive command finished with exit code {exit_status}."
+                f" Output:\n{output_content}"
+            )
+
+    except Exception as e:
+        coder.io.tool_error(
+            f"Error executing interactive shell command '{command_string}': {str(e)}"
+        )
+        # Optionally include traceback for debugging if verbose
+        # if coder.verbose:
+        #     coder.io.tool_error(traceback.format_exc())
+        return f"Error executing interactive command: {str(e)}"

aider/tools/delete_block.py

@@ -0,0 +1,120 @@
+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,
+)
+
+
+def _execute_delete_block(
+    coder,
+    file_path,
+    start_pattern,
+    end_pattern=None,
+    line_count=None,
+    near_context=None,
+    occurrence=1,
+    change_id=None,
+    dry_run=False,
+):
+    """
+    Delete a block of text between start_pattern and end_pattern (inclusive).
+    Uses utility functions for validation, finding lines, and applying changes.
+    """
+    tool_name = "DeleteBlock"
+    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, passing pattern_desc for better error messages
+        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,  # DeleteBlock uses patterns, not symbols
+            pattern_desc=pattern_desc,
+        )
+
+        # 4. Prepare the deletion
+        deleted_lines = lines[start_line : end_line + 1]
+        new_lines = lines[:start_line] + lines[end_line + 1 :]
+        new_content = "\n".join(new_lines)
+
+        if original_content == new_content:
+            coder.io.tool_warning("No changes made: deletion would not change file")
+            return "Warning: No changes made (deletion would not change file)"
+
+        # 5. Generate diff for feedback
+        diff_snippet = generate_unified_diff_snippet(original_content, new_content, rel_path)
+        num_deleted = end_line - start_line + 1
+        num_occurrences = len(start_pattern_indices)
+        occurrence_str = f"occurrence {occurrence} of " if num_occurrences > 1 else ""
+
+        # 6. Handle dry run
+        if dry_run:
+            dry_run_message = (
+                f"Dry run: Would delete {num_deleted} lines ({start_line + 1}-{end_line + 1}) based"
+                f" on {occurrence_str}start pattern '{start_pattern}' 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,
+            "near_context": near_context,
+            "occurrence": occurrence,
+            "deleted_content": "\n".join(deleted_lines),
+        }
+        final_change_id = apply_change(
+            coder,
+            abs_path,
+            rel_path,
+            original_content,
+            new_content,
+            "deleteblock",
+            metadata,
+            change_id,
+        )
+
+        # 8. Format and return result, adding line range to success message
+        success_message = (
+            f"Deleted {num_deleted} lines ({start_line + 1}-{end_line + 1}) (from"
+            f" {occurrence_str}start 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)

aider/tools/delete_line.py

@@ -0,0 +1,112 @@
+import os
+
+from .tool_utils import (
+    ToolError,
+    apply_change,
+    format_tool_result,
+    generate_unified_diff_snippet,
+    handle_tool_error,
+)
+
+
+def _execute_delete_line(coder, file_path, line_number, change_id=None, dry_run=False):
+    """
+    Delete a specific line number (1-based).
+
+    Parameters:
+    - coder: The Coder instance
+    - file_path: Path to the file to modify
+    - line_number: The 1-based line number to delete
+    - 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 = "DeleteLine"
+    try:
+        # Get absolute file path
+        abs_path = coder.abs_root_path(file_path)
+        rel_path = coder.get_rel_fname(abs_path)
+
+        # Check if file exists
+        if not os.path.isfile(abs_path):
+            raise ToolError(f"File '{file_path}' not found")
+
+        # Check if file is in editable context
+        if abs_path not in coder.abs_fnames:
+            if abs_path in coder.abs_read_only_fnames:
+                raise ToolError(f"File '{file_path}' is read-only. Use MakeEditable first.")
+            else:
+                raise ToolError(f"File '{file_path}' not in context")
+
+        # Reread file content immediately before modification
+        file_content = coder.io.read_text(abs_path)
+        if file_content is None:
+            raise ToolError(f"Could not read file '{file_path}'")
+
+        lines = file_content.splitlines()
+        original_content = file_content
+
+        # Validate line number
+        try:
+            line_num_int = int(line_number)
+            if line_num_int < 1 or line_num_int > len(lines):
+                raise ToolError(f"Line number {line_num_int} is out of range (1-{len(lines)})")
+            line_idx = line_num_int - 1  # Convert to 0-based index
+        except ValueError:
+            raise ToolError(f"Invalid line_number value: '{line_number}'. Must be an integer.")
+
+        # Prepare the deletion
+        deleted_line = lines[line_idx]
+        new_lines = lines[:line_idx] + lines[line_idx + 1 :]
+        new_content = "\n".join(new_lines)
+
+        if original_content == new_content:
+            coder.io.tool_warning(
+                f"No changes made: deleting line {line_num_int} would not change file"
+            )
+            return f"Warning: No changes made (deleting line {line_num_int} would not change file)"
+
+        # Generate diff snippet
+        diff_snippet = generate_unified_diff_snippet(original_content, new_content, rel_path)
+
+        # Handle dry run
+        if dry_run:
+            dry_run_message = f"Dry run: Would delete line {line_num_int} in {file_path}"
+            return format_tool_result(
+                coder,
+                tool_name,
+                "",
+                dry_run=True,
+                dry_run_message=dry_run_message,
+                diff_snippet=diff_snippet,
+            )
+
+        # --- Apply Change (Not dry run) ---
+        metadata = {"line_number": line_num_int, "deleted_content": deleted_line}
+        final_change_id = apply_change(
+            coder,
+            abs_path,
+            rel_path,
+            original_content,
+            new_content,
+            "deleteline",
+            metadata,
+            change_id,
+        )
+
+        coder.aider_edited_files.add(rel_path)
+
+        # Format and return result
+        success_message = f"Deleted line {line_num_int} 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)

aider/tools/delete_lines.py

@@ -0,0 +1,137 @@
+import os
+
+from .tool_utils import (
+    ToolError,
+    apply_change,
+    format_tool_result,
+    generate_unified_diff_snippet,
+    handle_tool_error,
+)
+
+
+def _execute_delete_lines(coder, file_path, start_line, end_line, change_id=None, dry_run=False):
+    """
+    Delete a range of lines (1-based, inclusive).
+
+    Parameters:
+    - coder: The Coder instance
+    - file_path: Path to the file to modify
+    - start_line: The 1-based starting line number to delete
+    - end_line: The 1-based ending line number to delete
+    - 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 = "DeleteLines"
+    try:
+        # Get absolute file path
+        abs_path = coder.abs_root_path(file_path)
+        rel_path = coder.get_rel_fname(abs_path)
+
+        # Check if file exists
+        if not os.path.isfile(abs_path):
+            raise ToolError(f"File '{file_path}' not found")
+
+        # Check if file is in editable context
+        if abs_path not in coder.abs_fnames:
+            if abs_path in coder.abs_read_only_fnames:
+                raise ToolError(f"File '{file_path}' is read-only. Use MakeEditable first.")
+            else:
+                raise ToolError(f"File '{file_path}' not in context")
+
+        # Reread file content immediately before modification
+        file_content = coder.io.read_text(abs_path)
+        if file_content is None:
+            raise ToolError(f"Could not read file '{file_path}'")
+
+        lines = file_content.splitlines()
+        original_content = file_content
+
+        # Validate line numbers
+        try:
+            start_line_int = int(start_line)
+            end_line_int = int(end_line)
+
+            if start_line_int < 1 or start_line_int > len(lines):
+                raise ToolError(f"Start line {start_line_int} is out of range (1-{len(lines)})")
+            if end_line_int < 1 or end_line_int > len(lines):
+                raise ToolError(f"End line {end_line_int} is out of range (1-{len(lines)})")
+            if start_line_int > end_line_int:
+                raise ToolError(
+                    f"Start line {start_line_int} cannot be after end line {end_line_int}"
+                )
+
+            start_idx = start_line_int - 1  # Convert to 0-based index
+            end_idx = end_line_int - 1  # Convert to 0-based index
+        except ValueError:
+            raise ToolError(
+                f"Invalid line numbers: '{start_line}', '{end_line}'. Must be integers."
+            )
+
+        # Prepare the deletion
+        deleted_lines = lines[start_idx : end_idx + 1]
+        new_lines = lines[:start_idx] + lines[end_idx + 1 :]
+        new_content = "\n".join(new_lines)
+
+        if original_content == new_content:
+            coder.io.tool_warning(
+                f"No changes made: deleting lines {start_line_int}-{end_line_int} would not change"
+                " file"
+            )
+            return (
+                f"Warning: No changes made (deleting lines {start_line_int}-{end_line_int} would"
+                " not change file)"
+            )
+
+        # Generate diff snippet
+        diff_snippet = generate_unified_diff_snippet(original_content, new_content, rel_path)
+
+        # Handle dry run
+        if dry_run:
+            dry_run_message = (
+                f"Dry run: Would delete lines {start_line_int}-{end_line_int} in {file_path}"
+            )
+            return format_tool_result(
+                coder,
+                tool_name,
+                "",
+                dry_run=True,
+                dry_run_message=dry_run_message,
+                diff_snippet=diff_snippet,
+            )
+
+        # --- Apply Change (Not dry run) ---
+        metadata = {
+            "start_line": start_line_int,
+            "end_line": end_line_int,
+            "deleted_content": "\n".join(deleted_lines),
+        }
+
+        final_change_id = apply_change(
+            coder,
+            abs_path,
+            rel_path,
+            original_content,
+            new_content,
+            "deletelines",
+            metadata,
+            change_id,
+        )
+
+        coder.aider_edited_files.add(rel_path)
+        num_deleted = end_idx - start_idx + 1
+        # Format and return result
+        success_message = (
+            f"Deleted {num_deleted} lines ({start_line_int}-{end_line_int}) 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)