aider-ce 0.88.20__py3-none-any.whl → 0.88.38__py3-none-any.whl

aider/coders/agent_prompts.py

@@ -25,8 +25,8 @@ class AgentPrompts(CoderPrompts):
 <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.
+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. Concisely describe your search strategy with the `Thinking` tool.
+3.  **Think**: Given the contents of your exploration, concisely reason through the edits with the `Thinking` tool 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
@@ -49,17 +49,6 @@ Use these for precision and safety.
 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}.
@@ -89,9 +78,8 @@ I am working with code in a git repository. Here are summaries of some files:
 <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.
+- Remove files you are done with viewing/editing from the context with the `Remove` tool. It is fine to re-add them later
 
 {lazy_prompt}
 {shell_cmd_reminder}

aider/coders/architect_coder.py

@@ -1,3 +1,6 @@
+import asyncio
+
+from ..commands import SwitchCoder
 from .architect_prompts import ArchitectPrompts
 from .ask_coder import AskCoder
 from .base_coder import Coder
@@ -14,9 +17,17 @@ class ArchitectCoder(AskCoder):
         if not content or not content.strip():
             return
 
-        if not self.auto_accept_architect and not await self.io.confirm_ask("Edit the files?"):
+        tweak_responses = getattr(self.args, "tweak_responses", False)
+        confirmation = await self.io.confirm_ask("Edit the files?", allow_tweak=tweak_responses)
+
+        if not self.auto_accept_architect and not confirmation:
             return
 
+        if confirmation == "tweak":
+            content = self.io.edit_in_editor(content)
+
+        await asyncio.sleep(0.1)
+
         kwargs = dict()
 
         # Use the editor_model from the main_model if it exists, otherwise use the main_model itself
@@ -24,6 +35,7 @@ class ArchitectCoder(AskCoder):
 
         kwargs["main_model"] = editor_model
         kwargs["edit_format"] = self.main_model.editor_edit_format
+        kwargs["args"] = self.args
         kwargs["suggest_shell_commands"] = False
         kwargs["map_tokens"] = 0
         kwargs["total_cost"] = self.total_cost
@@ -41,8 +53,12 @@ class ArchitectCoder(AskCoder):
         if self.verbose:
             editor_coder.show_announcements()
 
-        await editor_coder.run(with_message=content, preproc=False)
+        try:
+            await editor_coder.generate(user_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
+        except Exception as e:
+            self.io.tool_error(e)
 
-        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
+        raise SwitchCoder(main_model=self.main_model, edit_format="architect")