Granular edits with dry_run

aider/coders/navigator_prompts.py

@@ -61,45 +61,32 @@ Act as an expert software engineer with the ability to autonomously navigate and
   Convert an editable file back to read-only status.
 
 ### Granular Editing Tools
-- **ReplaceText**: `[tool_call(ReplaceText, file_path="path/to/file.py", find_text="old text", replace_text="new text", near_context="unique nearby text", occurrence=1)]`
-  Replace specific text with new text. Use near_context to disambiguate between multiple occurrences. 
-  Set occurrence to -1 for the last occurrence, or a number for a specific occurrence.
+- **ReplaceText**: `[tool_call(ReplaceText, file_path="...", find_text="...", replace_text="...", near_context="...", occurrence=1, dry_run=False)]`
+  Replace specific text. `near_context` (optional) helps find the right spot. `occurrence` (optional, default 1) specifies which match (-1 for last). `dry_run=True` simulates the change.
 
-- **ReplaceAll**: `[tool_call(ReplaceAll, file_path="path/to/file.py", find_text="oldVar", replace_text="newVar")]`
-  Replace all occurrences of text in a file. Useful for renaming variables, function names, etc.
+- **ReplaceAll**: `[tool_call(ReplaceAll, file_path="...", find_text="...", replace_text="...", dry_run=False)]`
+  Replace ALL occurrences of text. Use with caution. `dry_run=True` simulates the change.
 
-- **InsertBlock**: `[tool_call(InsertBlock, file_path="path/to/file.py", content="""
-def new_function():
-    return True
-""", after_pattern="# Insert after this line")]`
-  Insert a block of text after or before a pattern. Use single quotes with escaped newlines for multi-line content.
-  Specify either after_pattern or before_pattern to place the block.
+- **InsertBlock**: `[tool_call(InsertBlock, file_path="...", content="...", after_pattern="...", near_context="...", occurrence=1, dry_run=False)]`
+  Insert a block after (`after_pattern`) or before (`before_pattern`) a pattern line. Use `near_context` and `occurrence` (optional, default 1, -1 for last) to specify which pattern match. `dry_run=True` simulates.
 
-- **DeleteBlock**: `[tool_call(DeleteBlock, file_path="path/to/file.py", start_pattern="def old_function", end_pattern="# End function")]`
-  Delete a block of text from start_pattern to end_pattern (inclusive).
-  Alternatively, use line_count instead of end_pattern to delete a specific number of lines.
+- **DeleteBlock**: `[tool_call(DeleteBlock, file_path="...", start_pattern="...", end_pattern="...", near_context="...", occurrence=1, dry_run=False)]`
+  Delete block from `start_pattern` line to `end_pattern` line (inclusive). Use `line_count` instead of `end_pattern` for fixed number of lines. Use `near_context` and `occurrence` (optional, default 1, -1 for last) for `start_pattern`. `dry_run=True` simulates.
 
-- **ReplaceLine**: `[tool_call(ReplaceLine, file_path="path/to/file.py", line_number=42, new_content="def fixed_function(param):")]`
-  Replace a specific line by its line number. Especially useful for fixing errors or lint warnings that include line numbers.
-  Line numbers are 1-based (as in most editors and error messages).
+- **ReplaceLine**: `[tool_call(ReplaceLine, file_path="...", line_number=42, new_content="...", dry_run=False)]`
+  Replace a specific line number (1-based). `dry_run=True` simulates.
 
-- **ReplaceLines**: `[tool_call(ReplaceLines, file_path="path/to/file.py", start_line=42, end_line=45, new_content="""
-def better_function(param):
-    # Fixed implementation
-    return process(param)
-""")]`
-  Replace a range of lines by line numbers. Useful for fixing multiple lines referenced in error messages.
-  The new_content can contain any number of lines, not just the same count as the original range.
+- **ReplaceLines**: `[tool_call(ReplaceLines, file_path="...", start_line=42, end_line=45, new_content="...", dry_run=False)]`
+  Replace a range of lines (1-based, inclusive). `dry_run=True` simulates.
 
-- **IndentLines**: `[tool_call(IndentLines, file_path="path/to/file.py", start_pattern="def my_function", end_pattern="return result", indent_levels=1)]`
-  Indent or unindent a block of lines. Use positive indent_levels to increase indentation or negative to decrease.
-  Specify either end_pattern or line_count to determine the range of lines to indent.
+- **IndentLines**: `[tool_call(IndentLines, file_path="...", start_pattern="...", end_pattern="...", indent_levels=1, near_context="...", occurrence=1, dry_run=False)]`
+  Indent (`indent_levels` > 0) or unindent (`indent_levels` < 0) a block. Use `end_pattern` or `line_count` for range. Use `near_context` and `occurrence` (optional, default 1, -1 for last) for `start_pattern`. `dry_run=True` simulates.
 
-- **UndoChange**: `[tool_call(UndoChange, change_id="a1b2c3d4")]`
-  Undo a specific change by its ID. Alternatively, use last_file="path/to/file.py" to undo the most recent change to that file.
+- **UndoChange**: `[tool_call(UndoChange, change_id="a1b2c3d4")]` or `[tool_call(UndoChange, last_file="...")]`
+  Undo a specific change by ID, or the last change made to `last_file`.
 
-- **ListChanges**: `[tool_call(ListChanges, file_path="path/to/file.py", limit=5)]`
-  List recent changes made to files. Optionally filter by file_path and limit the number of results.
+- **ListChanges**: `[tool_call(ListChanges, file_path="...", limit=5)]`
+  List recent changes, optionally filtered by `file_path` and limited.
 
 ### Other Tools
 - **Command**: `[tool_call(Command, command_string="git diff HEAD~1")]`
@@ -129,11 +116,12 @@ When you include any tool call, the system will automatically continue to the ne
 - Remember the `Find` tool is optimized for locating symbols across the codebase
 
 ### Granular Editing Workflow
-1. **Discover and Add Files**: Use Glob, Grep, Find to locate relevant files
-2. **Make Files Editable**: Convert read-only files to editable with MakeEditable
-3. **Make Specific Changes**: Use granular editing tools (ReplaceText, InsertBlock, etc.) for precise edits
-4. **Review Changes**: List applied changes with ListChanges
-5. **Fix Mistakes**: If needed, undo changes with UndoChange by specific ID or last change to a file
+1. **Discover and Add Files**: Use Glob, Grep, Find to locate relevant files.
+2. **Make Files Editable**: Convert read-only files to editable with MakeEditable.
+3. **(Optional) Dry Run**: For risky changes (like ReplaceAll or complex blocks), use the tool with `dry_run=True` first to see the potential impact. Review the diff snippet provided in the result.
+4. **Make Specific Changes**: Use granular editing tools (ReplaceText, InsertBlock, etc.) with `dry_run=False` (or omit it) for precise edits. Review the diff snippet in the result.
+5. **Review Changes**: List applied changes with ListChanges.
+6. **Fix Mistakes**: If a change was incorrect, undo it using UndoChange with the specific `change_id` from the result message or ListChanges.
 
 ### Context Management Strategy
 - Keep your context focused by removing files that are no longer relevant