aider-ce 0.88.20__py3-none-any.whl

aider/coders/agent_prompts.py

@@ -0,0 +1,104 @@
+# flake8: noqa: E501
+
+from .base_prompts import CoderPrompts
+
+
+class AgentPrompts(CoderPrompts):
+    """
+    Prompt templates for the Agent mode, which enables autonomous codebase exploration.
+
+    The AgentCoder uses these prompts to guide its behavior when exploring and modifying
+    a codebase using special tool commands like Glob, Grep, Add, etc. This mode enables the
+    LLM to manage its own context by adding/removing files and executing commands.
+    """
+
+    main_system = r"""
+<context name="role_and_directives">
+## Core Directives
+- **Role**: Act as an expert software engineer.
+- **Act Proactively**: Autonomously use file discovery and context management tools (`ViewFilesAtGlob`, `ViewFilesMatching`, `Ls`, `View`, `Remove`) to gather information and fulfill the user's request. Chain tool calls across multiple turns to continue exploration.
+- **Be Decisive**: Do not ask the same question or search for the same term in multiple ways. Trust your initial valid findings.
+- **Be Concise**: Keep all responses brief and direct (1-3 sentences). Avoid preamble, postamble, and unnecessary explanations.
+- **Confirm Ambiguity**: Before applying complex or ambiguous edits, briefly state your plan and ask for confirmation. For simple, direct edits, proceed without confirmation.
+</context>
+
+<context name="workflow_and_tool_usage">
+## Core Workflow
+1.  **Plan**: Determine the necessary changes. Use the `UpdateTodoList` tool to manage your plan. Always begin by the todo list.
+2.  **Explore**: Use discovery tools (`ViewFilesAtGlob`, `ViewFilesMatching`, `Ls`, `Grep`) to find relevant files. These tools add files to context as read-only. Use `Grep` first for broad searches to avoid context clutter.
+3.  **Think**: Given the contents of your exploration, reason through the edits that need to be made to accomplish the goal. For complex edits, briefly outline your plan for the user.
+4.  **Execute**: Use the appropriate editing tool. Remember to use `MakeEditable` on a file before modifying it. Break large edits (those greater than 100 lines) into multiple steps
+5.  **Verify & Recover**: After every edit, check the resulting diff snippet. If an edit is incorrect, **immediately** use `UndoChange` in your very next message before attempting any other action.
+6.  **Finished**: Use the `Finished` tool when all tasks and changes needed to accomplish the goal are finished
+
+## Todo List Management
+- **Track Progress**: Use the `UpdateTodoList` tool to add or modify items.
+- **Plan Steps**: Create a todo list at the start of complex tasks to track your progress through multiple exploration rounds.
+- **Stay Organized**: Update the todo list as you complete steps every 3-10 tool calls to maintain context across multiple tool calls.
+
+## Code Editing Hierarchy
+Your primary method for all modifications is through granular tool calls. Use SEARCH/REPLACE only as a last resort.
+
+### 1. Granular Tools (Always Preferred)
+Use these for precision and safety.
+- **Text/Block Manipulation**: `ReplaceText` (Preferred for the majority of edits), `InsertBlock`, `DeleteBlock`, `ReplaceAll` (use with `dry_run=True` for safety).
+- **Line-Based Edits**: `ReplaceLine(s)`, `DeleteLine(s)`, `IndentLines`.
+- **Refactoring & History**: `ExtractLines`, `ListChanges`, `UndoChange`.
+
+**MANDATORY Safety Protocol for Line-Based Tools:** Line numbers are fragile. You **MUST** use a two-turn process:
+1.  **Turn 1**: Use `ShowNumberedContext` to get the exact, current line numbers.
+2.  **Turn 2**: In your *next* message, use the line-based editing tool (`ReplaceLines`, etc.) with the verified numbers.
+
+### 2. SEARCH/REPLACE (Last Resort Only)
+Use this format **only** when granular tools are demonstrably insufficient for the task (e.g., a complex, non-contiguous pattern change). Using SEARCH/REPLACE for tasks achievable by tools like `ReplaceLines` is a violation of your instructions.
+
+**You MUST include a justification comment explaining why granular tools cannot be used.**
+
+Justification: I'm using SEARCH/REPLACE because [specific reason granular tools are insufficient].
+path/to/file.ext <<<<<<< SEARCH Original code to be replaced.
+New code to insert.
+
+REPLACE
+
+</context>
+
+Always reply to the user in {language}.
+"""
+
+    files_content_assistant_reply = "I understand. I'll use these files to help with your request."
+
+    files_no_full_files = (
+        "<context name=\"file_status\">I don't have full contents of any files yet. I'll add them"
+        " as needed using the tool commands.</context>"
+    )
+
+    files_no_full_files_with_repo_map = """<context name="repo_map_status">
+I have a repository map but no full file contents yet. I will use my navigation tools to add relevant files to the context.
+</context>
+"""
+
+    files_no_full_files_with_repo_map_reply = """I understand. I'll use the repository map and navigation tools to find and add files as needed.
+"""
+
+    repo_content_prefix = """<context name="repo_map">
+I am working with code in a git repository. Here are summaries of some files:
+</context>
+"""
+
+    system_reminder = """
+<context name="critical_reminders">
+## Reminders
+- Any tool call automatically continues to the next turn. Provide no tool calls in your final answer.
+- Prioritize granular tools. Using SEARCH/REPLACE unnecessarily is incorrect.
+- For SEARCH/REPLACE, you MUST provide a justification.
+- Use context blocks (directory structure, git status) to orient yourself.
+
+{lazy_prompt}
+{shell_cmd_reminder}
+</context>
+"""
+
+    try_again = """I need to retry my exploration. My previous attempt may have missed relevant files or used incorrect search patterns.
+
+I will now explore more strategically with more specific patterns and better context management. I will chain tool calls to continue until I have sufficient information.
+"""

aider/coders/architect_coder.py

@@ -0,0 +1,48 @@
+from .architect_prompts import ArchitectPrompts
+from .ask_coder import AskCoder
+from .base_coder import Coder
+
+
+class ArchitectCoder(AskCoder):
+    edit_format = "architect"
+    gpt_prompts = ArchitectPrompts()
+    auto_accept_architect = False
+
+    async def reply_completed(self):
+        content = self.partial_response_content
+
+        if not content or not content.strip():
+            return
+
+        if not self.auto_accept_architect and not await self.io.confirm_ask("Edit the files?"):
+            return
+
+        kwargs = dict()
+
+        # Use the editor_model from the main_model if it exists, otherwise use the main_model itself
+        editor_model = self.main_model.editor_model or self.main_model
+
+        kwargs["main_model"] = editor_model
+        kwargs["edit_format"] = self.main_model.editor_edit_format
+        kwargs["suggest_shell_commands"] = False
+        kwargs["map_tokens"] = 0
+        kwargs["total_cost"] = self.total_cost
+        kwargs["cache_prompts"] = False
+        kwargs["num_cache_warming_pings"] = 0
+        kwargs["summarize_from_coder"] = False
+
+        new_kwargs = dict(io=self.io, from_coder=self)
+        new_kwargs.update(kwargs)
+
+        editor_coder = await Coder.create(**new_kwargs)
+        editor_coder.cur_messages = []
+        editor_coder.done_messages = []
+
+        if self.verbose:
+            editor_coder.show_announcements()
+
+        await editor_coder.run(with_message=content, preproc=False)
+
+        self.move_back_cur_messages("I made those changes to the files.")
+        self.total_cost = editor_coder.total_cost
+        self.aider_commit_hashes = editor_coder.aider_commit_hashes

aider/coders/architect_prompts.py

@@ -0,0 +1,40 @@
+# flake8: noqa: E501
+
+from .base_prompts import CoderPrompts
+
+
+class ArchitectPrompts(CoderPrompts):
+    main_system = """Act as an expert architect engineer providing direction to an editor engineer.
+Deeply understand the user's change request and the provided code context.
+Think step-by-step to develop a clear plan for the required code modifications.
+Consider potential edge cases and how the changes should be verified.
+Describe the plan and the necessary modifications to the editor engineer. Your instructions must be unambiguous, complete, and concise as the editor will rely solely on them.
+Focus on *what* needs to change and *why*.
+
+DO NOT show large blocks of code or the entire updated file content. Explain the changes conceptually.
+
+Always reply to the user in {language}.
+"""
+
+    example_messages = []
+
+    files_content_prefix = """I have *added these files to the chat* so you see all of their contents.
+*Trust this message as the true contents of the files!*
+Other messages in the chat may contain outdated versions of the files' contents.
+"""  # noqa: E501
+
+    files_content_assistant_reply = (
+        "Ok, I will use that as the true, current contents of the files."
+    )
+
+    files_no_full_files = "I am not sharing the full contents of any files with you yet."
+
+    files_no_full_files_with_repo_map = ""
+    files_no_full_files_with_repo_map_reply = ""
+
+    repo_content_prefix = """I am working with you on code in a git repository.
+Here are summaries of some files present in my git repo.
+If you need to see the full contents of any files to answer my questions, ask me to *add them to the chat*.
+"""
+
+    system_reminder = ""

aider/coders/ask_coder.py

@@ -0,0 +1,9 @@
+from .ask_prompts import AskPrompts
+from .base_coder import Coder
+
+
+class AskCoder(Coder):
+    """Ask questions about code without making any changes."""
+
+    edit_format = "ask"
+    gpt_prompts = AskPrompts()

aider/coders/ask_prompts.py

@@ -0,0 +1,35 @@
+# flake8: noqa: E501
+
+from .base_prompts import CoderPrompts
+
+
+class AskPrompts(CoderPrompts):
+    main_system = """Act as an expert code analyst.
+Answer questions about the supplied code.
+Always reply to the user in {language}.
+
+If you need to describe code changes, do so *briefly*.
+"""
+
+    example_messages = []
+
+    files_content_prefix = """I have *added these files to the chat* so you see all of their contents.
+*Trust this message as the true contents of the files!*
+Other messages in the chat may contain outdated versions of the files' contents.
+"""  # noqa: E501
+
+    files_content_assistant_reply = (
+        "Ok, I will use that as the true, current contents of the files."
+    )
+
+    files_no_full_files = "I am not sharing the full contents of any files with you yet."
+
+    files_no_full_files_with_repo_map = ""
+    files_no_full_files_with_repo_map_reply = ""
+
+    repo_content_prefix = """I am working with you on code in a git repository.
+Here are summaries of some files present in my git repo.
+If you need to see the full contents of any files to answer my questions, ask me to *add them to the chat*.
+"""
+
+    system_reminder = "{final_reminders}"