Merge remote-tracking branch 'upstream/main' into dev

Author: tanavamsikrishna

HISTORY.md

@@ -1,5 +1,23 @@
 # Release history
 
+### main branch
+
+- Added support for Claude 4.5/4.6 models and updated model aliases (sonnet/haiku/opus).
+- Expanded Gemini model support with 2.5 Flash and Flash‑Lite, added Gemini 3 preview models, and updated the flash alias to gemini/gemini-flash-latest.
+- Added DeepSeek Reasoner model and updated DeepSeek model metadata with costs and prompt caching.
+- Added BadGatewayError and ImageFetchError to handled exceptions.
+- Fixed exception mapping to only include real exception classes, avoiding runtime errors, by Claudia Pellegrino.
+- Repo map now tags Fortran, Haskell, Julia, and Zig and is compatible with newer tree-sitter Python APIs, by Varchas Gopalaswamy, Tim Put, and Mubashir Osmani.
+- Removed deprecated google-generativeai dependency to eliminate import warnings, by Mark McDonald.
+- Added settings for new OpenAI GPT‑5.1/5.2 and GPT‑5‑pro models across OpenAI, Azure, and OpenRouter, including chat and codex variants.
+- Changed the gemini alias to point to gemini/gemini-3-pro-preview.
+- Added support for OpenAI o1-pro model.
+- Aider wrote 57% of the code in this release.
+
+### Aider v0.86.1
+
+- Added a reasoning_effort setting for GPT-5 models and disabled temperature by default for the GPT-5 family.
+
 ### Aider v0.86.0
 
 - Expanded GPT-5 model support across family variants and providers (OpenAI, Azure, OpenRouter), including dated and chat/mini/nano variants.

README.md

@@ -27,7 +27,7 @@ cog.out(text)
   <a href="https://github.com/Aider-AI/aider/stargazers"><img alt="GitHub Stars" title="Total number of GitHub stars the Aider project has received"
 src="https://img.shields.io/github/stars/Aider-AI/aider?style=flat-square&logo=github&color=f1c40f&labelColor=555555"/></a>
   <a href="https://pypi.org/project/aider-chat/"><img alt="PyPI Downloads" title="Total number of installations via pip from PyPI"
-src="https://img.shields.io/badge/📦%20Installs-4.1M-2ecc71?style=flat-square&labelColor=555555"/></a>
+src="https://img.shields.io/badge/📦%20Installs-4.9M-2ecc71?style=flat-square&labelColor=555555"/></a>
   <img alt="Tokens per week" title="Number of tokens processed weekly by Aider users"
 src="https://img.shields.io/badge/📈%20Tokens%2Fweek-15B-3498db?style=flat-square&labelColor=555555"/>
   <a href="https://openrouter.ai/#options-menu"><img alt="OpenRouter Ranking" title="Aider's ranking among applications on the OpenRouter platform"

aider/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.86.2.dev"
+__version__ = "0.86.3.dev"
 safe_version = __version__
 
 try:

aider/models.py

@@ -74,16 +74,21 @@
 claude-3-5-sonnet-20241022
 claude-sonnet-4-20250514
 claude-opus-4-20250514
+claude-opus-4-6
+claude-sonnet-4-5
+claude-sonnet-4-5-20250929
+claude-haiku-4-5
+claude-haiku-4-5-20251001
 """
 
 ANTHROPIC_MODELS = [ln.strip() for ln in ANTHROPIC_MODELS.splitlines() if ln.strip()]
 
 # Mapping of model aliases to their canonical names
 MODEL_ALIASES = {
     # Claude models
-    "sonnet": "anthropic/claude-sonnet-4-20250514",
-    "haiku": "claude-3-5-haiku-20241022",
-    "opus": "claude-opus-4-20250514",
+    "sonnet": "claude-sonnet-4-5",
+    "haiku": "claude-haiku-4-5",
+    "opus": "claude-opus-4-6",
     # GPT models
     "4": "gpt-4-0613",
     "4o": "gpt-4o",
@@ -93,7 +98,7 @@
     "3": "gpt-3.5-turbo",
     # Other models
     "deepseek": "deepseek/deepseek-chat",
-    "flash": "gemini/gemini-2.5-flash",
+    "flash": "gemini/gemini-flash-latest",
     "flash-lite": "gemini/gemini-2.5-flash-lite",
     "quasar": "openrouter/openrouter/quasar-alpha",
     "r1": "deepseek/deepseek-reasoner",
@@ -507,6 +512,21 @@ def apply_generic_model_settings(self, model):
             self.reminder = "sys"
             return  # <--
 
+        if (
+            "sonnet-4-5" in model
+            or "opus-4-6" in model
+            or "haiku-4-5" in model
+            or "claude-sonnet-4-5" in model
+            or "claude-opus-4-6" in model
+            or "claude-haiku-4-5" in model
+        ):
+            self.edit_format = "diff"
+            self.use_repo_map = True
+            self.examples_as_sys_msg = False
+            if "thinking_tokens" not in self.accepts_settings:
+                self.accepts_settings.append("thinking_tokens")
+            return  # <--
+
         if "3-7-sonnet" in model:
             self.edit_format = "diff"
             self.use_repo_map = True

aider/repomap.py

@@ -16,6 +16,7 @@
 from pygments.lexers import guess_lexer_for_filename
 from pygments.token import Token
 from tqdm import tqdm
+from tree_sitter import Query
 
 from aider.dump import dump
 from aider.special import filter_important_files
@@ -262,6 +263,19 @@ def get_tags(self, fname, rel_fname):
 
         return data
 
+    def _run_captures(self, query: Query, node):
+        # tree-sitter 0.23.2's python bindings had captures directly on the Query object
+        # but 0.24.0 moved it to a separate QueryCursor class. Support both.
+        if hasattr(query, "captures"):
+            # Old API
+            return query.captures(node)
+
+        # New API
+        from tree_sitter import QueryCursor
+
+        cursor = QueryCursor(query)
+        return cursor.captures(node)
+
     def get_tags_raw(self, fname, rel_fname):
         lang = filename_to_lang(fname)
         if not lang:
@@ -285,17 +299,22 @@ def get_tags_raw(self, fname, rel_fname):
         tree = parser.parse(bytes(code, "utf-8"))
 
         # Run the tags queries
-        query = language.query(query_scm)
-        captures = query.captures(tree.root_node)
+        captures = self._run_captures(Query(language, query_scm), tree.root_node)
+
+        captures_by_tag = defaultdict(list)
+        matches = []
+        for tag, nodes in captures.items():
+            for node in nodes:
+                captures_by_tag[tag].append(node)
+            captures_by_tag[tag].append(node)
+            matches.append((node, tag))
 
-        saw = set()
         if USING_TSL_PACK:
-            all_nodes = []
-            for tag, nodes in captures.items():
-                all_nodes += [(node, tag) for node in nodes]
+            all_nodes = [(node, tag) for tag, nodes in captures_by_tag.items() for node in nodes]
         else:
-            all_nodes = list(captures)
+            all_nodes = matches
 
+        saw = set()
         for node, tag in all_nodes:
             if tag.startswith("name.definition."):
                 kind = "def"