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

aider/resources/model-settings.yml

@@ -1381,6 +1381,14 @@
   use_repo_map: true
   weak_model_name: openrouter/google/gemini-2.0-flash-001
 
+- name: gemini/gemini-3-pro-preview
+  overeager: true
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: gemini/gemini-2.5-flash
+  use_temperature: false
+  accepts_settings: ["reasoning_effort", "thinking_tokens"]  
+
 - name: gemini/gemini-2.5-pro-preview-05-06
   overeager: true
   edit_format: diff-fenced
@@ -1465,6 +1473,21 @@
   weak_model_name: openrouter/google/gemini-2.5-flash
   accepts_settings: ["thinking_tokens"]
 
+- name: vertex_ai/gemini-3-pro-preview
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: vertex_ai/gemini-2.5-flash
+  overeager: true
+  editor_model_name: vertex_ai/gemini-2.5-flash
+  accepts_settings: ["thinking_tokens"]
+
+- name: openrouter/google/gemini-3-pro-preview
+  overeager: true
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: openrouter/google/gemini-2.5-flash
+  accepts_settings: ["thinking_tokens"]
+
 #- name: openrouter/qwen/qwen3-235b-a22b
 #  system_prompt_prefix: "/no_think"
 #  use_temperature: 0.7
@@ -1834,6 +1857,21 @@
   accepts_settings: ["thinking_tokens"]
 
 # GPT-5 family
+- name: gpt-5.1
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+  overeager: true
+
+- name: gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: gpt-5
   edit_format: diff
   weak_model_name: gpt-5-nano
@@ -1842,6 +1880,18 @@
   accepts_settings: ["reasoning_effort"]
   overeager: true
 
+- name: gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: gpt-5-mini
+  use_repo_map: true
+  editor_model_name: gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  use_temperature: false
+
 - name: gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: gpt-5-nano-2025-08-07
@@ -1891,6 +1941,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: gpt-5-codex
   edit_format: diff
   weak_model_name: gpt-5-nano
@@ -1898,6 +1962,13 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: gpt-5.1-codex
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: azure/gpt-5
   edit_format: diff
   weak_model_name: azure/gpt-5-nano
@@ -1905,6 +1976,18 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: azure/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: azure/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  use_temperature: false
+
 - name: azure/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: azure/gpt-5-nano-2025-08-07
@@ -1912,6 +1995,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5.1
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: azure/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: azure/gpt-5-mini
   edit_format: diff
   weak_model_name: azure/gpt-5-nano
@@ -1954,6 +2051,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: azure/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openai/gpt-5
   edit_format: diff
   weak_model_name: openai/gpt-5-nano
@@ -1961,6 +2072,18 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openai/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: openai/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  use_temperature: false
+
 - name: openai/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: openai/gpt-5-nano-2025-08-07
@@ -1968,6 +2091,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5.1
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openai/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openai/gpt-5-mini
   edit_format: diff
   weak_model_name: openai/gpt-5-nano
@@ -2010,6 +2147,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openai/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openrouter/openai/gpt-5
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano
@@ -2017,6 +2168,18 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: openrouter/openai/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  use_temperature: false
+
 - name: openrouter/openai/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano-2025-08-07
@@ -2024,6 +2187,20 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5.1
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openrouter/openai/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openrouter/openai/gpt-5-mini
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano
@@ -2066,3 +2243,16 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openrouter/openai/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]

aider/scrape.py

@@ -127,6 +127,8 @@ class Scraper:
         ):
             self.try_pandoc()
             content = self.html_to_markdown(content)
+        elif mime_type and mime_type.startswith("image/"):
+            content = "(Response is an image, not HTML)"
 
         return content
 

aider/tools/__init__.py

@@ -29,6 +29,7 @@ from . import (
     replace_lines,
     replace_text,
     show_numbered_context,
+    thinking,
     undo_change,
     update_todo_list,
     view,
@@ -64,6 +65,7 @@ TOOL_MODULES = [
     replace_lines,
     replace_text,
     show_numbered_context,
+    thinking,
     undo_change,
     update_todo_list,
     view,

aider/tools/command.py

@@ -1,105 +1,95 @@
 # Import necessary functions
 from aider.run_cmd import run_cmd_subprocess
-
-schema = {
-    "type": "function",
-    "function": {
-        "name": "Command",
-        "description": "Execute a shell command.",
-        "parameters": {
-            "type": "object",
-            "properties": {
-                "command_string": {
-                    "type": "string",
-                    "description": "The shell command to execute.",
+from aider.tools.utils.base_tool import BaseTool
+
+
+class Tool(BaseTool):
+    NORM_NAME = "command"
+    SCHEMA = {
+        "type": "function",
+        "function": {
+            "name": "Command",
+            "description": "Execute a shell command.",
+            "parameters": {
+                "type": "object",
+                "properties": {
+                    "command_string": {
+                        "type": "string",
+                        "description": "The shell command to execute.",
+                    },
                 },
+                "required": ["command_string"],
             },
-            "required": ["command_string"],
         },
-    },
-}
-
-# Normalized tool name for lookup
-NORM_NAME = "command"
-
-
-async 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 = (
-            True
-            if coder.skip_cli_confirmations
-            else await 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
-                group_response="Command Tool",
+    }
+
+    @classmethod
+    async def execute(cls, 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.
+            if command_string and getattr(coder.args, "command_prefix", None):
+                command_prefix = getattr(coder.args, "command_prefix", None)
+                command_string = f"{command_prefix} {command_string}"
+
+            confirmed = (
+                True
+                if coder.skip_cli_confirmations
+                else await 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
+                    group_response="Command Tool",
+                )
             )
-        )
-
-        await coder.io.recreate_input()
-
-        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}")
+            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."
 
-        # 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
-        )
+            # Proceed with execution if confirmed is True
+            coder.io.tool_output(f"⚙️ Executing non-interactive shell command: {command_string}")
 
-        # 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)"
+            # 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
             )
 
-        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)}"
-
-
-async def process_response(coder, params):
-    """
-    Process the Command tool response.
-
-    Args:
-        coder: The Coder instance
-        params: Dictionary of parameters
-
-    Returns:
-        str: Result message
-    """
-    command_string = params.get("command_string")
-    if command_string is not None:
-        return await _execute_command(coder, command_string)
-    else:
-        return "Error: Missing 'command_string' parameter for Command"
+            # 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)}"