set version to 0.63.3.dev

Added io.py write_text exponential backoff to gracefully handle transient file locks

.github/workflows/pages.yml

@@ -70,15 +70,15 @@ jobs:
         id: deployment
         uses: actions/deploy-pages@v2
         
-      - name: Set up Python ${{ matrix.python-version }}
+      - name: Set up Python 3.12
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: '3.12'
 
       - name: Install linkchecker
         run: |
           python -m pip install --upgrade pip
-          pip install linkchecker
+          python -m pip install linkchecker
 
       - name: Run linkchecker
         run: |

CONTRIBUTING.md

@@ -17,10 +17,10 @@ Contributions of
 [LLM benchmark results](https://aider.chat/docs/leaderboards/)
 are welcome!
 See the
-[benchmark README](https://github.com/paul-gauthier/aider/blob/main/benchmark/README.md)
+[benchmark README](https://github.com/Aider-AI/aider/blob/main/benchmark/README.md)
 for information on running aider's code editing benchmarks.
 Submit results by opening a PR with edits to the
-[benchmark results data files](https://github.com/paul-gauthier/aider/blob/main/aider/website/_data/).
+[benchmark results data files](https://github.com/Aider-AI/aider/blob/main/aider/website/_data/).
 
 
 ## Pull Requests
@@ -33,19 +33,16 @@ ensure that your contributions can be integrated smoothly.
 
 ## Licensing
 
-By contributing to this project, you agree that your contributions
-will be licensed under the Apache License 2.0. Additionally, you
-understand and agree that contributions may be subject to a different
-license, should the project maintainers decide to change the licensing
-terms.
-
+Before contributing a PR, please review our
+[Individual Contributor License Agreement](https://aider.chat/docs/legal/contributor-agreement.html).
+All contributors will be asked to complete the agreement as part of the PR process.
 
 ## Setting up a Development Environment
 
 ### Clone the Repository
 
 ```
-git clone https://github.com/paul-gauthier/aider.git
+git clone https://github.com/Aider-AI/aider.git
 cd aider
 ```
 
@@ -190,8 +187,8 @@ pytest
 You can also run specific test files or test cases by providing the file path or test name:
 
 ```
-pytest aider/tests/test_coder.py
-pytest aider/tests/test_coder.py::TestCoder::test_specific_case
+pytest tests/basic/test_coder.py
+pytest tests/basic/test_coder.py::TestCoder::test_specific_case
 ```
 
 #### Continuous Integration

HISTORY.md

@@ -1,6 +1,113 @@
 
 # Release history
 
+### main branch
+
+- Fixed bug in fuzzy model name matching when litellm provider info is missing.
+- Modified model metadata file loading to allow override of resource file.
+- Allow recursive loading of dirs using `--read`.
+- Updated dependency versions to pick up litellm fix for ollama models.
+- Added exponential backoff retry when writing files to handle editor file locks.
+- Updated Qwen 2.5 Coder 32B model configuration.
+
+### Aider v0.63.1
+
+- Fixed bug in git ignored file handling.
+- Improved error handling for git operations.
+
+### Aider v0.63.0
+
+- Support for Qwen 2.5 Coder 32B.
+- `/web` command just adds the page to the chat, without triggering an LLM response.
+- Improved prompting for the user's preferred chat language.
+- Improved handling of LiteLLM exceptions.
+- Bugfix for double-counting tokens when reporting cache stats.
+- Bugfix for the LLM creating new files.
+- Other small bug fixes.
+- Aider wrote 55% of the code in this release.
+
+### Aider v0.62.0
+
+- Full support for Claude 3.5 Haiku
+  - Scored 75% on [aider's code editing leaderboard](https://aider.chat/docs/leaderboards/).
+  - Almost as good as Sonnet at much lower cost.
+  - Launch with `--haiku` to use it.
+- Easily apply file edits from ChatGPT, Claude or other web apps
+  - Chat with ChatGPT or Claude via their web app. 
+  - Give it your source files and ask for the changes you want.
+  - Use the web app's "copy response" button to copy the entire reply from the LLM.
+  - Run `aider --apply-clipboard-edits file-to-edit.js`.
+  - Aider will edit your file with the LLM's changes.
+- Bugfix for creating new files.
+- Aider wrote 84% of the code in this release.  
+
+### Aider v0.61.0
+
+- Load and save aider slash-commands to files:
+  - `/save <fname>` command will make a file of `/add` and `/read-only` commands that recreate the current file context in the chat.
+  - `/load <fname>` will replay the commands in the file.
+  - You can use `/load` to run any arbitrary set of slash-commands, not just `/add` and `/read-only`.
+  - Use `--load <fname>` to run a list of commands on launch, before the interactive chat begins.
+- Anonymous, opt-in [analytics](https://aider.chat/docs/more/analytics.html) with no personal data sharing.
+- Aider follows litellm's `supports_vision` attribute to enable image support for models.
+- Bugfix for when diff mode flexibly handles the model using the wrong filename.
+- Displays filenames in sorted order for `/add` and `/read-only`.
+- New `--no-fancy-input` switch disables prompt toolkit input, now still available with `--no-pretty`.
+- Override browser config with `--no-browser` or `--no-gui`.
+- Offer to open documentation URLs when errors occur.
+- Properly support all o1 models, regardless of provider.
+- Improved layout of filenames above input prompt.
+- Better handle corrupted repomap tags cache.
+- Improved handling of API errors, especially when accessing the weak model.
+- Aider wrote 68% of the code in this release.
+
+### Aider v0.60.1
+
+- Enable image support for Sonnet 10/22.
+- Display filenames in sorted order.
+
+### Aider v0.60.0
+
+- Full support for Sonnet 10/22, the new SOTA model on aider's code editing benchmark.
+  - Aider uses Sonnet 10/22 by default.
+- Improved formatting of added and read-only files above chat prompt, by @jbellis.
+- Improved support for o1 models by more flexibly parsing their nonconforming code edit replies.
+- Corrected diff edit format prompt that only the first match is replaced.
+- Stronger whole edit format prompt asking for clean file names.
+- Now offers to add `.env` to the `.gitignore` file.
+- Ships with a small model metadata json file to handle models not yet updated in litellm.
+- Model settings for o1 models on azure.
+- Bugfix to properly include URLs in `/help` RAG results.
+- Aider wrote 49% of the code in this release.
+
+### Aider v0.59.1
+
+- Check for obsolete `yes: true` in yaml config, show helpful error.
+- Model settings for openrouter/anthropic/claude-3.5-sonnet:beta
+
+### Aider v0.59.0
+
+- Improvements to `/read-only`:
+  - Now supports shell-style auto-complete of the full file system.
+  - Still auto-completes the full paths of the repo files like `/add`.
+  - Now supports globs like `src/**/*.py`
+- Renamed `--yes` to `--yes-always`.
+  - Now uses `AIDER_YES_ALWAYS` env var and `yes-always:` yaml key.
+  - Existing YAML and .env files will need to be updated.
+  - Can still abbreviate to `--yes` on the command line.
+- Config file now uses standard YAML list syntax with `  - list entries`, one per line.  
+- `/settings` now includes the same announcement lines that would print at launch.
+- Sanity checks the `--editor-model` on launch now, same as main and weak models.
+- Added `--skip-sanity-check-repo` switch to speedup launch in large repos.
+- Bugfix so architect mode handles Control-C properly.
+- Repo-map is deterministic now, with improved caching logic.
+- Improved commit message prompt.
+- Aider wrote 77% of the code in this release.
+
+### Aider v0.58.1
+
+- Fixed bug where cache warming pings caused subsequent user messages to trigger a tight loop of LLM requests.
+
 ### Aider v0.58.0
 
 - [Use a pair of Architect/Editor models for improved coding](https://aider.chat/2024/09/26/architect.html)
@@ -685,7 +792,7 @@
 ### Aider v0.14.0
 
 - [Support for Claude2 and other LLMs via OpenRouter](https://aider.chat/docs/faq.html#accessing-other-llms-with-openrouter) by @joshuavial
-- Documentation for [running the aider benchmarking suite](https://github.com/paul-gauthier/aider/tree/main/benchmark)
+- Documentation for [running the aider benchmarking suite](https://github.com/Aider-AI/aider/tree/main/benchmark)
 - Aider now requires Python >= 3.9
 
 

README.md

@@ -107,7 +107,7 @@ projects like django, scikitlearn, matplotlib, etc.
 - [Configuration](https://aider.chat/docs/config.html)
 - [Troubleshooting](https://aider.chat/docs/troubleshooting.html)
 - [LLM Leaderboards](https://aider.chat/docs/leaderboards/)
-- [GitHub](https://github.com/paul-gauthier/aider)
+- [GitHub](https://github.com/Aider-AI/aider)
 - [Discord](https://discord.gg/Tv2uQnR88V)
 - [Blog](https://aider.chat/blog/)
 
@@ -118,14 +118,14 @@ projects like django, scikitlearn, matplotlib, etc.
 - *The best AI coding assistant so far.* -- [Matthew Berman](https://www.youtube.com/watch?v=df8afeb1FY8)
 - *Aider ... has easily quadrupled my coding productivity.* -- [SOLAR_FIELDS](https://news.ycombinator.com/item?id=36212100)
 - *It's a cool workflow... Aider's ergonomics are perfect for me.* -- [qup](https://news.ycombinator.com/item?id=38185326)
-- *It's really like having your senior developer live right in your Git repo - truly amazing!* -- [rappster](https://github.com/paul-gauthier/aider/issues/124)
-- *What an amazing tool. It's incredible.* -- [valyagolev](https://github.com/paul-gauthier/aider/issues/6#issue-1722897858)
-- *Aider is such an astounding thing!* -- [cgrothaus](https://github.com/paul-gauthier/aider/issues/82#issuecomment-1631876700)
+- *It's really like having your senior developer live right in your Git repo - truly amazing!* -- [rappster](https://github.com/Aider-AI/aider/issues/124)
+- *What an amazing tool. It's incredible.* -- [valyagolev](https://github.com/Aider-AI/aider/issues/6#issue-1722897858)
+- *Aider is such an astounding thing!* -- [cgrothaus](https://github.com/Aider-AI/aider/issues/82#issuecomment-1631876700)
 - *It was WAY faster than I would be getting off the ground and making the first few working versions.* -- [Daniel Feldman](https://twitter.com/d_feldman/status/1662295077387923456)
 - *THANK YOU for Aider! It really feels like a glimpse into the future of coding.* -- [derwiki](https://news.ycombinator.com/item?id=38205643)
 - *It's just amazing.  It is freeing me to do things I felt were out my comfort zone before.* -- [Dougie](https://discord.com/channels/1131200896827654144/1174002618058678323/1174084556257775656)
-- *This project is stellar.* -- [funkytaco](https://github.com/paul-gauthier/aider/issues/112#issuecomment-1637429008)
-- *Amazing project, definitely the best AI coding assistant I've used.* -- [joshuavial](https://github.com/paul-gauthier/aider/issues/84)
+- *This project is stellar.* -- [funkytaco](https://github.com/Aider-AI/aider/issues/112#issuecomment-1637429008)
+- *Amazing project, definitely the best AI coding assistant I've used.* -- [joshuavial](https://github.com/Aider-AI/aider/issues/84)
 - *I absolutely love using Aider ... It makes software development feel so much lighter as an experience.* -- [principalideal0](https://discord.com/channels/1131200896827654144/1133421607499595858/1229689636012691468)
 - *I have been recovering from multiple shoulder surgeries ... and have used aider extensively. It has allowed me to continue productivity.* -- [codeninja](https://www.reddit.com/r/OpenAI/s/nmNwkHy1zG)
 - *I am an aider addict. I'm getting so much more work done, but in less time.* -- [dandandan](https://discord.com/channels/1131200896827654144/1131200896827654149/1135913253483069470)

aider/__init__.py

@@ -1,6 +1,6 @@
 try:
     from aider.__version__ import __version__
 except Exception:
-    __version__ = "0.58.1.dev"
+    __version__ = "0.63.3.dev"
 
 __all__ = [__version__]

aider/analytics.py

@@ -0,0 +1,164 @@
+import json
+import platform
+import sys
+import time
+import uuid
+from pathlib import Path
+
+from mixpanel import Mixpanel
+from posthog import Posthog
+
+from aider import __version__
+from aider.dump import dump  # noqa: F401
+from aider.models import model_info_manager
+
+mixpanel_project_token = "6da9a43058a5d1b9f3353153921fb04d"
+posthog_project_api_key = "phc_99T7muzafUMMZX15H8XePbMSreEUzahHbtWjy3l5Qbv"
+posthog_host = "https://us.i.posthog.com"
+
+
+class Analytics:
+    # providers
+    mp = None
+    ph = None
+
+    # saved
+    user_id = None
+    permanently_disable = None
+    asked_opt_in = None
+
+    # ephemeral
+    logfile = None
+
+    def __init__(self, logfile=None, permanently_disable=False):
+        self.logfile = logfile
+        self.get_or_create_uuid()
+
+        if self.permanently_disable or permanently_disable or not self.asked_opt_in:
+            self.disable(permanently_disable)
+
+    def enable(self):
+        if not self.user_id:
+            self.disable(False)
+            return
+
+        if self.permanently_disable:
+            self.disable(True)
+            return
+
+        if not self.asked_opt_in:
+            self.disable(False)
+            return
+
+        self.mp = Mixpanel(mixpanel_project_token)
+        self.ph = Posthog(project_api_key=posthog_project_api_key, host=posthog_host)
+
+    def disable(self, permanently):
+        self.mp = None
+        self.ph = None
+
+        if permanently:
+            self.asked_opt_in = True
+            self.permanently_disable = True
+            self.save_data()
+
+    def need_to_ask(self):
+        return not self.asked_opt_in and not self.permanently_disable
+
+    def get_data_file_path(self):
+        data_file = Path.home() / ".aider" / "analytics.json"
+        data_file.parent.mkdir(parents=True, exist_ok=True)
+        return data_file
+
+    def get_or_create_uuid(self):
+        self.load_data()
+        if self.user_id:
+            return
+
+        self.user_id = str(uuid.uuid4())
+        self.save_data()
+
+    def load_data(self):
+        data_file = self.get_data_file_path()
+        if data_file.exists():
+            try:
+                data = json.loads(data_file.read_text())
+                self.permanently_disable = data.get("permanently_disable")
+                self.user_id = data.get("uuid")
+                self.asked_opt_in = data.get("asked_opt_in", False)
+            except (json.decoder.JSONDecodeError, OSError):
+                self.disable(permanently=False)
+
+    def save_data(self):
+        data_file = self.get_data_file_path()
+        data = dict(
+            uuid=self.user_id,
+            permanently_disable=self.permanently_disable,
+            asked_opt_in=self.asked_opt_in,
+        )
+
+        # Allow exceptions; crash if we can't record permanently_disabled=True, etc
+        data_file.write_text(json.dumps(data, indent=4))
+
+    def get_system_info(self):
+        return {
+            "python_version": sys.version.split()[0],
+            "os_platform": platform.system(),
+            "os_release": platform.release(),
+            "machine": platform.machine(),
+        }
+
+    def _redact_model_name(self, model):
+        if not model:
+            return None
+
+        info = model_info_manager.get_model_from_cached_json_db(model.name)
+        if info:
+            return model.name
+        elif "/" in model.name:
+            return model.name.split("/")[0] + "/REDACTED"
+        return None
+
+    def event(self, event_name, main_model=None, **kwargs):
+        if not (self.mp or self.ph) and not self.logfile:
+            return
+
+        properties = {}
+
+        if main_model:
+            properties["main_model"] = self._redact_model_name(main_model)
+            properties["weak_model"] = self._redact_model_name(main_model.weak_model)
+            properties["editor_model"] = self._redact_model_name(main_model.editor_model)
+
+        properties.update(kwargs)
+        properties.update(self.get_system_info())  # Add system info to all events
+
+        # Handle numeric values
+        for key, value in properties.items():
+            if isinstance(value, (int, float)):
+                properties[key] = value
+            else:
+                properties[key] = str(value)
+
+        properties["aider_version"] = __version__
+
+        if self.mp:
+            self.mp.track(self.user_id, event_name, dict(properties))
+
+        if self.ph:
+            self.ph.capture(self.user_id, event_name, dict(properties))
+
+        if self.logfile:
+            log_entry = {
+                "event": event_name,
+                "properties": properties,
+                "user_id": self.user_id,
+                "time": int(time.time()),
+            }
+            with open(self.logfile, "a") as f:
+                json.dump(log_entry, f)
+                f.write("\n")
+
+    def __del__(self):
+        if self.ph:
+            self.ph.shutdown()

aider/args.py

@@ -25,6 +25,7 @@ def get_parser(default_config_files, git_root):
         description="aider is AI pair programming in your terminal",
         add_config_file_help=True,
         default_config_files=default_config_files,
+        config_file_parser_class=configargparse.YAMLConfigFileParser,
         auto_env_var_prefix="AIDER_",
     )
     group = parser.add_argument_group("Main")
@@ -57,7 +58,7 @@ def get_parser(default_config_files, git_root):
         const=opus_model,
         help=f"Use {opus_model} model for the main chat",
     )
-    sonnet_model = "claude-3-5-sonnet-20240620"
+    sonnet_model = "claude-3-5-sonnet-20241022"
     group.add_argument(
         "--sonnet",
         action="store_const",
@@ -65,6 +66,14 @@ def get_parser(default_config_files, git_root):
         const=sonnet_model,
         help=f"Use {sonnet_model} model for the main chat",
     )
+    haiku_model = "claude-3-5-haiku-20241022"
+    group.add_argument(
+        "--haiku",
+        action="store_const",
+        dest="model",
+        const=haiku_model,
+        help=f"Use {haiku_model} model for the main chat",
+    )
     gpt_4_model = "gpt-4-0613"
     group.add_argument(
         "--4",
@@ -236,8 +245,8 @@ def get_parser(default_config_files, git_root):
         type=int,
         default=None,
         help=(
-            "Maximum number of tokens to use for chat history. If not specified, uses the model's"
-            " max_chat_history_tokens."
+            "Soft limit on tokens for chat history, after which summarization begins."
+            " If unspecified, defaults to the model's max_chat_history_tokens."
         ),
     )
     # This is a duplicate of the argument in the preparser and is a no-op by this time of
@@ -502,6 +511,12 @@ def get_parser(default_config_files, git_root):
         default=False,
         help="Perform a dry run without modifying files (default: False)",
     )
+    group.add_argument(
+        "--skip-sanity-check-repo",
+        action="store_true",
+        help="Skip the sanity check for the git repository (default: False)",
+        default=False,
+    )
     group = parser.add_argument_group("Fixing and committing")
     group.add_argument(
         "--lint",
@@ -543,6 +558,25 @@ def get_parser(default_config_files, git_root):
     )
 
     ##########
+    group = parser.add_argument_group("Analytics")
+    group.add_argument(
+        "--analytics",
+        action=argparse.BooleanOptionalAction,
+        default=False,
+        help="Enable/disable analytics for one session (default: False)",
+    )
+    group.add_argument(
+        "--analytics-log",
+        metavar="ANALYTICS_LOG_FILE",
+        help="Specify a file to log analytics events",
+    )
+    group.add_argument(
+        "--analytics-disable",
+        action="store_true",
+        help="Permanently disable analytics",
+        default=False,
+    )
+
     group = parser.add_argument_group("Other Settings")
     group.add_argument(
         "--file",
@@ -605,7 +639,13 @@ def get_parser(default_config_files, git_root):
         help="Apply the changes from the given file instead of running the chat (debug)",
     )
     group.add_argument(
-        "--yes",
+        "--apply-clipboard-edits",
+        action="store_true",
+        help="Apply clipboard contents as edits using the main model's editor format",
+        default=False,
+    )
+    group.add_argument(
+        "--yes-always",
         action="store_true",
         help="Always say yes to every confirmation",
         default=None,
@@ -653,6 +693,11 @@ def get_parser(default_config_files, git_root):
             " (disables chat mode)"
         ),
     )
+    group.add_argument(
+        "--load",
+        metavar="LOAD_FILE",
+        help="Load and execute /commands from a file on launch",
+    )
     group.add_argument(
         "--encoding",
         default="utf-8",
@@ -671,8 +716,8 @@ def get_parser(default_config_files, git_root):
     group.add_argument(
         "--gui",
         "--browser",
-        action="store_true",
-        help="Run aider in your browser",
+        action=argparse.BooleanOptionalAction,
+        help="Run aider in your browser (default: False)",
         default=False,
     )
     group.add_argument(
@@ -681,6 +726,12 @@ def get_parser(default_config_files, git_root):
         default=True,
         help="Enable/disable suggesting shell commands (default: True)",
     )
+    group.add_argument(
+        "--fancy-input",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="Enable/disable fancy input with history and completion (default: True)",
+    )
 
     ##########
     group = parser.add_argument_group("Voice Settings")
@@ -712,7 +763,6 @@ def get_md_help():
     parser.formatter_class = MarkdownHelpFormatter
 
     return argparse.ArgumentParser.format_help(parser)
-    return parser.format_help()
 
 
 def get_sample_yaml():
@@ -726,7 +776,6 @@ def get_sample_yaml():
     parser.formatter_class = YamlHelpFormatter
 
     return argparse.ArgumentParser.format_help(parser)
-    return parser.format_help()
 
 
 def get_sample_dotenv():
@@ -740,7 +789,6 @@ def get_sample_dotenv():
     parser.formatter_class = DotEnvFormatter
 
     return argparse.ArgumentParser.format_help(parser)
-    return parser.format_help()
 
 
 def main():

aider/args_formatter.py

@@ -147,7 +147,10 @@ class YamlHelpFormatter(argparse.HelpFormatter):
         elif action.nargs in ("*", "+") or isinstance(action, argparse._AppendAction):
             parts.append(f"#{switch}: xxx")
             parts.append("## Specify multiple values like this:")
-            parts.append(f"#{switch}: [xxx,yyyy,zzz]\n")
+            parts.append(f"#{switch}:")
+            parts.append(f"#  - xxx")
+            parts.append(f"#  - yyy")
+            parts.append(f"#  - zzz")
         else:
             parts.append(f"#{switch}: xxx\n")
 

aider/coders/architect_coder.py

@@ -10,6 +10,9 @@ class ArchitectCoder(AskCoder):
     def reply_completed(self):
         content = self.partial_response_content
 
+        if not content or not content.strip():
+            return
+
         if not self.io.confirm_ask("Edit the files?"):
             return
 
@@ -25,6 +28,7 @@ class ArchitectCoder(AskCoder):
         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)

aider/coders/architect_prompts.py

@@ -13,7 +13,7 @@ Just show the changes needed.
 
 DO NOT show the entire updated function/file/etc!
 
-Always reply in the same language as the change request.
+Always reply to the user in {language}.
 """
 
     example_messages = []

aider/coders/ask_prompts.py

@@ -6,7 +6,7 @@ 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 the same language they are using.
+Always reply to the user in {language}.
 """
 
     example_messages = []

aider/coders/base_coder.py

@@ -17,9 +17,12 @@ from collections import defaultdict
 from datetime import datetime
 from json.decoder import JSONDecodeError
 from pathlib import Path
+from typing import List
 
 from aider import __version__, models, prompts, urls, utils
+from aider.analytics import Analytics
 from aider.commands import Commands
+from aider.exceptions import LiteLLMExceptions
 from aider.history import ChatSummary
 from aider.io import ConfirmGroup, InputOutput
 from aider.linter import Linter
@@ -27,7 +30,7 @@ from aider.llm import litellm
 from aider.repo import ANY_GIT_ERROR, GitRepo
 from aider.repomap import RepoMap
 from aider.run_cmd import run_cmd
-from aider.sendchat import retry_exceptions, send_completion
+from aider.sendchat import RETRY_TIMEOUT, send_completion
 from aider.utils import format_content, format_messages, format_tokens, is_image_file
 
 from ..dump import dump  # noqa: F401
@@ -258,12 +261,17 @@ class Coder:
         commands=None,
         summarizer=None,
         total_cost=0.0,
+        analytics=None,
         map_refresh="auto",
         cache_prompts=False,
         num_cache_warming_pings=0,
         suggest_shell_commands=True,
         chat_language=None,
     ):
+        # Fill in a dummy Analytics if needed, but it is never .enable()'d
+        self.analytics = analytics if analytics is not None else Analytics()
+
+        self.event = self.analytics.event
         self.chat_language = chat_language
         self.commit_before_message = []
         self.aider_commit_hashes = set()
@@ -347,6 +355,9 @@ class Coder:
 
         for fname in fnames:
             fname = Path(fname)
+            if self.repo and self.repo.git_ignored_file(fname):
+                self.io.tool_warning(f"Skipping {fname} that matches gitignore spec.")
+
             if self.repo and self.repo.ignored_file(fname):
                 self.io.tool_warning(f"Skipping {fname} that matches aiderignore spec.")
                 continue
@@ -679,7 +690,7 @@ class Coder:
         return chat_files_messages
 
     def get_images_message(self):
-        if not self.main_model.accepts_images:
+        if not self.main_model.info.get("supports_vision"):
             return None
 
         image_messages = []
@@ -782,18 +793,37 @@ class Coder:
             self.num_reflections += 1
             message = self.reflected_message
 
-    def check_for_urls(self, inp):
+    def check_and_open_urls(self, exc, friendly_msg=None):
+        """Check exception for URLs, offer to open in a browser, with user-friendly error msgs."""
+        text = str(exc)
+
+        if friendly_msg:
+            self.io.tool_warning(text)
+            self.io.tool_error(f"{friendly_msg}")
+        else:
+            self.io.tool_error(text)
+
+        url_pattern = re.compile(r"(https?://[^\s/$.?#].[^\s]*)")
+        urls = list(set(url_pattern.findall(text)))  # Use set to remove duplicates
+        for url in urls:
+            url = url.rstrip(".',\"")
+            self.io.offer_url(url)
+        return urls
+
+    def check_for_urls(self, inp: str) -> List[str]:
+        """Check input for URLs and offer to add them to the chat."""
         url_pattern = re.compile(r"(https?://[^\s/$.?#].[^\s]*[^\s,.])")
         urls = list(set(url_pattern.findall(inp)))  # Use set to remove duplicates
         added_urls = []
         group = ConfirmGroup(urls)
         for url in urls:
             if url not in self.rejected_urls:
+                url = url.rstrip(".',\"")
                 if self.io.confirm_ask(
                     "Add URL to the chat?", subject=url, group=group, allow_never=True
                 ):
                     inp += "\n\n"
-                    inp += self.commands.cmd_web(url)
+                    inp += self.commands.cmd_web(url, return_content=True)
                     added_urls.append(url)
                 else:
                     self.rejected_urls.add(url)
@@ -929,12 +959,18 @@ class Coder:
                 platform=platform_text
             )
 
+        if self.chat_language:
+            language = self.chat_language
+        else:
+            language = "in the same language they are using"
+
         prompt = prompt.format(
             fence=self.fence,
             lazy_prompt=lazy_prompt,
             platform=platform_text,
             shell_cmd_prompt=shell_cmd_prompt,
             shell_cmd_reminder=shell_cmd_reminder,
+            language=language,
         )
         return prompt
 
@@ -1073,7 +1109,7 @@ class Coder:
                 self.warming_pings_left -= 1
                 self.next_cache_warm = time.time() + delay
 
-                kwargs = self.main_model.extra_params or dict()
+                kwargs = dict(self.main_model.extra_params) or dict()
                 kwargs["max_tokens"] = 1
 
                 try:
@@ -1120,6 +1156,8 @@ class Coder:
 
         retry_delay = 0.125
 
+        litellm_ex = LiteLLMExceptions()
+
         self.usage_report = None
         exhausted = False
         interrupted = False
@@ -1128,24 +1166,37 @@ class Coder:
                 try:
                     yield from self.send(messages, functions=self.functions)
                     break
-                except retry_exceptions() as err:
-                    self.io.tool_warning(str(err))
-                    retry_delay *= 2
-                    if retry_delay > 60:
+                except litellm_ex.exceptions_tuple() as err:
+                    ex_info = litellm_ex.get_ex_info(err)
+
+                    if ex_info.name == "ContextWindowExceededError":
+                        exhausted = True
                         break
+
+                    should_retry = ex_info.retry
+                    if should_retry:
+                        retry_delay *= 2
+                        if retry_delay > RETRY_TIMEOUT:
+                            should_retry = False
+
+                    if not should_retry:
+                        self.mdstream = None
+                        self.check_and_open_urls(err, ex_info.description)
+                        break
+
+                    err_msg = str(err)
+                    if ex_info.description:
+                        self.io.tool_warning(err_msg)
+                        self.io.tool_error(ex_info.description)
+                    else:
+                        self.io.tool_error(err_msg)
+
                     self.io.tool_output(f"Retrying in {retry_delay:.1f} seconds...")
                     time.sleep(retry_delay)
                     continue
                 except KeyboardInterrupt:
                     interrupted = True
                     break
-                except litellm.ContextWindowExceededError:
-                    # The input is overflowing the context window!
-                    exhausted = True
-                    break
-                except litellm.exceptions.BadRequestError as br_err:
-                    self.io.tool_error(f"BadRequestError: {br_err}")
-                    return
                 except FinishReasonLength:
                     # We hit the output limit!
                     if not self.main_model.info.get("supports_assistant_prefill"):
@@ -1161,9 +1212,10 @@ class Coder:
                             dict(role="assistant", content=self.multi_response_content, prefix=True)
                         )
                 except Exception as err:
-                    self.io.tool_error(f"Unexpected error: {err}")
+                    self.mdstream = None
                     lines = traceback.format_exception(type(err), err, err.__traceback__)
-                    self.io.tool_error("".join(lines))
+                    self.io.tool_warning("".join(lines))
+                    self.io.tool_error(str(err))
                     return
         finally:
             if self.mdstream:
@@ -1193,12 +1245,16 @@ class Coder:
         else:
             content = ""
 
+        try:
+            self.reply_completed()
+        except KeyboardInterrupt:
+            interrupted = True
+
         if interrupted:
             content += "\n^C KeyboardInterrupt"
             self.cur_messages += [dict(role="assistant", content=content)]
             return
 
-        self.reply_completed()
         edited = self.apply_updates()
 
         self.update_cur_messages()
@@ -1304,11 +1360,9 @@ class Coder:
             res.append("- Use /clear to clear the chat history.")
             res.append("- Break your code into smaller source files.")
 
-        res.append("")
-        res.append(f"For more info: {urls.token_limits}")
-
         res = "".join([line + "\n" for line in res])
         self.io.tool_error(res)
+        self.io.offer_url(urls.token_limits)
 
     def lint_edited(self, fnames):
         res = ""
@@ -1552,7 +1606,6 @@ class Coder:
                 completion.usage, "cache_creation_input_tokens"
             ):
                 self.message_tokens_sent += prompt_tokens
-                self.message_tokens_sent += cache_hit_tokens
                 self.message_tokens_sent += cache_write_tokens
             else:
                 self.message_tokens_sent += prompt_tokens
@@ -1634,11 +1687,27 @@ class Coder:
         self.usage_report = tokens_report + sep + cost_report
 
     def show_usage_report(self):
-        if self.usage_report:
-            self.io.tool_output(self.usage_report)
-            self.message_cost = 0.0
-            self.message_tokens_sent = 0
-            self.message_tokens_received = 0
+        if not self.usage_report:
+            return
+
+        self.io.tool_output(self.usage_report)
+
+        prompt_tokens = self.message_tokens_sent
+        completion_tokens = self.message_tokens_received
+        self.event(
+            "message_send",
+            main_model=self.main_model,
+            edit_format=self.edit_format,
+            prompt_tokens=prompt_tokens,
+            completion_tokens=completion_tokens,
+            total_tokens=prompt_tokens + completion_tokens,
+            cost=self.message_cost,
+            total_cost=self.total_cost,
+        )
+
+        self.message_cost = 0.0
+        self.message_tokens_sent = 0
+        self.message_tokens_received = 0
 
     def get_multi_response_content(self, final=False):
         cur = self.multi_response_content or ""
@@ -1713,6 +1782,10 @@ class Coder:
             self.check_for_dirty_commit(path)
             return True
 
+        if self.repo and self.repo.git_ignored_file(path):
+            self.io.tool_warning(f"Skipping edits to {path} that matches gitignore spec.")
+            return
+
         if not Path(full_path).exists():
             if not self.io.confirm_ask("Create new file?", subject=path):
                 self.io.tool_output(f"Skipping edits to {path}")
@@ -1807,8 +1880,10 @@ class Coder:
         edited = set()
         try:
             edits = self.get_edits()
+            edits = self.apply_edits_dry_run(edits)
             edits = self.prepare_to_edit(edits)
             edited = set(edit[0] for edit in edits)
+
             self.apply_edits(edits)
         except ValueError as err:
             self.num_malformed_responses += 1
@@ -1936,6 +2011,9 @@ class Coder:
     def apply_edits(self, edits):
         return
 
+    def apply_edits_dry_run(self, edits):
+        return edits
+
     def run_shell_commands(self):
         if not self.suggest_shell_commands:
             return ""

aider/coders/editblock_coder.py

@@ -35,29 +35,47 @@ class EditBlockCoder(Coder):
 
         return edits
 
-    def apply_edits(self, edits):
+    def apply_edits_dry_run(self, edits):
+        return self.apply_edits(edits, dry_run=True)
+
+    def apply_edits(self, edits, dry_run=False):
         failed = []
         passed = []
+        updated_edits = []
 
         for edit in edits:
             path, original, updated = edit
             full_path = self.abs_root_path(path)
-            content = self.io.read_text(full_path)
-            new_content = do_replace(full_path, content, original, updated, self.fence)
-            if not new_content:
+            new_content = None
+
+            if Path(full_path).exists():
+                content = self.io.read_text(full_path)
+                new_content = do_replace(full_path, content, original, updated, self.fence)
+
+            # If the edit failed, and
+            # this is not a "create a new file" with an empty original...
+            # https://github.com/Aider-AI/aider/issues/2258
+            if not new_content and original.strip():
                 # try patching any of the other files in the chat
                 for full_path in self.abs_fnames:
                     content = self.io.read_text(full_path)
                     new_content = do_replace(full_path, content, original, updated, self.fence)
                     if new_content:
+                        path = self.get_rel_fname(full_path)
                         break
 
+            updated_edits.append((path, original, updated))
+
             if new_content:
-                self.io.write_text(full_path, new_content)
+                if not dry_run:
+                    self.io.write_text(full_path, new_content)
                 passed.append(edit)
             else:
                 failed.append(edit)
 
+        if dry_run:
+            return updated_edits
+
         if not failed:
             return
 
@@ -365,9 +383,9 @@ def do_replace(fname, content, before_text, after_text, fence=None):
     return new_content
 
 
-HEAD = r"<{5,9} SEARCH"
-DIVIDER = r"={5,9}"
-UPDATED = r">{5,9} REPLACE"
+HEAD = r"^<{5,9} SEARCH\s*$"
+DIVIDER = r"^={5,9}\s*$"
+UPDATED = r"^>{5,9} REPLACE\s*$"
 
 HEAD_ERR = "<<<<<<< SEARCH"
 DIVIDER_ERR = "======="
@@ -400,7 +418,7 @@ def strip_filename(filename, fence):
     filename = filename.strip("`")
     filename = filename.strip("*")
 
-    # https://github.com/paul-gauthier/aider/issues/1158
+    # https://github.com/Aider-AI/aider/issues/1158
     # filename = filename.replace("\\_", "_")
 
     return filename

aider/coders/editblock_prompts.py

@@ -11,7 +11,7 @@ Respect and use existing conventions, libraries, etc that are already present in
 Take requests for changes to the supplied code.
 If the request is ambiguous, ask questions.
 
-Always reply to the user in the same language they are using.
+Always reply to the user in {language}.
 
 Once you understand the request you MUST:
 
@@ -34,7 +34,7 @@ ONLY EVER RETURN CODE IN A *SEARCH/REPLACE BLOCK*!
 4. *Concisely* suggest any shell commands the user might want to run in ```bash blocks.
 
 Just suggest shell commands this way, not example code.
-Only suggest complete shell commands that area ready to execute, without placeholders.
+Only suggest complete shell commands that are ready to execute, without placeholders.
 Only suggest at most a few shell commands at a time, not more than 1-3.
 
 Use the appropriate shell based on the user's system info:
@@ -159,8 +159,9 @@ Use the *FULL* file path, as shown to you by the user.
 Every *SEARCH* section must *EXACTLY MATCH* the existing file content, character for character, including all comments, docstrings, etc.
 If the file contains code or other data wrapped/escaped in json/xml/quotes or other containers, you need to propose edits to the literal contents of the file, including the container markup.
 
-*SEARCH/REPLACE* blocks will replace *all* matching occurrences.
-Include enough lines to make the SEARCH blocks uniquely match the lines to change.
+*SEARCH/REPLACE* blocks will *only* replace the first match occurrence.
+Including multiple unique *SEARCH/REPLACE* blocks if needed.
+Include enough lines in each SEARCH section to uniquely match each set of lines that need to change.
 
 Keep *SEARCH/REPLACE* blocks concise.
 Break large *SEARCH/REPLACE* blocks into a series of smaller blocks that each change a small portion of the file.

aider/coders/udiff_prompts.py

@@ -12,7 +12,7 @@ Respect and use existing conventions, libraries, etc that are already present in
 Take requests for changes to the supplied code.
 If the request is ambiguous, ask questions.
 
-Always reply to the user in the same language they are using.
+Always reply to the user in {language}.
 
 For each file that needs to be changed, write out the changes similar to a unified diff like `diff -U0` would produce.
 """

aider/coders/wholefile_prompts.py

@@ -8,7 +8,7 @@ class WholeFilePrompts(CoderPrompts):
 Take requests for changes to the supplied code.
 If the request is ambiguous, ask questions.
 
-Always reply to the user in the same language they are using.
+Always reply to the user in {language}.
 
 {lazy_prompt}
 Once you understand the request you MUST:
@@ -52,7 +52,7 @@ path/to/filename.js
 {fence[1]}
 
 Every *file listing* MUST use this format:
-- First line: the filename with any originally provided path
+- First line: the filename with any originally provided path; no extra markup, punctuation, comments, etc. **JUST** the filename with path.
 - Second line: opening {fence[0]}
 - ... entire content of the file ...
 - Final line: closing {fence[1]}

aider/commands.py

@@ -1,9 +1,11 @@
+import glob
 import os
 import re
 import subprocess
 import sys
 import tempfile
 from collections import OrderedDict
+from os.path import expanduser
 from pathlib import Path
 
 import pyperclip
@@ -137,7 +139,7 @@ class Commands:
         else:
             self.io.tool_output("Please provide a partial model name to search for.")
 
-    def cmd_web(self, args):
+    def cmd_web(self, args, return_content=False):
         "Scrape a webpage, convert to markdown and send in a message"
 
         url = args.strip()
@@ -156,11 +158,16 @@ class Commands:
             )
 
         content = self.scraper.scrape(url) or ""
-        content = f"{url}:\n\n" + content
+        content = f"Here is the content of {url}:\n\n" + content
+        if return_content:
+            return content
 
-        self.io.tool_output("... done.")
+        self.io.tool_output("... added to chat.")
 
-        return content
+        self.coder.cur_messages += [
+            dict(role="user", content=content),
+            dict(role="assistant", content="Ok."),
+        ]
 
     def is_command(self, inp):
         return inp[0] in "/!"
@@ -221,6 +228,7 @@ class Commands:
 
     def run(self, inp):
         if inp.startswith("!"):
+            self.coder.event("command_run")
             return self.do_run("run", inp[1:])
 
         res = self.matching_commands(inp)
@@ -228,9 +236,13 @@ class Commands:
             return
         matching_commands, first_word, rest_inp = res
         if len(matching_commands) == 1:
-            return self.do_run(matching_commands[0][1:], rest_inp)
+            command = matching_commands[0][1:]
+            self.coder.event(f"command_{command}")
+            return self.do_run(command, rest_inp)
         elif first_word in matching_commands:
-            return self.do_run(first_word[1:], rest_inp)
+            command = first_word[1:]
+            self.coder.event(f"command_{command}")
+            return self.do_run(command, rest_inp)
         elif len(matching_commands) > 1:
             self.io.tool_error(f"Ambiguous command: {', '.join(matching_commands)}")
         else:
@@ -584,7 +596,7 @@ class Commands:
         text = document.text_before_cursor
 
         # Skip the first word and the space after it
-        after_command = " ".join(text.split()[1:])
+        after_command = text.split()[-1]
 
         # Create a new Document object with the text after the command
         new_document = Document(after_command, cursor_position=len(after_command))
@@ -601,17 +613,41 @@ class Commands:
         # Adjust the start_position to replace all of 'after_command'
         adjusted_start_position = -len(after_command)
 
+        # Collect all completions
+        all_completions = []
+
         # Iterate over the completions and modify them
         for completion in path_completer.get_completions(new_document, complete_event):
             quoted_text = self.quote_fname(after_command + completion.text)
-            yield Completion(
-                text=quoted_text,
-                start_position=adjusted_start_position,
-                display=completion.display,
-                style=completion.style,
-                selected_style=completion.selected_style,
+            all_completions.append(
+                Completion(
+                    text=quoted_text,
+                    start_position=adjusted_start_position,
+                    display=completion.display,
+                    style=completion.style,
+                    selected_style=completion.selected_style,
+                )
             )
 
+        # Add completions from the 'add' command
+        add_completions = self.completions_add()
+        for completion in add_completions:
+            if after_command in completion:
+                all_completions.append(
+                    Completion(
+                        text=completion,
+                        start_position=adjusted_start_position,
+                        display=completion,
+                    )
+                )
+
+        # Sort all completions based on their text
+        sorted_completions = sorted(all_completions, key=lambda c: c.text)
+
+        # Yield the sorted completions
+        for completion in sorted_completions:
+            yield completion
+
     def completions_add(self):
         files = set(self.coder.get_all_relative_files())
         files = files - set(self.coder.get_inchat_relative_files())
@@ -628,7 +664,7 @@ class Commands:
             else:
                 try:
                     raw_matched_files = list(Path(self.coder.root).glob(pattern))
-                except IndexError:
+                except (IndexError, AttributeError):
                     raw_matched_files = []
         except ValueError as err:
             self.io.tool_error(f"Error matching {pattern}: {err}")
@@ -698,7 +734,7 @@ class Commands:
                 except OSError as e:
                     self.io.tool_error(f"Error creating file {fname}: {e}")
 
-        for matched_file in all_matched_files:
+        for matched_file in sorted(all_matched_files):
             abs_file_path = self.coder.abs_root_path(matched_file)
 
             if not abs_file_path.startswith(self.coder.root) and not is_image_file(matched_file):
@@ -707,6 +743,10 @@ class Commands:
                 )
                 continue
 
+            if self.coder.repo and self.coder.repo.git_ignored_file(matched_file):
+                self.io.tool_error(f"Can't add {matched_file} which is in gitignore")
+                continue
+
             if abs_file_path in self.coder.abs_fnames:
                 self.io.tool_error(f"{matched_file} is already in the chat as an editable file")
                 continue
@@ -722,7 +762,9 @@ class Commands:
                         f"Cannot add {matched_file} as it's not part of the repository"
                     )
             else:
-                if is_image_file(matched_file) and not self.coder.main_model.accepts_images:
+                if is_image_file(matched_file) and not self.coder.main_model.info.get(
+                    "supports_vision"
+                ):
                     self.io.tool_error(
                         f"Cannot add image file {matched_file} as the"
                         f" {self.coder.main_model.name} does not support images."
@@ -935,6 +977,7 @@ class Commands:
             self.basic_help()
             return
 
+        self.coder.event("interactive help")
         from aider.coders import Coder
 
         if not self.help:
@@ -1137,23 +1180,41 @@ class Commands:
             return
 
         filenames = parse_quoted_filenames(args)
-        for word in filenames:
-            # Expand the home directory if the path starts with "~"
-            expanded_path = os.path.expanduser(word)
-            abs_path = self.coder.abs_root_path(expanded_path)
+        all_paths = []
 
-            if not os.path.exists(abs_path):
-                self.io.tool_error(f"Path not found: {abs_path}")
-                continue
+        # First collect all expanded paths
+        for pattern in filenames:
+            expanded_pattern = expanduser(pattern)
+            if os.path.isabs(expanded_pattern):
+                # For absolute paths, glob it
+                matches = list(glob.glob(expanded_pattern))
+            else:
+                # For relative paths and globs, use glob from the root directory
+                matches = list(Path(self.coder.root).glob(expanded_pattern))
 
+            if not matches:
+                self.io.tool_error(f"No matches found for: {pattern}")
+            else:
+                all_paths.extend(matches)
+
+        # Then process them in sorted order
+        for path in sorted(all_paths):
+            abs_path = self.coder.abs_root_path(path)
             if os.path.isfile(abs_path):
-                self._add_read_only_file(abs_path, word)
+                self._add_read_only_file(abs_path, path)
             elif os.path.isdir(abs_path):
-                self._add_read_only_directory(abs_path, word)
+                self._add_read_only_directory(abs_path, path)
             else:
                 self.io.tool_error(f"Not a file or directory: {abs_path}")
 
     def _add_read_only_file(self, abs_path, original_name):
+        if is_image_file(original_name) and not self.coder.main_model.info.get("supports_vision"):
+            self.io.tool_error(
+                f"Cannot add image file {original_name} as the"
+                f" {self.coder.main_model.name} does not support images."
+            )
+            return
+
         if abs_path in self.coder.abs_read_only_fnames:
             self.io.tool_error(f"{original_name} is already in the chat as a read-only file")
             return
@@ -1203,7 +1264,66 @@ class Commands:
     def cmd_settings(self, args):
         "Print out the current settings"
         settings = format_settings(self.parser, self.args)
-        self.io.tool_output(settings)
+        announcements = "\n".join(self.coder.get_announcements())
+        output = f"{announcements}\n{settings}"
+        self.io.tool_output(output)
+
+    def completions_raw_load(self, document, complete_event):
+        return self.completions_raw_read_only(document, complete_event)
+
+    def cmd_load(self, args):
+        "Load and execute commands from a file"
+        if not args.strip():
+            self.io.tool_error("Please provide a filename containing commands to load.")
+            return
+
+        try:
+            with open(args.strip(), "r", encoding=self.io.encoding, errors="replace") as f:
+                commands = f.readlines()
+        except FileNotFoundError:
+            self.io.tool_error(f"File not found: {args}")
+            return
+        except Exception as e:
+            self.io.tool_error(f"Error reading file: {e}")
+            return
+
+        for cmd in commands:
+            cmd = cmd.strip()
+            if not cmd or cmd.startswith("#"):
+                continue
+
+            self.io.tool_output(f"\nExecuting: {cmd}")
+            self.run(cmd)
+
+    def completions_raw_save(self, document, complete_event):
+        return self.completions_raw_read_only(document, complete_event)
+
+    def cmd_save(self, args):
+        "Save commands to a file that can reconstruct the current chat session's files"
+        if not args.strip():
+            self.io.tool_error("Please provide a filename to save the commands to.")
+            return
+
+        try:
+            with open(args.strip(), "w", encoding=self.io.encoding) as f:
+                f.write("/drop\n")
+                # Write commands to add editable files
+                for fname in sorted(self.coder.abs_fnames):
+                    rel_fname = self.coder.get_rel_fname(fname)
+                    f.write(f"/add       {rel_fname}\n")
+
+                # Write commands to add read-only files
+                for fname in sorted(self.coder.abs_read_only_fnames):
+                    # Use absolute path for files outside repo root, relative path for files inside
+                    if Path(fname).is_relative_to(self.coder.root):
+                        rel_fname = self.coder.get_rel_fname(fname)
+                        f.write(f"/read-only {rel_fname}\n")
+                    else:
+                        f.write(f"/read-only {fname}\n")
+
+            self.io.tool_output(f"Saved commands to {args.strip()}")
+        except Exception as e:
+            self.io.tool_error(f"Error saving commands to file: {e}")
 
     def cmd_copy(self, args):
         "Copy the last assistant message to the clipboard"

aider/exceptions.py

@@ -0,0 +1,76 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class ExInfo:
+    name: str
+    retry: bool
+    description: str
+
+
+EXCEPTIONS = [
+    ExInfo("APIConnectionError", True, None),
+    ExInfo("APIError", True, None),
+    ExInfo("APIResponseValidationError", True, None),
+    ExInfo(
+        "AuthenticationError",
+        False,
+        "The API provider is not able to authenticate you. Check your API key.",
+    ),
+    ExInfo("AzureOpenAIError", True, None),
+    ExInfo("BadRequestError", False, None),
+    ExInfo("BudgetExceededError", True, None),
+    ExInfo(
+        "ContentPolicyViolationError",
+        True,
+        "The API provider has refused the request due to a safety policy about the content.",
+    ),
+    ExInfo("ContextWindowExceededError", False, None),  # special case handled in base_coder
+    ExInfo("InternalServerError", True, "The API provider's servers are down or overloaded."),
+    ExInfo("InvalidRequestError", True, None),
+    ExInfo("JSONSchemaValidationError", True, None),
+    ExInfo("NotFoundError", False, None),
+    ExInfo("OpenAIError", True, None),
+    ExInfo(
+        "RateLimitError",
+        True,
+        "The API provider has rate limited you. Try again later or check your quotas.",
+    ),
+    ExInfo("RouterRateLimitError", True, None),
+    ExInfo("ServiceUnavailableError", True, "The API provider's servers are down or overloaded."),
+    ExInfo("UnprocessableEntityError", True, None),
+    ExInfo("UnsupportedParamsError", True, None),
+]
+
+
+class LiteLLMExceptions:
+    exceptions = dict()
+
+    def __init__(self):
+        self._load()
+
+    def _load(self, strict=False):
+        import litellm
+
+        for var in dir(litellm):
+            if not var.endswith("Error"):
+                continue
+
+            ex_info = None
+            for exi in EXCEPTIONS:
+                if var == exi.name:
+                    ex_info = exi
+                    break
+
+            if strict and not ex_info:
+                raise ValueError(f"{var} is in litellm but not in aider's exceptions list")
+
+            ex = getattr(litellm, var)
+            self.exceptions[ex] = ex_info
+
+    def exceptions_tuple(self):
+        return tuple(self.exceptions)
+
+    def get_ex_info(self, ex):
+        """Return the ExInfo for a given exception instance"""
+        return self.exceptions.get(ex.__class__, ExInfo(None, None, None))

aider/gui.py

@@ -160,7 +160,7 @@ class GUI:
 
             st.warning(
                 "This browser version of aider is experimental. Please share feedback in [GitHub"
-                " issues](https://github.com/paul-gauthier/aider/issues)."
+                " issues](https://github.com/Aider-AI/aider/issues)."
             )
 
     def do_settings_tab(self):
@@ -528,7 +528,7 @@ def gui_main():
         page_icon=urls.favicon,
         menu_items={
             "Get Help": urls.website,
-            "Report a bug": "https://github.com/paul-gauthier/aider/issues",
+            "Report a bug": "https://github.com/Aider-AI/aider/issues",
             "About": "# Aider\nAI pair programming in your browser.",
         },
     )

aider/help.py

@@ -40,24 +40,45 @@ def get_package_files():
 
 
 def fname_to_url(filepath):
-    website = "website/"
-    index = "/index.md"
+    website = "website"
+    index = "index.md"
     md = ".md"
 
-    docid = ""
-    if filepath.startswith("website/_includes/"):
-        pass
-    elif filepath.startswith(website):
-        docid = filepath[len(website) :]
+    # Convert backslashes to forward slashes for consistency
+    filepath = filepath.replace("\\", "/")
 
-        if filepath.endswith(index):
-            filepath = filepath[: -len(index)] + "/"
-        elif filepath.endswith(md):
-            filepath = filepath[: -len(md)] + ".html"
+    # Convert to Path object for easier manipulation
+    path = Path(filepath)
 
-        docid = "https://aider.chat/" + filepath
+    # Split the path into parts
+    parts = path.parts
 
-    return docid
+    # Find the 'website' part in the path
+    try:
+        website_index = [p.lower() for p in parts].index(website.lower())
+    except ValueError:
+        return ""  # 'website' not found in the path
+
+    # Extract the part of the path starting from 'website'
+    relevant_parts = parts[website_index + 1 :]
+
+    # Handle _includes directory
+    if relevant_parts and relevant_parts[0].lower() == "_includes":
+        return ""
+
+    # Join the remaining parts
+    url_path = "/".join(relevant_parts)
+
+    # Handle index.md and other .md files
+    if url_path.lower().endswith(index.lower()):
+        url_path = url_path[: -len(index)]
+    elif url_path.lower().endswith(md.lower()):
+        url_path = url_path[: -len(md)] + ".html"
+
+    # Ensure the URL starts and ends with '/'
+    url_path = url_path.strip("/")
+
+    return f"https://aider.chat/{url_path}"
 
 
 def get_index():

aider/io.py

@@ -1,8 +1,11 @@
 import base64
 import os
+import time
+import webbrowser
 from collections import defaultdict
 from dataclasses import dataclass
 from datetime import datetime
+from io import StringIO
 from pathlib import Path
 
 from prompt_toolkit.completion import Completer, Completion, ThreadedCompleter
@@ -15,6 +18,7 @@ from prompt_toolkit.shortcuts import CompleteStyle, PromptSession
 from prompt_toolkit.styles import Style
 from pygments.lexers import MarkdownLexer, guess_lexer_for_filename
 from pygments.token import Token
+from rich.columns import Columns
 from rich.console import Console
 from rich.markdown import Markdown
 from rich.style import Style as RichStyle
@@ -192,6 +196,7 @@ class InputOutput:
         dry_run=False,
         llm_history_file=None,
         editingmode=EditingMode.EMACS,
+        fancy_input=True,
     ):
         self.never_prompts = set()
         self.editingmode = editingmode
@@ -234,15 +239,16 @@ class InputOutput:
         self.append_chat_history(f"\n# aider chat started at {current_time}\n\n")
 
         self.prompt_session = None
-        if self.pretty:
+        if fancy_input:
             # Initialize PromptSession
             session_kwargs = {
                 "input": self.input,
                 "output": self.output,
                 "lexer": PygmentsLexer(MarkdownLexer),
                 "editing_mode": self.editingmode,
-                "cursor": ModalCursorShapeConfig(),
             }
+            if self.editingmode == EditingMode.VI:
+                session_kwargs["cursor"] = ModalCursorShapeConfig()
             if self.input_history_file is not None:
                 session_kwargs["history"] = FileHistory(self.input_history_file)
             try:
@@ -328,14 +334,36 @@ class InputOutput:
             self.tool_error("Use --encoding to set the unicode encoding.")
             return
 
-    def write_text(self, filename, content):
+    def write_text(self, filename, content, max_retries=5, initial_delay=0.1):
+        """
+        Writes content to a file, retrying with progressive backoff if the file is locked.
+
+        :param filename: Path to the file to write.
+        :param content: Content to write to the file.
+        :param max_retries: Maximum number of retries if a file lock is encountered.
+        :param initial_delay: Initial delay (in seconds) before the first retry.
+        """
         if self.dry_run:
             return
-        try:
-            with open(str(filename), "w", encoding=self.encoding) as f:
-                f.write(content)
-        except OSError as err:
-            self.tool_error(f"Unable to write file {filename}: {err}")
+
+        delay = initial_delay
+        for attempt in range(max_retries):
+            try:
+                with open(str(filename), "w", encoding=self.encoding) as f:
+                    f.write(content)
+                return  # Successfully wrote the file
+            except PermissionError as err:
+                if attempt < max_retries - 1:
+                    time.sleep(delay)
+                    delay *= 2  # Exponential backoff
+                else:
+                    self.tool_error(
+                        f"Unable to write file {filename} after {max_retries} attempts: {err}"
+                    )
+                    raise
+            except OSError as err:
+                self.tool_error(f"Unable to write file {filename}: {err}")
+                raise
 
     def rule(self):
         if self.pretty:
@@ -358,7 +386,10 @@ class InputOutput:
         rel_fnames = list(rel_fnames)
         show = ""
         if rel_fnames:
-            show = " ".join(rel_fnames) + "\n"
+            rel_read_only_fnames = [
+                get_rel_fname(fname, root) for fname in (abs_read_only_fnames or [])
+            ]
+            show = self.format_files_for_input(rel_fnames, rel_read_only_fnames)
         if edit_format:
             show += edit_format
         show += "> "
@@ -477,6 +508,15 @@ class InputOutput:
         hist = "\n" + content.strip() + "\n\n"
         self.append_chat_history(hist)
 
+    def offer_url(self, url, prompt="Open URL for more info?"):
+        """Offer to open a URL in the browser, returns True if opened."""
+        if url in self.never_prompts:
+            return False
+        if self.confirm_ask(prompt, subject=url, allow_never=True):
+            webbrowser.open(url)
+            return True
+        return False
+
     def confirm_ask(
         self,
         question,
@@ -689,9 +729,55 @@ class InputOutput:
             try:
                 with self.chat_history_file.open("a", encoding=self.encoding, errors="ignore") as f:
                     f.write(text)
-            except (PermissionError, OSError):
-                self.tool_error(
-                    f"Warning: Unable to write to chat history file {self.chat_history_file}."
-                    " Permission denied."
-                )
+            except (PermissionError, OSError) as err:
+                print(f"Warning: Unable to write to chat history file {self.chat_history_file}.")
+                print(err)
                 self.chat_history_file = None  # Disable further attempts to write
+
+    def format_files_for_input(self, rel_fnames, rel_read_only_fnames):
+        if not self.pretty:
+            read_only_files = []
+            for full_path in sorted(rel_read_only_fnames or []):
+                read_only_files.append(f"{full_path} (read only)")
+
+            editable_files = []
+            for full_path in sorted(rel_fnames):
+                if full_path in rel_read_only_fnames:
+                    continue
+                editable_files.append(f"{full_path}")
+
+            return "\n".join(read_only_files + editable_files) + "\n"
+
+        output = StringIO()
+        console = Console(file=output, force_terminal=False)
+
+        read_only_files = sorted(rel_read_only_fnames or [])
+        editable_files = [f for f in sorted(rel_fnames) if f not in rel_read_only_fnames]
+
+        if read_only_files:
+            files_with_label = ["Readonly:"] + read_only_files
+            read_only_output = StringIO()
+            Console(file=read_only_output, force_terminal=False).print(Columns(files_with_label))
+            read_only_lines = read_only_output.getvalue().splitlines()
+            console.print(Columns(files_with_label))
+
+        if editable_files:
+            files_with_label = editable_files
+            if read_only_files:
+                files_with_label = ["Editable:"] + editable_files
+                editable_output = StringIO()
+                Console(file=editable_output, force_terminal=False).print(Columns(files_with_label))
+                editable_lines = editable_output.getvalue().splitlines()
+
+                if len(read_only_lines) > 1 or len(editable_lines) > 1:
+                    console.print()
+            console.print(Columns(files_with_label))
+
+        return output.getvalue()
+
+
+def get_rel_fname(fname, root):
+    try:
+        return os.path.relpath(fname, root)
+    except ValueError:
+        return fname

aider/linter.py

@@ -221,7 +221,12 @@ def basic_lint(fname, code):
 
     tree = parser.parse(bytes(code, "utf-8"))
 
-    errors = traverse_tree(tree.root_node)
+    try:
+        errors = traverse_tree(tree.root_node)
+    except RecursionError:
+        print(f"Unable to lint {fname} due to RecursionError")
+        return
+
     if not errors:
         return
 

aider/main.py

@@ -8,10 +8,12 @@ import traceback
 from pathlib import Path
 
 import git
+import importlib_resources
 from dotenv import load_dotenv
 from prompt_toolkit.enums import EditingMode
 
-from aider import __version__, models, utils
+from aider import __version__, models, urls, utils
+from aider.analytics import Analytics
 from aider.args import get_parser
 from aider.coders import Coder
 from aider.commands import Commands, SwitchCoder
@@ -26,6 +28,23 @@ from aider.versioncheck import check_version, install_from_main_branch, install_
 from .dump import dump  # noqa: F401
 
 
+def check_config_files_for_yes(config_files):
+    found = False
+    for config_file in config_files:
+        if Path(config_file).exists():
+            try:
+                with open(config_file, "r") as f:
+                    for line in f:
+                        if line.strip().startswith("yes:"):
+                            print("Configuration error detected.")
+                            print(f"The file {config_file} contains a line starting with 'yes:'")
+                            print("Please replace 'yes:' with 'yes-always:' in this file.")
+                            found = True
+            except Exception:
+                pass
+    return found
+
+
 def get_git_root():
     """Try and guess the git repo, since the conf.yml can be at the repo root"""
     try:
@@ -40,7 +59,7 @@ def guessed_wrong_repo(io, git_root, fnames, git_dname):
 
     try:
         check_repo = Path(GitRepo(io, fnames, git_dname).root).resolve()
-    except FileNotFoundError:
+    except (OSError,) + ANY_GIT_ERROR:
         return
 
     # we had no guess, rely on the "true" repo result
@@ -68,15 +87,25 @@ def make_new_repo(git_root, io):
 
 
 def setup_git(git_root, io):
+    try:
+        cwd = Path.cwd()
+    except OSError:
+        cwd = None
+
     repo = None
 
     if git_root:
-        repo = git.Repo(git_root)
-    elif Path.cwd() == Path.home():
+        try:
+            repo = git.Repo(git_root)
+        except ANY_GIT_ERROR:
+            pass
+    elif cwd == Path.home():
         io.tool_warning("You should probably run aider in a directory, not your home dir.")
         return
-    elif io.confirm_ask("No git repo found, create one to track aider's changes (recommended)?"):
-        git_root = str(Path.cwd().resolve())
+    elif cwd and io.confirm_ask(
+        "No git repo found, create one to track aider's changes (recommended)?"
+    ):
+        git_root = str(cwd.resolve())
         repo = make_new_repo(git_root, io)
 
     if not repo:
@@ -114,32 +143,39 @@ def check_gitignore(git_root, io, ask=True):
 
     try:
         repo = git.Repo(git_root)
-        if repo.ignored(".aider"):
+        if repo.ignored(".aider") and repo.ignored(".env"):
             return
     except ANY_GIT_ERROR:
         pass
 
-    pat = ".aider*"
+    patterns = [".aider*", ".env"]
+    patterns_to_add = []
 
     gitignore_file = Path(git_root) / ".gitignore"
     if gitignore_file.exists():
         content = io.read_text(gitignore_file)
         if content is None:
             return
-        if pat in content.splitlines():
-            return
+        existing_lines = content.splitlines()
+        for pat in patterns:
+            if pat not in existing_lines:
+                patterns_to_add.append(pat)
     else:
         content = ""
+        patterns_to_add = patterns
 
-    if ask and not io.confirm_ask(f"Add {pat} to .gitignore (recommended)?"):
+    if not patterns_to_add:
+        return
+
+    if ask and not io.confirm_ask(f"Add {', '.join(patterns_to_add)} to .gitignore (recommended)?"):
         return
 
     if content and not content.endswith("\n"):
         content += "\n"
-    content += pat + "\n"
+    content += "\n".join(patterns_to_add) + "\n"
     io.write_text(gitignore_file, content)
 
-    io.tool_output(f"Added {pat} to .gitignore")
+    io.tool_output(f"Added {', '.join(patterns_to_add)} to .gitignore")
 
 
 def check_streamlit_install(io):
@@ -169,7 +205,10 @@ def launch_gui(args):
         "--server.runOnSave=false",
     ]
 
-    if "-dev" in __version__:
+    # https://github.com/Aider-AI/aider/issues/2193
+    is_dev = "-dev" in str(__version__)
+
+    if is_dev:
         print("Watching for file changes.")
     else:
         st_args += [
@@ -217,16 +256,23 @@ def parse_lint_cmds(lint_cmds, io):
     return res
 
 
-def generate_search_path_list(default_fname, git_root, command_line_file):
+def generate_search_path_list(default_file, git_root, command_line_file):
     files = []
-    default_file = Path(default_fname)
     files.append(Path.home() / default_file)  # homedir
     if git_root:
         files.append(Path(git_root) / default_file)  # git root
-    files.append(default_file.resolve())
+    files.append(default_file)
     if command_line_file:
         files.append(command_line_file)
-    files = [Path(fn).resolve() for fn in files]
+
+    resolved_files = []
+    for fn in files:
+        try:
+            resolved_files.append(Path(fn).resolve())
+        except OSError:
+            pass
+
+    files = resolved_files
     files.reverse()
     uniq = []
     for fn in files:
@@ -286,7 +332,13 @@ def load_dotenv_files(git_root, dotenv_fname, encoding="utf-8"):
 
 
 def register_litellm_models(git_root, model_metadata_fname, io, verbose=False):
-    model_metatdata_files = generate_search_path_list(
+    model_metatdata_files = []
+
+    # Add the resource file path
+    resource_metadata = importlib_resources.files("aider.resources").joinpath("model-metadata.json")
+    model_metatdata_files.append(str(resource_metadata))
+
+    model_metatdata_files += generate_search_path_list(
         ".aider.model.metadata.json", git_root, model_metadata_fname
     )
 
@@ -326,7 +378,7 @@ def sanity_check_repo(repo, io):
         io.tool_error("Aider only works with git repos with version number 1 or 2.")
         io.tool_output("You may be able to convert your repo: git update-index --index-version=2")
         io.tool_output("Or run aider --no-git to proceed without using git.")
-        io.tool_output("https://github.com/paul-gauthier/aider/issues/211")
+        io.offer_url(urls.git_index_version, "Open documentation url for more info?")
         return False
 
     io.tool_error("Unable to read git repository, it may be corrupt?")
@@ -347,7 +399,12 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
 
     conf_fname = Path(".aider.conf.yml")
 
-    default_config_files = [conf_fname.resolve()]  # CWD
+    default_config_files = []
+    try:
+        default_config_files += [conf_fname.resolve()]  # CWD
+    except OSError:
+        pass
+
     if git_root:
         git_conf = Path(git_root) / conf_fname  # git root
         if git_conf not in default_config_files:
@@ -356,7 +413,13 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     default_config_files = list(map(str, default_config_files))
 
     parser = get_parser(default_config_files, git_root)
-    args, unknown = parser.parse_known_args(argv)
+    try:
+        args, unknown = parser.parse_known_args(argv)
+    except AttributeError as e:
+        if all(word in str(e) for word in ["bool", "object", "has", "no", "attribute", "strip"]):
+            if check_config_files_for_yes(default_config_files):
+                return 1
+        raise e
 
     if args.verbose:
         print("Config files search order, if no --config:")
@@ -367,6 +430,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     default_config_files.reverse()
 
     parser = get_parser(default_config_files, git_root)
+
     args, unknown = parser.parse_known_args(argv)
 
     # Load the .env file specified in the arguments
@@ -375,6 +439,10 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     # Parse again to include any arguments that might have been defined in .env
     args = parser.parse_args(argv)
 
+    if args.analytics_disable:
+        analytics = Analytics(permanently_disable=True)
+        print("Analytics have been permanently disabled.")
+
     if not args.verify_ssl:
         import httpx
 
@@ -397,15 +465,15 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         args.assistant_output_color = "blue"
         args.code_theme = "default"
 
-    if return_coder and args.yes is None:
-        args.yes = True
+    if return_coder and args.yes_always is None:
+        args.yes_always = True
 
     editing_mode = EditingMode.VI if args.vim else EditingMode.EMACS
 
     def get_io(pretty):
         return InputOutput(
             pretty,
-            args.yes,
+            args.yes_always,
             args.input_history_file,
             args.chat_history_file,
             input=input,
@@ -424,6 +492,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             encoding=args.encoding,
             llm_history_file=args.llm_history_file,
             editingmode=editing_mode,
+            fancy_input=args.fancy_input,
         )
 
     io = get_io(args.pretty)
@@ -435,9 +504,35 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         io = get_io(False)
         io.tool_warning("Terminal does not support pretty output (UnicodeDecodeError)")
 
+    analytics = Analytics(logfile=args.analytics_log, permanently_disable=args.analytics_disable)
+    if args.analytics:
+        if analytics.need_to_ask():
+            io.tool_output(
+                "Aider respects your privacy and never collects your code, chat messages, keys or"
+                " personal info."
+            )
+            io.tool_output(f"For more info: {urls.analytics}")
+            disable = not io.confirm_ask(
+                "Allow collection of anonymous analytics to help improve aider?"
+            )
+
+            analytics.asked_opt_in = True
+            if disable:
+                analytics.disable(permanently=True)
+                io.tool_output("Analytics have been permanently disabled.")
+
+            analytics.save_data()
+            io.tool_output()
+
+        # This is a no-op if the user has opted out
+        analytics.enable()
+
+    analytics.event("launched")
+
     if args.gui and not return_coder:
         if not check_streamlit_install(io):
             return
+        analytics.event("gui session")
         launch_gui(argv)
         return
 
@@ -447,7 +542,14 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
 
     all_files = args.files + (args.file or [])
     fnames = [str(Path(fn).resolve()) for fn in all_files]
-    read_only_fnames = [str(Path(fn).resolve()) for fn in (args.read or [])]
+    read_only_fnames = []
+    for fn in args.read or []:
+        path = Path(fn).resolve()
+        if path.is_dir():
+            read_only_fnames.extend(str(f) for f in path.rglob("*") if f.is_file())
+        else:
+            read_only_fnames.append(str(path))
+
     if len(all_files) > 1:
         good = True
         for fname in all_files:
@@ -532,7 +634,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     if not args.model:
         args.model = "gpt-4o-2024-08-06"
         if os.environ.get("ANTHROPIC_API_KEY"):
-            args.model = "claude-3-5-sonnet-20240620"
+            args.model = "claude-3-5-sonnet-20241022"
 
     main_model = models.Model(
         args.model,
@@ -552,11 +654,12 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     if args.show_model_warnings:
         problem = models.sanity_check_models(io, main_model)
         if problem:
+            analytics.event("model warning", main_model=main_model)
             io.tool_output("You can skip this check with --no-show-model-warnings")
-            io.tool_output()
+
             try:
-                if not io.confirm_ask("Proceed anyway?"):
-                    return 1
+                io.offer_url(urls.model_warnings, "Open documentation url for more info?")
+                io.tool_output()
             except KeyboardInterrupt:
                 return 1
 
@@ -579,8 +682,9 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         except FileNotFoundError:
             pass
 
-    if not sanity_check_repo(repo, io):
-        return 1
+    if not args.skip_sanity_check_repo:
+        if not sanity_check_repo(repo, io):
+            return 1
 
     commands = Commands(
         io, None, verify_ssl=args.verify_ssl, args=args, parser=parser, verbose=args.verbose
@@ -624,6 +728,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             test_cmd=args.test_cmd,
             commands=commands,
             summarizer=summarizer,
+            analytics=analytics,
             map_refresh=args.map_refresh,
             cache_prompts=args.cache_prompts,
             map_mul_no_files=args.map_multiplier_no_files,
@@ -682,6 +787,10 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         coder.apply_updates()
         return
 
+    if args.apply_clipboard_edits:
+        args.edit_format = main_model.editor_edit_format
+        args.message = "/paste"
+
     if "VSCODE_GIT_IPC_HANDLE" in os.environ:
         args.pretty = False
         io.tool_output("VSCode terminal detected, pretty output has been disabled.")
@@ -697,6 +806,9 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         io.tool_output(f"Cur working dir: {Path.cwd()}")
         io.tool_output(f"Git working dir: {git_root}")
 
+    if args.load:
+        commands.cmd_load(args.load)
+
     if args.message:
         io.add_to_input_history(args.message)
         io.tool_output()
@@ -722,6 +834,8 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     if args.exit:
         return
 
+    analytics.event("cli session", main_model=main_model, edit_format=main_model.edit_format)
+
     while True:
         try:
             coder.run()
@@ -769,7 +883,8 @@ def check_and_load_imports(io, verbose=False):
             except Exception as err:
                 io.tool_error(str(err))
                 io.tool_output("Error loading required imports. Did you install aider properly?")
-                io.tool_output("https://aider.chat/docs/install/install.html")
+                io.offer_url(urls.install_properly, "Open documentation url for more info?")
+
                 sys.exit(1)
 
             installs[str(key)] = True

aider/models.py

@@ -13,7 +13,6 @@ import json5
 import yaml
 from PIL import Image
 
-from aider import urls
 from aider.dump import dump  # noqa: F401
 from aider.llm import litellm
 
@@ -53,9 +52,11 @@ ANTHROPIC_MODELS = """
 claude-2
 claude-2.1
 claude-3-haiku-20240307
+claude-3-5-haiku-20241022
 claude-3-opus-20240229
 claude-3-sonnet-20240229
 claude-3-5-sonnet-20240620
+claude-3-5-sonnet-20241022
 """
 
 ANTHROPIC_MODELS = [ln.strip() for ln in ANTHROPIC_MODELS.splitlines() if ln.strip()]
@@ -69,7 +70,6 @@ class ModelSettings:
     weak_model_name: Optional[str] = None
     use_repo_map: bool = False
     send_undo_reply: bool = False
-    accepts_images: bool = False
     lazy: bool = False
     reminder: str = "user"
     examples_as_sys_msg: bool = False
@@ -125,7 +125,6 @@ MODEL_SETTINGS = [
         "udiff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -134,7 +133,6 @@ MODEL_SETTINGS = [
         "udiff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -143,7 +141,6 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
         editor_edit_format="editor-diff",
@@ -153,7 +150,6 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -162,7 +158,6 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -171,7 +166,6 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
         editor_edit_format="editor-diff",
@@ -180,7 +174,6 @@ MODEL_SETTINGS = [
         "gpt-4o-mini",
         "whole",
         weak_model_name="gpt-4o-mini",
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -188,7 +181,6 @@ MODEL_SETTINGS = [
         "openai/gpt-4o-mini",
         "whole",
         weak_model_name="openai/gpt-4o-mini",
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -214,7 +206,6 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         reminder="sys",
     ),
     ModelSettings(
@@ -243,29 +234,28 @@ MODEL_SETTINGS = [
     ModelSettings(
         "claude-3-opus-20240229",
         "diff",
-        weak_model_name="claude-3-haiku-20240307",
+        weak_model_name="claude-3-5-haiku-20241022",
         use_repo_map=True,
     ),
     ModelSettings(
         "openrouter/anthropic/claude-3-opus",
         "diff",
-        weak_model_name="openrouter/anthropic/claude-3-haiku",
+        weak_model_name="openrouter/anthropic/claude-3-5-haiku",
         use_repo_map=True,
     ),
     ModelSettings(
         "claude-3-sonnet-20240229",
         "whole",
-        weak_model_name="claude-3-haiku-20240307",
+        weak_model_name="claude-3-5-haiku-20241022",
     ),
     ModelSettings(
         "claude-3-5-sonnet-20240620",
         "diff",
-        weak_model_name="claude-3-haiku-20240307",
+        weak_model_name="claude-3-5-haiku-20241022",
         editor_model_name="claude-3-5-sonnet-20240620",
         editor_edit_format="editor-diff",
         use_repo_map=True,
         examples_as_sys_msg=True,
-        accepts_images=True,
         extra_params={
             "extra_headers": {
                 "anthropic-beta": ANTHROPIC_BETA_HEADER,
@@ -278,7 +268,7 @@ MODEL_SETTINGS = [
     ModelSettings(
         "anthropic/claude-3-5-sonnet-20240620",
         "diff",
-        weak_model_name="claude-3-haiku-20240307",
+        weak_model_name="anthropic/claude-3-5-haiku-20241022",
         editor_model_name="anthropic/claude-3-5-sonnet-20240620",
         editor_edit_format="editor-diff",
         use_repo_map=True,
@@ -292,6 +282,74 @@ MODEL_SETTINGS = [
         cache_control=True,
         reminder="user",
     ),
+    ModelSettings(
+        "anthropic/claude-3-5-sonnet-20241022",
+        "diff",
+        weak_model_name="anthropic/claude-3-5-haiku-20241022",
+        editor_model_name="anthropic/claude-3-5-sonnet-20241022",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        examples_as_sys_msg=True,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+            "max_tokens": 8192,
+        },
+        cache_control=True,
+        reminder="user",
+    ),
+    ModelSettings(
+        "bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0",
+        "diff",
+        weak_model_name="bedrock/anthropic.claude-3-5-haiku-20241022-v1:0",
+        editor_model_name="bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        examples_as_sys_msg=True,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+            "max_tokens": 8192,
+        },
+        cache_control=True,
+        reminder="user",
+    ),
+    ModelSettings(
+        "anthropic/claude-3-5-sonnet-latest",
+        "diff",
+        weak_model_name="anthropic/claude-3-5-haiku-20241022",
+        editor_model_name="anthropic/claude-3-5-sonnet-20241022",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        examples_as_sys_msg=True,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+            "max_tokens": 8192,
+        },
+        cache_control=True,
+        reminder="user",
+    ),
+    ModelSettings(
+        "claude-3-5-sonnet-20241022",
+        "diff",
+        weak_model_name="claude-3-5-haiku-20241022",
+        editor_model_name="claude-3-5-sonnet-20241022",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        examples_as_sys_msg=True,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+            "max_tokens": 8192,
+        },
+        cache_control=True,
+        reminder="user",
+    ),
     ModelSettings(
         "anthropic/claude-3-haiku-20240307",
         "whole",
@@ -304,6 +362,52 @@ MODEL_SETTINGS = [
         },
         cache_control=True,
     ),
+    ModelSettings(
+        "anthropic/claude-3-5-haiku-20241022",
+        "diff",
+        weak_model_name="anthropic/claude-3-5-haiku-20241022",
+        use_repo_map=True,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+        },
+        cache_control=True,
+    ),
+    ModelSettings(
+        "bedrock/anthropic.claude-3-5-haiku-20241022-v1:0",
+        "diff",
+        weak_model_name="bedrock/anthropic.claude-3-5-haiku-20241022-v1:0",
+        use_repo_map=True,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+        },
+        cache_control=True,
+    ),
+    ModelSettings(
+        "claude-3-5-haiku-20241022",
+        "diff",
+        weak_model_name="claude-3-5-haiku-20241022",
+        use_repo_map=True,
+        examples_as_sys_msg=True,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+        },
+        cache_control=True,
+    ),
+    ModelSettings(
+        "vertex_ai/claude-3-5-haiku@20241022",
+        "diff",
+        weak_model_name="vertex_ai/claude-3-5-haiku@20241022",
+        use_repo_map=True,
+        extra_params={
+            "max_tokens": 4096,
+        },
+    ),
     ModelSettings(
         "claude-3-haiku-20240307",
         "whole",
@@ -319,12 +423,25 @@ MODEL_SETTINGS = [
     ModelSettings(
         "openrouter/anthropic/claude-3.5-sonnet",
         "diff",
-        weak_model_name="openrouter/anthropic/claude-3-haiku-20240307",
+        weak_model_name="openrouter/anthropic/claude-3-5-haiku",
         editor_model_name="openrouter/anthropic/claude-3.5-sonnet",
         editor_edit_format="editor-diff",
         use_repo_map=True,
         examples_as_sys_msg=True,
-        accepts_images=True,
+        extra_params={
+            "max_tokens": 8192,
+        },
+        reminder="user",
+        cache_control=True,
+    ),
+    ModelSettings(
+        "openrouter/anthropic/claude-3.5-sonnet:beta",
+        "diff",
+        weak_model_name="openrouter/anthropic/claude-3-5-haiku:beta",
+        editor_model_name="openrouter/anthropic/claude-3.5-sonnet:beta",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        examples_as_sys_msg=True,
         extra_params={
             "max_tokens": 8192,
         },
@@ -336,12 +453,24 @@ MODEL_SETTINGS = [
     ModelSettings(
         "vertex_ai/claude-3-5-sonnet@20240620",
         "diff",
-        weak_model_name="vertex_ai/claude-3-haiku@20240307",
+        weak_model_name="vertex_ai/claude-3-5-haiku@20241022",
         editor_model_name="vertex_ai/claude-3-5-sonnet@20240620",
         editor_edit_format="editor-diff",
         use_repo_map=True,
         examples_as_sys_msg=True,
-        accepts_images=True,
+        extra_params={
+            "max_tokens": 8192,
+        },
+        reminder="user",
+    ),
+    ModelSettings(
+        "vertex_ai/claude-3-5-sonnet-v2@20241022",
+        "diff",
+        weak_model_name="vertex_ai/claude-3-5-haiku@20241022",
+        editor_model_name="vertex_ai/claude-3-5-sonnet-v2@20241022",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        examples_as_sys_msg=True,
         extra_params={
             "max_tokens": 8192,
         },
@@ -350,13 +479,13 @@ MODEL_SETTINGS = [
     ModelSettings(
         "vertex_ai/claude-3-opus@20240229",
         "diff",
-        weak_model_name="vertex_ai/claude-3-haiku@20240307",
+        weak_model_name="vertex_ai/claude-3-5-haiku@20241022",
         use_repo_map=True,
     ),
     ModelSettings(
         "vertex_ai/claude-3-sonnet@20240229",
         "whole",
-        weak_model_name="vertex_ai/claude-3-haiku@20240307",
+        weak_model_name="vertex_ai/claude-3-5-haiku@20241022",
     ),
     # Cohere
     ModelSettings(
@@ -421,6 +550,11 @@ MODEL_SETTINGS = [
         "diff-fenced",
         use_repo_map=True,
     ),
+    ModelSettings(
+        "vertex_ai/gemini-pro-experimental",
+        "diff-fenced",
+        use_repo_map=True,
+    ),
     ModelSettings(
         "gemini/gemini-1.5-flash-exp-0827",
         "whole",
@@ -481,7 +615,6 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="openrouter/openai/gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
         editor_edit_format="editor-diff",
@@ -498,6 +631,18 @@ MODEL_SETTINGS = [
         use_temperature=False,
         streaming=False,
     ),
+    ModelSettings(
+        "azure/o1-mini",
+        "whole",
+        weak_model_name="azure/gpt-4o-mini",
+        editor_model_name="azure/gpt-4o",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        reminder="user",
+        use_system_prompt=False,
+        use_temperature=False,
+        streaming=False,
+    ),
     ModelSettings(
         "o1-mini",
         "whole",
@@ -522,6 +667,18 @@ MODEL_SETTINGS = [
         use_temperature=False,
         streaming=False,
     ),
+    ModelSettings(
+        "azure/o1-preview",
+        "diff",
+        weak_model_name="azure/gpt-4o-mini",
+        editor_model_name="azure/gpt-4o",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        reminder="user",
+        use_system_prompt=False,
+        use_temperature=False,
+        streaming=False,
+    ),
     ModelSettings(
         "o1-preview",
         "architect",
@@ -558,80 +715,92 @@ MODEL_SETTINGS = [
         use_temperature=False,
         streaming=False,
     ),
+    ModelSettings(
+        "openrouter/qwen/qwen-2.5-coder-32b-instruct",
+        "diff",
+        weak_model_name="openrouter/qwen/qwen-2.5-coder-32b-instruct",
+        editor_model_name="openrouter/qwen/qwen-2.5-coder-32b-instruct",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+    ),
 ]
 
 
-model_info_url = (
-    "https://raw.githubusercontent.com/BerriAI/litellm/main/model_prices_and_context_window.json"
-)
+class ModelInfoManager:
+    MODEL_INFO_URL = (
+        "https://raw.githubusercontent.com/BerriAI/litellm/main/"
+        "model_prices_and_context_window.json"
+    )
+    CACHE_TTL = 60 * 60 * 24  # 24 hours
 
+    def __init__(self):
+        self.cache_dir = Path.home() / ".aider" / "caches"
+        self.cache_file = self.cache_dir / "model_prices_and_context_window.json"
+        self.content = None
+        self._load_cache()
 
-def get_model_flexible(model, content):
-    info = content.get(model, dict())
-    if info:
-        return info
-
-    pieces = model.split("/")
-    if len(pieces) == 2:
-        info = content.get(pieces[1])
-        if info and info.get("litellm_provider") == pieces[0]:
-            return info
-
-    return dict()
-
-
-def get_model_info(model):
-    if not litellm._lazy_module:
-        cache_dir = Path.home() / ".aider" / "caches"
-        cache_file = cache_dir / "model_prices_and_context_window.json"
-
+    def _load_cache(self):
         try:
-            cache_dir.mkdir(parents=True, exist_ok=True)
-            use_cache = True
+            self.cache_dir.mkdir(parents=True, exist_ok=True)
+            if self.cache_file.exists():
+                cache_age = time.time() - self.cache_file.stat().st_mtime
+                if cache_age < self.CACHE_TTL:
+                    self.content = json.loads(self.cache_file.read_text())
         except OSError:
-            # If we can't create the cache directory, we'll skip using the cache
-            use_cache = False
-
-        if use_cache:
-            current_time = time.time()
-            cache_age = (
-                current_time - cache_file.stat().st_mtime if cache_file.exists() else float("inf")
-            )
-
-            if cache_age < 60 * 60 * 24:
-                try:
-                    content = json.loads(cache_file.read_text())
-                    res = get_model_flexible(model, content)
-                    if res:
-                        return res
-                except Exception as ex:
-                    print(str(ex))
-
-        import requests
+            pass
 
+    def _update_cache(self):
         try:
-            response = requests.get(model_info_url, timeout=5)
+            import requests
+
+            response = requests.get(self.MODEL_INFO_URL, timeout=5)
             if response.status_code == 200:
-                content = response.json()
-                if use_cache:
-                    try:
-                        cache_file.write_text(json.dumps(content, indent=4))
-                    except OSError:
-                        # If we can't write to the cache file, we'll just skip caching
-                        pass
-                res = get_model_flexible(model, content)
-                if res:
-                    return res
+                self.content = response.json()
+                try:
+                    self.cache_file.write_text(json.dumps(self.content, indent=4))
+                except OSError:
+                    pass
         except Exception as ex:
             print(str(ex))
 
-    # If all else fails, do it the slow way...
-    try:
-        info = litellm.get_model_info(model)
-        return info
-    except Exception:
+    def get_model_from_cached_json_db(self, model):
+        if not self.content:
+            self._update_cache()
+
+        if not self.content:
+            return dict()
+
+        info = self.content.get(model, dict())
+        if info:
+            return info
+
+        pieces = model.split("/")
+        if len(pieces) == 2:
+            info = self.content.get(pieces[1])
+            if info and info.get("litellm_provider") == pieces[0]:
+                return info
+
         return dict()
 
+    def get_model_info(self, model):
+        cached_info = self.get_model_from_cached_json_db(model)
+
+        litellm_info = None
+        if litellm._lazy_module or not cached_info:
+            try:
+                litellm_info = litellm.get_model_info(model)
+            except Exception as ex:
+                if "model_prices_and_context_window.json" not in str(ex):
+                    print(str(ex))
+
+        if litellm_info:
+            return litellm_info
+
+        return cached_info
+
+
+model_info_manager = ModelInfoManager()
+
 
 class Model(ModelSettings):
     def __init__(self, model, weak_model=None, editor_model=None, editor_edit_format=None):
@@ -665,7 +834,7 @@ class Model(ModelSettings):
             self.get_editor_model(editor_model, editor_edit_format)
 
     def get_model_info(self, model):
-        return get_model_info(model)
+        return model_info_manager.get_model_info(model)
 
     def configure_model_settings(self, model):
         for ms in MODEL_SETTINGS:
@@ -704,7 +873,23 @@ class Model(ModelSettings):
             self.edit_format = "diff"
             self.use_repo_map = True
             self.examples_as_sys_msg = True
-            self.reminder = None
+            self.reminder = "user"
+
+        if model.startswith("o1-") or "/o1-" in model:
+            self.use_system_prompt = False
+            self.use_temperature = False
+            self.streaming = False
+
+        if (
+            "qwen" in model
+            and "coder" in model
+            and ("2.5" in model or "2-5" in model)
+            and "32b" in model
+        ):
+            "openrouter/qwen/qwen-2.5-coder-32b-instruct",
+            self.edit_format = "diff"
+            self.editor_edit_format = "editor-diff"
+            self.use_repo_map = True
 
         # use the defaults
         if self.edit_format == "diff":
@@ -892,8 +1077,14 @@ def register_litellm_models(model_fnames):
             continue
 
         try:
-            with open(model_fname, "r") as model_def_file:
-                model_def = json5.load(model_def_file)
+            data = Path(model_fname).read_text()
+            if not data.strip():
+                continue
+            model_def = json5.loads(data)
+            if not model_def:
+                continue
+
+            # only load litellm if we have actual data
             litellm._load_litellm()
             litellm.register_model(model_def)
         except Exception as e:
@@ -915,11 +1106,21 @@ def validate_variables(vars):
 
 
 def sanity_check_models(io, main_model):
+    problem_main = sanity_check_model(io, main_model)
+
     problem_weak = None
-    problem_strong = sanity_check_model(io, main_model)
     if main_model.weak_model and main_model.weak_model is not main_model:
         problem_weak = sanity_check_model(io, main_model.weak_model)
-    return problem_strong or problem_weak
+
+    problem_editor = None
+    if (
+        main_model.editor_model
+        and main_model.editor_model is not main_model
+        and main_model.editor_model is not main_model.weak_model
+    ):
+        problem_editor = sanity_check_model(io, main_model.editor_model)
+
+    return problem_main or problem_weak or problem_editor
 
 
 def sanity_check_model(io, model):
@@ -955,9 +1156,6 @@ def sanity_check_model(io, model):
             for match in possible_matches:
                 io.tool_output(f"- {match}")
 
-    if show:
-        io.tool_output(f"For more info, see: {urls.model_warnings}")
-
     return show
 
 
@@ -969,7 +1167,10 @@ def fuzzy_match_models(name):
         model = model.lower()
         if attrs.get("mode") != "chat":
             continue
-        provider = (attrs["litellm_provider"] + "/").lower()
+        provider = attrs.get("litellm_provider", "").lower()
+        if not provider:
+            continue
+        provider += "/"
 
         if model.startswith(provider):
             fq_model = model

aider/prompts.py

@@ -5,15 +5,21 @@
 
 # Conventional Commits text adapted from:
 # https://www.conventionalcommits.org/en/v1.0.0/#summary
-commit_system = """You are an expert software engineer.
+commit_system = """You are an expert software engineer that generates concise, \
+one-line Git commit messages based on the provided diffs.
 Review the provided context and diffs which are about to be committed to a git repo.
 Review the diffs carefully.
-Generate a commit message for those changes.
-The commit message MUST use the imperative tense.
+Generate a one-line commit message for those changes.
 The commit message should be structured as follows: <type>: <description>
 Use these for <type>: fix, feat, build, chore, ci, docs, style, refactor, perf, test
-Reply with JUST the commit message, without quotes, comments, questions, etc!
-Reply with one line only!
+
+Ensure the commit message:
+- Starts with the appropriate prefix.
+- Is in the imperative mood (e.g., \"Add feature\" not \"Added feature\" or \"Adding feature\").
+- Does not exceed 72 characters.
+
+Reply only with the one-line commit message, without any additional text, explanations, \
+or line breaks.
 """
 
 # COMMANDS

aider/repo.py

@@ -169,7 +169,7 @@ class GitRepo:
     def get_rel_repo_dir(self):
         try:
             return os.path.relpath(self.repo.git_dir, os.getcwd())
-        except ValueError:
+        except (ValueError, OSError):
             return self.repo.git_dir
 
     def get_commit_message(self, diffs, context):
@@ -331,6 +331,15 @@ class GitRepo:
                 lines,
             )
 
+    def git_ignored_file(self, path):
+        if not self.repo:
+            return
+        try:
+            if self.repo.ignored(path):
+                return True
+        except ANY_GIT_ERROR:
+            return False
+
     def ignored_file(self, fname):
         self.refresh_aider_ignore()
 

aider/repomap.py

@@ -2,6 +2,7 @@ import colorsys
 import math
 import os
 import random
+import shutil
 import sqlite3
 import sys
 import time
@@ -27,7 +28,7 @@ from tree_sitter_languages import get_language, get_parser  # noqa: E402
 Tag = namedtuple("Tag", "rel_fname fname line name kind".split())
 
 
-SQLITE_ERRORS = (sqlite3.OperationalError, sqlite3.DatabaseError)
+SQLITE_ERRORS = (sqlite3.OperationalError, sqlite3.DatabaseError, OSError)
 
 
 class RepoMap:
@@ -166,13 +167,52 @@ class RepoMap:
             # Just return the full fname.
             return fname
 
+    def tags_cache_error(self, original_error=None):
+        """Handle SQLite errors by trying to recreate cache, falling back to dict if needed"""
+
+        if self.verbose and original_error:
+            self.io.tool_warning(f"Tags cache error: {str(original_error)}")
+
+        if isinstance(getattr(self, "TAGS_CACHE", None), dict):
+            return
+
+        path = Path(self.root) / self.TAGS_CACHE_DIR
+
+        # Try to recreate the cache
+        try:
+            # Delete existing cache dir
+            if path.exists():
+                shutil.rmtree(path)
+
+            # Try to create new cache
+            new_cache = Cache(path)
+
+            # Test that it works
+            test_key = "test"
+            new_cache[test_key] = "test"
+            _ = new_cache[test_key]
+            del new_cache[test_key]
+
+            # If we got here, the new cache works
+            self.TAGS_CACHE = new_cache
+            return
+
+        except SQLITE_ERRORS as e:
+            # If anything goes wrong, warn and fall back to dict
+            self.io.tool_warning(
+                f"Unable to use tags cache at {path}, falling back to memory cache"
+            )
+            if self.verbose:
+                self.io.tool_warning(f"Cache recreation error: {str(e)}")
+
+        self.TAGS_CACHE = dict()
+
     def load_tags_cache(self):
         path = Path(self.root) / self.TAGS_CACHE_DIR
         try:
             self.TAGS_CACHE = Cache(path)
-        except SQLITE_ERRORS:
-            self.io.tool_warning(f"Unable to use tags cache, delete {path} to resolve.")
-            self.TAGS_CACHE = dict()
+        except SQLITE_ERRORS as e:
+            self.tags_cache_error(e)
 
     def save_tags_cache(self):
         pass
@@ -190,9 +230,18 @@ class RepoMap:
             return []
 
         cache_key = fname
-        val = self.TAGS_CACHE.get(cache_key)  # Issue #1308
+        try:
+            val = self.TAGS_CACHE.get(cache_key)  # Issue #1308
+        except SQLITE_ERRORS as e:
+            self.tags_cache_error(e)
+            val = self.TAGS_CACHE.get(cache_key)
+
         if val is not None and val.get("mtime") == file_mtime:
-            return self.TAGS_CACHE[cache_key]["data"]
+            try:
+                return self.TAGS_CACHE[cache_key]["data"]
+            except SQLITE_ERRORS as e:
+                self.tags_cache_error(e)
+                return self.TAGS_CACHE[cache_key]["data"]
 
         # miss!
         data = list(self.get_tags_raw(fname, rel_fname))
@@ -201,8 +250,9 @@ class RepoMap:
         try:
             self.TAGS_CACHE[cache_key] = {"mtime": file_mtime, "data": data}
             self.save_tags_cache()
-        except SQLITE_ERRORS:
-            pass
+        except SQLITE_ERRORS as e:
+            self.tags_cache_error(e)
+            self.TAGS_CACHE[cache_key] = {"mtime": file_mtime, "data": data}
 
         return data
 
@@ -302,7 +352,13 @@ class RepoMap:
         # https://networkx.org/documentation/stable/_modules/networkx/algorithms/link_analysis/pagerank_alg.html#pagerank
         personalize = 100 / len(fnames)
 
-        if len(fnames) - len(self.TAGS_CACHE) > 100:
+        try:
+            cache_size = len(self.TAGS_CACHE)
+        except SQLITE_ERRORS as e:
+            self.tags_cache_error(e)
+            cache_size = len(self.TAGS_CACHE)
+
+        if len(fnames) - cache_size > 100:
             self.io.tool_output(
                 "Initial repo scan can be slow in larger repos, but only happens once."
             )
@@ -312,6 +368,8 @@ class RepoMap:
             showing_bar = False
 
         for fname in fnames:
+            if self.verbose:
+                self.io.tool_output(f"Processing {fname}")
             if progress and not showing_bar:
                 progress()
 
@@ -419,7 +477,9 @@ class RepoMap:
                 ranked_definitions[(dst, ident)] += data["rank"]
 
         ranked_tags = []
-        ranked_definitions = sorted(ranked_definitions.items(), reverse=True, key=lambda x: x[1])
+        ranked_definitions = sorted(
+            ranked_definitions.items(), reverse=True, key=lambda x: (x[1], x[0])
+        )
 
         # dump(ranked_definitions)
 
@@ -455,11 +515,18 @@ class RepoMap:
         force_refresh=False,
     ):
         # Create a cache key
-        cache_key = (
+        cache_key = [
             tuple(sorted(chat_fnames)) if chat_fnames else None,
             tuple(sorted(other_fnames)) if other_fnames else None,
             max_map_tokens,
-        )
+        ]
+
+        if self.refresh == "auto":
+            cache_key += [
+                tuple(sorted(mentioned_fnames)) if mentioned_fnames else None,
+                tuple(sorted(mentioned_idents)) if mentioned_idents else None,
+            ]
+        cache_key = tuple(cache_key)
 
         use_cache = False
         if not force_refresh:

aider/resources/__init__.py

@@ -0,0 +1,3 @@
+# This ensures that importlib_resources.files("aider.resources")
+# doesn't raise ImportError, even if there are no other files in this
+# dir.

aider/resources/model-metadata.json

@@ -0,0 +1,11 @@
+{
+    "openrouter/qwen/qwen-2.5-coder-32b-instruct": {
+        "max_tokens": 33792,
+        "max_input_tokens": 33792,
+        "max_output_tokens": 33792,
+        "input_cost_per_token": 0.00000018,
+        "output_cost_per_token": 0.00000018,
+        "litellm_provider": "openrouter",
+        "mode": "chat",
+    },  
+}

aider/sendchat.py

@@ -1,9 +1,9 @@
 import hashlib
 import json
-
-import backoff
+import time
 
 from aider.dump import dump  # noqa: F401
+from aider.exceptions import LiteLLMExceptions
 from aider.llm import litellm
 
 # from diskcache import Cache
@@ -13,37 +13,7 @@ CACHE_PATH = "~/.aider.send.cache.v1"
 CACHE = None
 # CACHE = Cache(CACHE_PATH)
 
-
-def retry_exceptions():
-    import httpx
-
-    return (
-        httpx.ConnectError,
-        httpx.RemoteProtocolError,
-        httpx.ReadTimeout,
-        litellm.exceptions.APIConnectionError,
-        litellm.exceptions.APIError,
-        litellm.exceptions.RateLimitError,
-        litellm.exceptions.ServiceUnavailableError,
-        litellm.exceptions.Timeout,
-        litellm.exceptions.InternalServerError,
-        litellm.llms.anthropic.chat.AnthropicError,
-    )
-
-
-def lazy_litellm_retry_decorator(func):
-    def wrapper(*args, **kwargs):
-        decorated_func = backoff.on_exception(
-            backoff.expo,
-            retry_exceptions(),
-            max_time=60,
-            on_backoff=lambda details: print(
-                f"{details.get('exception', 'Exception')}\nRetry in {details['wait']:.1f} seconds."
-            ),
-        )(func)
-        return decorated_func(*args, **kwargs)
-
-    return wrapper
+RETRY_TIMEOUT = 60
 
 
 def send_completion(
@@ -54,8 +24,6 @@ def send_completion(
     temperature=0,
     extra_params=None,
 ):
-    from aider.llm import litellm
-
     kwargs = dict(
         model=model_name,
         messages=messages,
@@ -88,18 +56,42 @@ def send_completion(
     return hash_object, res
 
 
-@lazy_litellm_retry_decorator
 def simple_send_with_retries(model_name, messages, extra_params=None):
-    try:
-        kwargs = {
-            "model_name": model_name,
-            "messages": messages,
-            "functions": None,
-            "stream": False,
-            "extra_params": extra_params,
-        }
+    litellm_ex = LiteLLMExceptions()
 
-        _hash, response = send_completion(**kwargs)
-        return response.choices[0].message.content
-    except (AttributeError, litellm.exceptions.BadRequestError):
-        return
+    retry_delay = 0.125
+    while True:
+        try:
+            kwargs = {
+                "model_name": model_name,
+                "messages": messages,
+                "functions": None,
+                "stream": False,
+                "extra_params": extra_params,
+            }
+
+            _hash, response = send_completion(**kwargs)
+            if not response or not hasattr(response, "choices") or not response.choices:
+                return None
+            return response.choices[0].message.content
+        except litellm_ex.exceptions_tuple() as err:
+            ex_info = litellm_ex.get_ex_info(err)
+
+            print(str(err))
+            if ex_info.description:
+                print(ex_info.description)
+
+            should_retry = ex_info.retry
+            if should_retry:
+                retry_delay *= 2
+                if retry_delay > RETRY_TIMEOUT:
+                    should_retry = False
+
+            if not should_retry:
+                return None
+
+            print(f"Retrying in {retry_delay:.1f} seconds...")
+            time.sleep(retry_delay)
+            continue
+        except AttributeError:
+            return None

aider/urls.py

@@ -8,4 +8,7 @@ model_warnings = "https://aider.chat/docs/llms/warnings.html"
 token_limits = "https://aider.chat/docs/troubleshooting/token-limits.html"
 llms = "https://aider.chat/docs/llms.html"
 large_repos = "https://aider.chat/docs/faq.html#can-i-use-aider-in-a-large-mono-repo"
-github_issues = "https://github.com/paul-gauthier/aider/issues/new"
+github_issues = "https://github.com/Aider-AI/aider/issues/new"
+git_index_version = "https://github.com/Aider-AI/aider/issues/211"
+install_properly = "https://aider.chat/docs/troubleshooting/imports.html"
+analytics = "https://aider.chat/docs/more/analytics.html"

aider/utils.py

@@ -275,8 +275,12 @@ class Spinner:
         self.start_time = time.time()
         self.last_update = 0
         self.visible = False
+        self.is_tty = sys.stdout.isatty()
 
     def step(self):
+        if not self.is_tty:
+            return
+
         current_time = time.time()
         if not self.visible and current_time - self.start_time >= 0.5:
             self.visible = True
@@ -292,7 +296,7 @@ class Spinner:
         print(f"\r{self.text} {next(self.spinner_chars)}\r{self.text} ", end="", flush=True)
 
     def end(self):
-        if self.visible:
+        if self.visible and self.is_tty:
             print("\r" + " " * (len(self.text) + 3))
 
 

aider/versioncheck.py

@@ -21,7 +21,7 @@ def install_from_main_branch(io):
         io,
         None,
         "Install the development version of aider from the main branch?",
-        ["git+https://github.com/paul-gauthier/aider.git"],
+        ["git+https://github.com/Aider-AI/aider.git"],
         self_update=True,
     )
 

aider/website/HISTORY.md

@@ -1,20 +1,134 @@
 ---
 title: Release history
 parent: More info
-nav_order: 999
+nav_order: 900
 highlight_image: /assets/blame.jpg
 description: Release notes and stats on aider writing its own code.
 ---
 
+# Release history
+
 {% include blame.md %}
 
+The above 
+[stats are based on the git commit history](/docs/faq.html#how-are-the-aider-wrote-xx-of-code-stats-computed)
+in the aider repo.
+
 <!--[[[cog
 # This page is a copy of HISTORY.md, adding the front matter above.
 text = open("HISTORY.md").read()
+text = text.replace("# Release history", "")
 cog.out(text)
 ]]]-->
 
-# Release history
+
+
+### main branch
+
+- Fixed bug in fuzzy model name matching when litellm provider info is missing.
+- Modified model metadata file loading to allow override of resource file.
+- Allow recursive loading of dirs using `--read`.
+- Updated dependency versions to pick up litellm fix for ollama models.
+- Added exponential backoff retry when writing files to handle editor file locks.
+- Updated Qwen 2.5 Coder 32B model configuration.
+
+### Aider v0.63.1
+
+- Fixed bug in git ignored file handling.
+- Improved error handling for git operations.
+
+### Aider v0.63.0
+
+- Support for Qwen 2.5 Coder 32B.
+- `/web` command just adds the page to the chat, without triggering an LLM response.
+- Improved prompting for the user's preferred chat language.
+- Improved handling of LiteLLM exceptions.
+- Bugfix for double-counting tokens when reporting cache stats.
+- Bugfix for the LLM creating new files.
+- Other small bug fixes.
+- Aider wrote 55% of the code in this release.
+
+### Aider v0.62.0
+
+- Full support for Claude 3.5 Haiku
+  - Scored 75% on [aider's code editing leaderboard](https://aider.chat/docs/leaderboards/).
+  - Almost as good as Sonnet at much lower cost.
+  - Launch with `--haiku` to use it.
+- Easily apply file edits from ChatGPT, Claude or other web apps
+  - Chat with ChatGPT or Claude via their web app. 
+  - Give it your source files and ask for the changes you want.
+  - Use the web app's "copy response" button to copy the entire reply from the LLM.
+  - Run `aider --apply-clipboard-edits file-to-edit.js`.
+  - Aider will edit your file with the LLM's changes.
+- Bugfix for creating new files.
+- Aider wrote 84% of the code in this release.  
+
+### Aider v0.61.0
+
+- Load and save aider slash-commands to files:
+  - `/save <fname>` command will make a file of `/add` and `/read-only` commands that recreate the current file context in the chat.
+  - `/load <fname>` will replay the commands in the file.
+  - You can use `/load` to run any arbitrary set of slash-commands, not just `/add` and `/read-only`.
+  - Use `--load <fname>` to run a list of commands on launch, before the interactive chat begins.
+- Anonymous, opt-in [analytics](https://aider.chat/docs/more/analytics.html) with no personal data sharing.
+- Aider follows litellm's `supports_vision` attribute to enable image support for models.
+- Bugfix for when diff mode flexibly handles the model using the wrong filename.
+- Displays filenames in sorted order for `/add` and `/read-only`.
+- New `--no-fancy-input` switch disables prompt toolkit input, now still available with `--no-pretty`.
+- Override browser config with `--no-browser` or `--no-gui`.
+- Offer to open documentation URLs when errors occur.
+- Properly support all o1 models, regardless of provider.
+- Improved layout of filenames above input prompt.
+- Better handle corrupted repomap tags cache.
+- Improved handling of API errors, especially when accessing the weak model.
+- Aider wrote 68% of the code in this release.
+
+### Aider v0.60.1
+
+- Enable image support for Sonnet 10/22.
+- Display filenames in sorted order.
+
+### Aider v0.60.0
+
+- Full support for Sonnet 10/22, the new SOTA model on aider's code editing benchmark.
+  - Aider uses Sonnet 10/22 by default.
+- Improved formatting of added and read-only files above chat prompt, by @jbellis.
+- Improved support for o1 models by more flexibly parsing their nonconforming code edit replies.
+- Corrected diff edit format prompt that only the first match is replaced.
+- Stronger whole edit format prompt asking for clean file names.
+- Now offers to add `.env` to the `.gitignore` file.
+- Ships with a small model metadata json file to handle models not yet updated in litellm.
+- Model settings for o1 models on azure.
+- Bugfix to properly include URLs in `/help` RAG results.
+- Aider wrote 49% of the code in this release.
+
+### Aider v0.59.1
+
+- Check for obsolete `yes: true` in yaml config, show helpful error.
+- Model settings for openrouter/anthropic/claude-3.5-sonnet:beta
+
+### Aider v0.59.0
+
+- Improvements to `/read-only`:
+  - Now supports shell-style auto-complete of the full file system.
+  - Still auto-completes the full paths of the repo files like `/add`.
+  - Now supports globs like `src/**/*.py`
+- Renamed `--yes` to `--yes-always`.
+  - Now uses `AIDER_YES_ALWAYS` env var and `yes-always:` yaml key.
+  - Existing YAML and .env files will need to be updated.
+  - Can still abbreviate to `--yes` on the command line.
+- Config file now uses standard YAML list syntax with `  - list entries`, one per line.  
+- `/settings` now includes the same announcement lines that would print at launch.
+- Sanity checks the `--editor-model` on launch now, same as main and weak models.
+- Added `--skip-sanity-check-repo` switch to speedup launch in large repos.
+- Bugfix so architect mode handles Control-C properly.
+- Repo-map is deterministic now, with improved caching logic.
+- Improved commit message prompt.
+- Aider wrote 77% of the code in this release.
+
+### Aider v0.58.1
+
+- Fixed bug where cache warming pings caused subsequent user messages to trigger a tight loop of LLM requests.
 
 ### Aider v0.58.0
 
@@ -700,7 +814,7 @@ cog.out(text)
 ### Aider v0.14.0
 
 - [Support for Claude2 and other LLMs via OpenRouter](https://aider.chat/docs/faq.html#accessing-other-llms-with-openrouter) by @joshuavial
-- Documentation for [running the aider benchmarking suite](https://github.com/paul-gauthier/aider/tree/main/benchmark)
+- Documentation for [running the aider benchmarking suite](https://github.com/Aider-AI/aider/tree/main/benchmark)
 - Aider now requires Python >= 3.9
 
 

aider/website/_config.yml

@@ -24,7 +24,7 @@ exclude:
 
 aux_links:
   "GitHub":
-    - "https://github.com/paul-gauthier/aider"
+    - "https://github.com/Aider-AI/aider"
   "Discord":
     - "https://discord.gg/Tv2uQnR88V"
   "Blog":
@@ -32,11 +32,11 @@ aux_links:
 
 nav_external_links:
   - title: "GitHub"
-    url: "https://github.com/paul-gauthier/aider"
+    url: "https://github.com/Aider-AI/aider"
   - title: "Discord"
     url: "https://discord.gg/Tv2uQnR88V"
 
-repository: paul-gauthier/aider
+repository: Aider-AI/aider
 
 callouts:
   tip:

aider/website/_data/architect.yml

@@ -465,3 +465,28 @@
   versions: 0.44.1-dev
   seconds_per_case: 7.8
   total_cost: 0.0916
+
+- dirname: 2024-09-29-22-35-36--architect-o1preview-o1mini-whole
+  test_cases: 133
+  model: o1-preview
+  edit_format: architect
+  commit_hash: 53ca83b
+  editor_model: o1-mini
+  editor_edit_format: whole
+  pass_rate_1: 65.4
+  pass_rate_2: 85.0
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 179
+  lazy_comments: 4
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model o1-preview
+  date: 2024-09-29
+  versions: 0.58.1.dev
+  seconds_per_case: 39.7
+  total_cost: 36.2078

aider/website/_data/blame.yml

@@ -2600,3 +2600,382 @@
     Paul Gauthier (aider): 381
   start_tag: v0.56.0
   total_lines: 563
+- aider_percentage: 53.45
+  aider_total: 712
+  end_date: '2024-09-29'
+  end_tag: v0.58.0
+  file_counts:
+    .github/workflows/docker-build-test.yml:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 11
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/args.py:
+      Paul Gauthier: 8
+      Paul Gauthier (aider): 109
+      Stein Martin Hustad: 17
+      fry69: 2
+    aider/coders/__init__.py:
+      Paul Gauthier: 6
+      Paul Gauthier (aider): 2
+    aider/coders/architect_coder.py:
+      Paul Gauthier: 40
+      Paul Gauthier (aider): 3
+    aider/coders/base_coder.py:
+      Jonathan Ellis: 1
+      Paul Gauthier: 32
+      Paul Gauthier (aider): 8
+    aider/coders/editor_editblock_coder.py:
+      Paul Gauthier: 6
+      Paul Gauthier (aider): 1
+    aider/coders/editor_whole_coder.py:
+      Paul Gauthier: 7
+    aider/coders/wholefile_coder.py:
+      Paul Gauthier: 2
+    aider/commands.py:
+      Jonathan Ellis: 1
+      Mike Bailey: 1
+      Paul Gauthier: 20
+      Paul Gauthier (aider): 78
+      fry69: 2
+    aider/help.py:
+      Paul Gauthier: 27
+      Paul Gauthier (aider): 7
+    aider/history.py:
+      Paul Gauthier: 1
+    aider/io.py:
+      Paul Gauthier: 39
+      Paul Gauthier (aider): 62
+      Stein Martin Hustad: 5
+      fry69: 10
+    aider/linter.py:
+      Paul Gauthier: 6
+    aider/main.py:
+      Paul Gauthier: 13
+      Paul Gauthier (aider): 6
+      Stein Martin Hustad: 4
+      fry69: 1
+      rti: 1
+    aider/models.py:
+      Paul Gauthier: 58
+      Paul Gauthier (aider): 85
+    aider/repo.py:
+      Paul Gauthier: 16
+      Paul Gauthier (aider): 2
+    aider/repomap.py:
+      Paul Gauthier: 5
+    aider/scrape.py:
+      Paul Gauthier (aider): 3
+    aider/sendchat.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 5
+    aider/utils.py:
+      Paul Gauthier: 4
+    aider/versioncheck.py:
+      Paul Gauthier: 2
+    aider/voice.py:
+      Mike Bailey: 17
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 10
+    benchmark/benchmark.py:
+      Paul Gauthier: 25
+      Paul Gauthier (aider): 29
+      fry69: 3
+    scripts/issues.py:
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 45
+    scripts/update-docs.sh:
+      Paul Gauthier: 1
+    scripts/yank-old-versions.py:
+      Paul Gauthier (aider): 51
+    tests/basic/test_commands.py:
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 98
+    tests/basic/test_io.py:
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 97
+    tests/basic/test_main.py:
+      Paul Gauthier: 2
+    tests/basic/test_models.py:
+      Paul Gauthier: 4
+    tests/basic/test_sanity_check_repo.py:
+      fry69: 179
+    tests/basic/test_wholefile.py:
+      Paul Gauthier: 38
+  grand_total:
+    Jonathan Ellis: 2
+    Mike Bailey: 18
+    Paul Gauthier: 376
+    Paul Gauthier (aider): 712
+    Stein Martin Hustad: 26
+    fry69: 197
+    rti: 1
+  start_tag: v0.57.0
+  total_lines: 1332
+- aider_percentage: 76.79
+  aider_total: 172
+  end_date: '2024-10-04'
+  end_tag: v0.59.0
+  file_counts:
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/args.py:
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 6
+    aider/args_formatter.py:
+      Paul Gauthier: 4
+    aider/coders/architect_coder.py:
+      Paul Gauthier: 1
+    aider/coders/base_coder.py:
+      Paul Gauthier: 6
+    aider/coders/editblock_coder.py:
+      Paul Gauthier: 1
+    aider/commands.py:
+      Paul Gauthier: 3
+      Paul Gauthier (aider): 49
+    aider/gui.py:
+      Paul Gauthier: 2
+    aider/main.py:
+      Paul Gauthier: 10
+      Paul Gauthier (aider): 4
+    aider/models.py:
+      Paul Gauthier (aider): 12
+    aider/repomap.py:
+      Paul Gauthier: 9
+      Paul Gauthier (aider): 3
+    aider/urls.py:
+      Paul Gauthier: 2
+    aider/versioncheck.py:
+      Paul Gauthier: 1
+    scripts/issues.py:
+      Paul Gauthier: 1
+    scripts/update-docs.sh:
+      Paul Gauthier: 2
+    tests/basic/test_commands.py:
+      Paul Gauthier: 4
+      Paul Gauthier (aider): 80
+    tests/basic/test_models.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 18
+    tests/basic/test_sanity_check_repo.py:
+      Paul Gauthier: 1
+    tests/help/test_help.py:
+      Paul Gauthier: 1
+  grand_total:
+    Paul Gauthier: 52
+    Paul Gauthier (aider): 172
+  start_tag: v0.58.0
+  total_lines: 224
+- aider_percentage: 49.12
+  aider_total: 140
+  end_date: '2024-10-22'
+  end_tag: v0.60.0
+  file_counts:
+    .github/workflows/close-stale.yml:
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 19
+    .github/workflows/pages.yml:
+      Paul Gauthier: 3
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/args.py:
+      Paul Gauthier: 1
+      fry69: 2
+    aider/coders/base_coder.py:
+      Paul Gauthier: 2
+    aider/coders/editblock_coder.py:
+      Paul Gauthier (aider): 3
+    aider/commands.py:
+      Paul Gauthier: 1
+    aider/help.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 33
+    aider/io.py:
+      Jonathan Ellis: 10
+      Paul Gauthier: 7
+    aider/main.py:
+      Paul Gauthier: 20
+      Paul Gauthier (aider): 39
+    aider/models.py:
+      Paul Gauthier: 18
+      Sven Grunewaldt: 24
+      fry69: 16
+    aider/resources/__init__.py:
+      Paul Gauthier: 3
+    aider/sendchat.py:
+      Paul Gauthier: 3
+    tests/basic/test_editblock.py:
+      Paul Gauthier: 23
+    tests/basic/test_main.py:
+      Paul Gauthier: 1
+    tests/help/test_help.py:
+      Paul Gauthier: 4
+      Paul Gauthier (aider): 46
+  grand_total:
+    Jonathan Ellis: 10
+    Paul Gauthier: 93
+    Paul Gauthier (aider): 140
+    Sven Grunewaldt: 24
+    fry69: 18
+  start_tag: v0.59.0
+  total_lines: 285
+- aider_percentage: 67.61
+  aider_total: 860
+  end_date: '2024-11-01'
+  end_tag: v0.61.0
+  file_counts:
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/analytics.py:
+      Paul Gauthier: 75
+      Paul Gauthier (aider): 89
+    aider/args.py:
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 29
+    aider/coders/base_coder.py:
+      Paul Gauthier: 56
+      Paul Gauthier (aider): 43
+    aider/coders/editblock_coder.py:
+      Paul Gauthier: 14
+    aider/commands.py:
+      Paul Gauthier: 14
+      Paul Gauthier (aider): 86
+    aider/io.py:
+      Paul Gauthier: 12
+      Paul Gauthier (aider): 32
+    aider/linter.py:
+      Paul Gauthier: 6
+    aider/main.py:
+      Paul Gauthier: 48
+      Paul Gauthier (aider): 10
+    aider/models.py:
+      Paul Gauthier: 54
+      Paul Gauthier (aider): 63
+      kAIto47802: 4
+    aider/repomap.py:
+      Paul Gauthier: 12
+      Paul Gauthier (aider): 52
+    aider/sendchat.py:
+      Paul Gauthier: 23
+      Paul Gauthier (aider): 23
+    aider/urls.py:
+      Paul Gauthier: 2
+    aider/utils.py:
+      Paul Gauthier (aider): 6
+    scripts/issues.py:
+      Paul Gauthier (aider): 13
+    scripts/pip-compile.sh:
+      Paul Gauthier (aider): 13
+    scripts/update-docs.sh:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 5
+    tests/basic/test_analytics.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 99
+    tests/basic/test_commands.py:
+      Konstantin L: 34
+      Paul Gauthier: 45
+      Paul Gauthier (aider): 267
+    tests/basic/test_io.py:
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 4
+    tests/basic/test_main.py:
+      Paul Gauthier (aider): 3
+    tests/basic/test_models.py:
+      Paul Gauthier: 3
+      Paul Gauthier (aider): 9
+    tests/basic/test_sanity_check_repo.py:
+      Paul Gauthier (aider): 6
+    tests/basic/test_sendchat.py:
+      Paul Gauthier (aider): 8
+  grand_total:
+    Konstantin L: 34
+    Paul Gauthier: 374
+    Paul Gauthier (aider): 860
+    kAIto47802: 4
+  start_tag: v0.60.0
+  total_lines: 1272
+- aider_percentage: 84.0
+  aider_total: 63
+  end_date: '2024-11-04'
+  end_tag: v0.62.0
+  file_counts:
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/args.py:
+      Paul Gauthier (aider): 14
+    aider/coders/editblock_coder.py:
+      Paul Gauthier: 6
+    aider/main.py:
+      Paul Gauthier (aider): 4
+    aider/models.py:
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 45
+  grand_total:
+    Paul Gauthier: 12
+    Paul Gauthier (aider): 63
+  start_tag: v0.61.0
+  total_lines: 75
+- aider_percentage: 55.16
+  aider_total: 385
+  end_date: '2024-11-13'
+  end_tag: v0.63.0
+  file_counts:
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/coders/architect_coder.py:
+      Paul Gauthier: 3
+    aider/coders/base_coder.py:
+      Paul Gauthier: 42
+      Paul Gauthier (aider): 1
+    aider/coders/editblock_coder.py:
+      Paul Gauthier: 4
+    aider/commands.py:
+      Paul Gauthier: 13
+    aider/exceptions.py:
+      Paul Gauthier: 72
+      Paul Gauthier (aider): 4
+    aider/io.py:
+      Paul Gauthier: 3
+      Paul Gauthier (aider): 23
+    aider/main.py:
+      Paul Gauthier: 9
+      Paul Gauthier (aider): 9
+    aider/models.py:
+      Logan Attwood: 29
+      Paul Gauthier: 50
+      Paul Gauthier (aider): 7
+    aider/repo.py:
+      Paul Gauthier: 7
+    aider/repomap.py:
+      Paul Gauthier: 4
+    aider/sendchat.py:
+      Paul Gauthier: 17
+      Paul Gauthier (aider): 4
+    scripts/issues.py:
+      Paul Gauthier: 4
+      Paul Gauthier (aider): 195
+    tests/basic/test_coder.py:
+      Paul Gauthier: 2
+    tests/basic/test_commands.py:
+      Paul Gauthier (aider): 20
+    tests/basic/test_editblock.py:
+      Paul Gauthier: 41
+    tests/basic/test_exceptions.py:
+      Paul Gauthier (aider): 65
+    tests/basic/test_main.py:
+      Paul Gauthier: 1
+    tests/basic/test_sanity_check_repo.py:
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 2
+    tests/basic/test_sendchat.py:
+      Paul Gauthier: 8
+      Paul Gauthier (aider): 55
+    tests/scrape/test_scrape.py:
+      Paul Gauthier: 1
+  grand_total:
+    Logan Attwood: 29
+    Paul Gauthier: 284
+    Paul Gauthier (aider): 385
+  start_tag: v0.62.0
+  total_lines: 698

aider/website/_data/edit_leaderboard.yml

@@ -20,7 +20,7 @@
   versions: 0.30.2-dev
   seconds_per_case: 32.4
   total_cost: 13.8395
-  
+
 - dirname: 2024-03-06-16-42-00--claude3-sonnet-whole
   test_cases: 133
   model: claude-3-sonnet-20240229
@@ -43,7 +43,7 @@
   versions: 0.25.1-dev
   seconds_per_case: 23.1
   total_cost: 0.0000
-  
+
 - dirname: 2024-05-03-20-47-24--gemini-1.5-pro-diff-fenced
   test_cases: 133
   model: gemini-1.5-pro-latest
@@ -88,7 +88,7 @@
   versions: 0.33.1-dev
   seconds_per_case: 6.5
   total_cost: 0.5032
-  
+
 - dirname: 2023-11-06-21-23-59--gpt-3.5-turbo-0301
   test_cases: 133
   model: gpt-3.5-turbo-0301
@@ -111,7 +111,7 @@
   versions: 0.16.4-dev
   seconds_per_case: 6.5
   total_cost: 0.4822
-  
+
 - dirname: 2023-11-07-02-41-07--gpt-3.5-turbo-0613
   test_cases: 133
   model: gpt-3.5-turbo-0613
@@ -155,7 +155,7 @@
   versions: 0.30.2-dev
   seconds_per_case: 5.3
   total_cost: 0.3261
-  
+
 - dirname: 2024-01-25-23-37-15--jan-exercism-gpt-4-0125-preview-udiff
   test_cases: 133
   model: gpt-4-0125-preview
@@ -178,7 +178,7 @@
   versions: 0.22.1-dev
   seconds_per_case: 44.8
   total_cost: 14.6428
-  
+
 - dirname: 2024-05-04-15-07-30--redo-gpt-4-0314-diff-reminder-rules
   test_cases: 133
   model: gpt-4-0314
@@ -201,7 +201,7 @@
   versions: 0.31.2-dev
   seconds_per_case: 19.8
   total_cost: 16.2689
-  
+
 - dirname: 2023-12-16-21-24-28--editblock-gpt-4-0613-actual-main
   test_cases: 133
   model: gpt-4-0613
@@ -228,7 +228,7 @@
 - dirname: 2024-05-08-21-16-03--may-gpt-4-1106-preview-udiff
   test_cases: 133
   model: gpt-4-1106-preview
-  released: 2023-11-06  
+  released: 2023-11-06
   edit_format: udiff
   commit_hash: 87664dc
   pass_rate_1: 51.9
@@ -247,7 +247,7 @@
   versions: 0.33.1-dev
   seconds_per_case: 20.4
   total_cost: 6.6061
-  
+
 - dirname: 2024-05-01-02-09-20--gpt-4-turbo-examples
   test_cases: 133
   model: gpt-4-turbo-2024-04-09 (udiff)
@@ -270,7 +270,7 @@
   versions: 0.30.2-dev
   seconds_per_case: 22.8
   total_cost: 6.3337
-  
+
 - dirname: 2024-05-03-22-24-48--openrouter--llama3-diff-examples-sys-msg
   test_cases: 132
   model: llama3-70b-8192
@@ -293,7 +293,7 @@
   versions: 0.31.2-dev
   seconds_per_case: 14.5
   total_cost: 0.4311
-  
+
 - dirname: 2024-05-06-18-31-08--command-r-plus-whole-final
   test_cases: 133
   model: command-r-plus
@@ -316,11 +316,11 @@
   versions: 0.31.2-dev
   seconds_per_case: 22.9
   total_cost: 2.7494
-  
+
 - dirname: 2024-05-07-20-32-37--qwen1.5-110b-chat-whole
   test_cases: 133
   model: qwen1.5-110b-chat
-  released: 2024-02-04  
+  released: 2024-02-04
   edit_format: whole
   commit_hash: 70b1c0c
   pass_rate_1: 30.8
@@ -339,7 +339,7 @@
   versions: 0.31.2-dev
   seconds_per_case: 46.9
   total_cost: 0.0000
-  
+
 - dirname: 2024-05-07-20-57-04--wizardlm-2-8x22b-whole
   test_cases: 133
   model: WizardLM-2 8x22B
@@ -384,7 +384,7 @@
   versions: 0.34.1-dev
   seconds_per_case: 6.0
   total_cost: 0.0000
-                                          
+
 - dirname: 2024-04-12-22-18-20--gpt-4-turbo-2024-04-09-plain-diff
   test_cases: 33
   model: gpt-4-turbo-2024-04-09 (diff)
@@ -547,7 +547,7 @@
 
 - dirname: 2024-07-04-14-32-08--claude-3.5-sonnet-diff-continue
   test_cases: 133
-  model: claude-3.5-sonnet
+  model: claude-3.5-sonnet-20240620
   edit_format: diff
   commit_hash: 35f21b5
   pass_rate_1: 57.1
@@ -563,12 +563,12 @@
   indentation_errors: 0
   exhausted_context_windows: 0
   test_timeouts: 1
-  command: aider --sonnet
+  command: aider --model claude-3.5-sonnet-20240620
   date: 2024-07-04
   versions: 0.42.1-dev
   seconds_per_case: 17.6
   total_cost: 3.6346
-    
+
 - dirname: 2024-07-01-21-41-48--haiku-whole
   test_cases: 133
   model: claude-3-haiku-20240307
@@ -832,30 +832,6 @@
   seconds_per_case: 6.5
   total_cost: 0.0000
 
-- dirname: 2024-08-14-13-07-12--chatgpt-4o-latest-diff
-  test_cases: 133
-  model: chatgpt-4o-latest
-  edit_format: diff
-  commit_hash: b1c3769
-  pass_rate_1: 53.4
-  pass_rate_2: 69.2
-  percent_cases_well_formed: 97.7
-  error_outputs: 27
-  num_malformed_responses: 5
-  num_with_malformed_responses: 3
-  user_asks: 7
-  lazy_comments: 0
-  syntax_errors: 0
-  indentation_errors: 0
-  exhausted_context_windows: 0
-  test_timeouts: 0
-  command: aider --model openai/chatgpt-4o-latest
-  date: 2024-08-14
-  released: 2024-08-08
-  versions: 0.50.2-dev
-  seconds_per_case: 26.3
-  total_cost: 3.6113
-
 - dirname: 2024-08-28-07-10-50--gemini-1.5-pro-exp-0827-diff-fenced
   test_cases: 133
   model: gemini-1.5-pro-exp-0827
@@ -1155,7 +1131,7 @@
   versions: 0.56.1.dev
   seconds_per_case: 80.9
   total_cost: 63.9190
-                                            
+
 - dirname: 2024-09-19-16-58-29--qwen2.5-coder:7b-instruct-q8_0
   test_cases: 133
   model: qwen2.5-coder:7b-instruct-q8_0
@@ -1178,7 +1154,7 @@
   versions: 0.56.0
   seconds_per_case: 9.3
   total_cost: 0.0000
-  
+
 - dirname: 2024-09-20-20-20-19--qwen-2.5-72b-instruct-diff
   test_cases: 133
   model: qwen-2.5-72b-instruct (bf16)
@@ -1315,4 +1291,530 @@
   date: 2024-09-28
   versions: 0.57.2.dev
   seconds_per_case: 67.2
-  total_cost: 0.0000
+  total_cost: 0.0000
+
+- dirname: 2024-09-29-17-51-11--codegeex4-whole-2
+  test_cases: 133
+  model: ollama/codegeex4
+  edit_format: whole
+  commit_hash: 228ae24
+  pass_rate_1: 28.6
+  pass_rate_2: 32.3
+  percent_cases_well_formed: 97.0
+  error_outputs: 20
+  num_malformed_responses: 20
+  num_with_malformed_responses: 4
+  user_asks: 56
+  lazy_comments: 5
+  syntax_errors: 5
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 4
+  command: aider --model ollama/codegeex4
+  date: 2024-09-29
+  versions: 0.57.2.dev
+  seconds_per_case: 128.1
+  total_cost: 0.0000
+
+- dirname: 2024-09-30-00-09-00--wojtek-opencodeinterpreter-6.7b-whole-2
+  test_cases: 133
+  model: ollama/wojtek/opencodeinterpreter:6.7b
+  edit_format: whole
+  commit_hash: 6d586fd
+  pass_rate_1: 26.3
+  pass_rate_2: 30.1
+  percent_cases_well_formed: 91.0
+  error_outputs: 18
+  num_malformed_responses: 18
+  num_with_malformed_responses: 12
+  user_asks: 79
+  lazy_comments: 7
+  syntax_errors: 0
+  indentation_errors: 1
+  exhausted_context_windows: 0
+  test_timeouts: 6
+  command: aider --model ollama/wojtek/opencodeinterpreter:6.7b
+  date: 2024-09-30
+  versions: 0.58.1.dev
+  seconds_per_case: 59.3
+  total_cost: 0.0000
+
+- dirname: 2024-09-30-03-49-01--mistral-nemo-12b-instruct-2407-q4_K_M-whole-1
+  test_cases: 133
+  model: ollama/mistral-nemo:12b-instruct-2407-q4_K_M
+  edit_format: whole
+  commit_hash: ba4dec8
+  pass_rate_1: 22.6
+  pass_rate_2: 33.1
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 53
+  lazy_comments: 37
+  syntax_errors: 2
+  indentation_errors: 2
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model ollama/mistral-nemo:12b-instruct-2407-q4_K_M
+  date: 2024-09-30
+  versions: 0.58.1.dev
+  seconds_per_case: 34.7
+  total_cost: 0.0000
+
+- dirname: 2024-09-30-14-09-43--qwen2.5-32b-whole-2
+  test_cases: 133
+  model: ollama/qwen2.5:32b
+  edit_format: whole
+  commit_hash: 765c4cb
+  pass_rate_1: 44.4
+  pass_rate_2: 54.1
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 9
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: aider --model ollama/qwen2.5:32b
+  date: 2024-09-30
+  versions: 0.58.1.dev
+  seconds_per_case: 134.9
+  total_cost: 0.0000
+
+- dirname: 2024-09-30-19-35-40--llama3.2-3b-instruct-fp16-whole-1
+  test_cases: 133
+  model: ollama/llama3.2:3b-instruct-fp16
+  edit_format: whole
+  commit_hash: 3f12290
+  pass_rate_1: 20.3
+  pass_rate_2: 26.3
+  percent_cases_well_formed: 97.0
+  error_outputs: 21
+  num_malformed_responses: 21
+  num_with_malformed_responses: 4
+  user_asks: 73
+  lazy_comments: 11
+  syntax_errors: 1
+  indentation_errors: 3
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model ollama/llama3.2:3b-instruct-fp16
+  date: 2024-09-30
+  versions: 0.58.1.dev
+  seconds_per_case: 66.6
+  total_cost: 0.0000
+
+- dirname: 2024-09-30-23-01-24--hermes3-8b-llama3.1-fp16-whole-2
+  test_cases: 133
+  model: ollama/hermes3:8b-llama3.1-fp16
+  edit_format: whole
+  commit_hash: c5ba4f7
+  pass_rate_1: 24.1
+  pass_rate_2: 30.1
+  percent_cases_well_formed: 98.5
+  syntax_errors: 0
+  exhausted_context_windows: 0
+  command: aider --model ollama/hermes3:8b-llama3.1-fp16
+  date: 2024-09-30
+  versions: 0.58.1.dev
+  seconds_per_case: 64.7
+  total_cost: 0.0000
+
+- dirname: 2024-10-01-02-33-11--mistral-small-whole-1
+  test_cases: 133
+  model: ollama/mistral-small
+  edit_format: whole
+  commit_hash: 8a908fa
+  pass_rate_1: 30.1
+  pass_rate_2: 38.3
+  percent_cases_well_formed: 99.2
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  command: aider --model ollama/mistral-small
+  date: 2024-10-01
+  versions: 0.58.1.dev
+  seconds_per_case: 84.6
+  total_cost: 0.0000
+
+- dirname: 2024-10-01-07-05-40--yi-coder-9b-chat-fp16-whole-1
+  test_cases: 133
+  model: ollama/yi-coder:9b-chat-fp16
+  edit_format: whole
+  commit_hash: 52c6632-dirty
+  pass_rate_1: 39.8
+  pass_rate_2: 43.6
+  percent_cases_well_formed: 99.2
+  lazy_comments: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  command: aider --model ollama/yi-coder:9b-chat-fp16
+  date: 2024-10-01
+  versions: 0.58.1.dev
+  seconds_per_case: 63.7
+  total_cost: 0.0000
+
+- dirname: 2024-10-01-16-50-09--hermes3-whole-4
+  test_cases: 133
+  model: ollama/hermes3
+  edit_format: whole
+  commit_hash: 415e898
+  pass_rate_1: 21.1
+  pass_rate_2: 22.6
+  percent_cases_well_formed: 98.5
+  exhausted_context_windows: 0
+  command: aider --model ollama/hermes3
+  date: 2024-10-01
+  versions: 0.58.1.dev
+  seconds_per_case: 24.8
+  total_cost: 0.0000
+
+- dirname: 2024-10-04-16-30-08--chatgpt-4o-latest-diff-oct4
+  test_cases: 133
+  model: openai/chatgpt-4o-latest
+  edit_format: diff
+  commit_hash: af10953
+  pass_rate_1: 56.4
+  pass_rate_2: 72.2
+  percent_cases_well_formed: 97.0
+  error_outputs: 4
+  num_malformed_responses: 4
+  num_with_malformed_responses: 4
+  user_asks: 21
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model openai/chatgpt-4o-latest
+  date: 2024-10-04
+  versions: 0.58.2.dev
+  seconds_per_case: 23.7
+  total_cost: 4.0641
+
+- dirname: 2024-10-05-20-03-10--dracarys-glhf-whole
+  test_cases: 133
+  model: Dracarys2-72B-Instruct
+  edit_format: whole
+  commit_hash: 04a2cbb
+  pass_rate_1: 55.6
+  pass_rate_2: 66.9
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 1
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 0
+  command: (via glhf.chat)
+  date: 2024-10-05
+  versions: 0.59.2.dev
+  seconds_per_case: 46.7
+  total_cost: 0.0000
+
+- dirname: 2024-10-13-21-33-42--grok2-whole
+  test_cases: 133
+  model: Grok-2
+  edit_format: whole
+  commit_hash: 0a497b7
+  pass_rate_1: 45.9
+  pass_rate_2: 58.6
+  percent_cases_well_formed: 98.5
+  error_outputs: 7
+  num_malformed_responses: 7
+  num_with_malformed_responses: 2
+  user_asks: 24
+  lazy_comments: 4
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model openrouter/x-ai/grok-2
+  date: 2024-10-13
+  versions: 0.59.2.dev
+  seconds_per_case: 34.6
+  total_cost: 0.0000
+
+- dirname: 2024-10-13-23-58-44--grok2mini-whole
+  test_cases: 133
+  model: Grok-2-mini
+  edit_format: whole
+  commit_hash: 0a497b7-dirty, 0a497b7
+  pass_rate_1: 40.6
+  pass_rate_2: 54.9
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 8
+  lazy_comments: 2
+  syntax_errors: 2
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 0
+  command: aider --model openrouter/x-ai/grok-2-mini
+  date: 2024-10-13
+  versions: 0.59.2.dev
+  seconds_per_case: 32.1
+  total_cost: 0.0000
+
+- dirname: 2024-10-16-15-55-37--nemotron-glhf-whole3
+  test_cases: 133
+  model: Llama-3.1-Nemotron-70B-Instruct-HF
+  edit_format: whole
+  commit_hash: 6bb9b25-dirty
+  pass_rate_1: 36.8
+  pass_rate_2: 54.9
+  percent_cases_well_formed: 99.2
+  error_outputs: 17
+  num_malformed_responses: 1
+  num_with_malformed_responses: 1
+  user_asks: 53
+  lazy_comments: 17
+  syntax_errors: 1
+  indentation_errors: 2
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: (via glhf.chat)
+  date: 2024-10-16
+  versions: 0.59.2.dev
+  seconds_per_case: 64.9
+  total_cost: 0.0000
+
+- dirname: 2024-10-22-17-45-28--sonnet-1022-diff-fixed-model-settings
+  test_cases: 133
+  model: claude-3-5-sonnet-20241022
+  edit_format: diff
+  commit_hash: 3b14eb9
+  pass_rate_1: 69.2
+  pass_rate_2: 84.2
+  percent_cases_well_formed: 99.2
+  error_outputs: 1
+  num_malformed_responses: 1
+  num_with_malformed_responses: 1
+  user_asks: 0
+  lazy_comments: 1
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 0
+  command: aider --model anthropic/claude-3-5-sonnet-20241022
+  date: 2024-10-22
+  versions: 0.59.2.dev
+  seconds_per_case: 18.6
+  total_cost: 0.0000
+
+- dirname: 2024-11-04-19-19-32--haiku35-diff-ex-as-sys-false
+  test_cases: 133
+  model: claude-3-5-haiku-20241022
+  edit_format: diff
+  commit_hash: 03bbdb0-dirty
+  pass_rate_1: 61.7
+  pass_rate_2: 75.2
+  percent_cases_well_formed: 95.5
+  error_outputs: 11
+  num_malformed_responses: 11
+  num_with_malformed_responses: 6
+  user_asks: 1
+  lazy_comments: 1
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model anthropic/claude-3-5-haiku-20241022
+  date: 2024-11-04
+  versions: 0.61.1.dev
+  seconds_per_case: 18.4
+  total_cost: 0.0000
+
+- dirname: 2024-11-07-06-15-36--Qwen2.5.1-Coder-7B-Instruct-GGUF:Q8_0-32k-whole
+  test_cases: 133
+  model: ollama/Qwen2.5.1-Coder-7B-Instruct-GGUF:Q8_0-32k
+  edit_format: whole
+  commit_hash: e76704e
+  pass_rate_1: 52.6
+  pass_rate_2: 63.9
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 4
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model ollama/Qwen2.5.1-Coder-7B-Instruct-GGUF:Q8_0-32k
+  date: 2024-11-07
+  versions: 0.59.2.dev
+  seconds_per_case: 18.2
+  total_cost: 0.0000
+
+- dirname: 2024-10-29-00-29-09--Qwen2.5-Coder-0.5B-Instruct
+  test_cases: 133
+  model: Qwen2.5-Coder-0.5B-Instruct
+  edit_format: whole
+  commit_hash: 58bd375
+  pass_rate_1: 14.3
+  pass_rate_2: 14.3
+  percent_cases_well_formed: 100.0
+  error_outputs: 20
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 45
+  lazy_comments: 0
+  syntax_errors: 2
+  indentation_errors: 0
+  exhausted_context_windows: 20
+  test_timeouts: 2
+  command: aider --model openai/Qwen2.5-Coder-0.5B-Instruct
+  date: 2024-10-29
+  versions: 0.59.2.dev
+  seconds_per_case: 16.0
+  total_cost: 0.0000
+
+- dirname: 2024-11-11-19-37-01--Qwen2.5-Coder-1.5B-Instruct
+  test_cases: 133
+  model: Qwen2.5-Coder-1.5B-Instruct
+  edit_format: whole
+  commit_hash: bb5681c
+  pass_rate_1: 28.6
+  pass_rate_2: 31.6
+  percent_cases_well_formed: 100.0
+  error_outputs: 5
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 13
+  lazy_comments: 2
+  syntax_errors: 1
+  indentation_errors: 0
+  exhausted_context_windows: 5
+  test_timeouts: 2
+  command: aider --model openai/Qwen2.5-Coder-1.5B-Instruct
+  date: 2024-11-11
+  versions: 0.59.2.dev
+  seconds_per_case: 27.4
+  total_cost: 0.0000
+
+- dirname: 2024-11-04-02-25-32--Qwen2.5-Coder-3B-Instruct
+  test_cases: 133
+  model: Qwen2.5-Coder-3B-Instruct
+  edit_format: whole
+  commit_hash: 0ba3647
+  pass_rate_1: 33.8
+  pass_rate_2: 39.1
+  percent_cases_well_formed: 100.0
+  error_outputs: 4
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 3
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 4
+  test_timeouts: 6
+  command: aider --model openai/Qwen2.5-Coder-3B-Instruct
+  date: 2024-11-04
+  versions: 0.59.2.dev
+  seconds_per_case: 18.7
+  total_cost: 0.0000
+
+- dirname: 2024-10-16-16-20-59--Qwen2.5-Coder-7B-Instruct
+  test_cases: 133
+  model: Qwen2.5-Coder-7B-Instruct
+  edit_format: whole
+  commit_hash: 92fe979-dirty
+  pass_rate_1: 51.9
+  pass_rate_2: 57.9
+  percent_cases_well_formed: 100.0
+  error_outputs: 2
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 2
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 2
+  test_timeouts: 5
+  command: aider --model openai/Qwen2.5-Coder-7B-Instruct
+  date: 2024-10-16
+  versions: 0.59.2.dev
+  seconds_per_case: 10.5
+  total_cost: 0.0000
+
+- dirname: 2024-10-29-11-53-39--Qwen2.5-Coder-14B-Instruct
+  test_cases: 133
+  model: Qwen2.5-Coder-14B-Instruct
+  edit_format: whole
+  commit_hash: 58bd375
+  pass_rate_1: 58.6
+  pass_rate_2: 69.2
+  percent_cases_well_formed: 100.0
+  error_outputs: 3
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 2
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 3
+  test_timeouts: 0
+  command: aider --model openai/Qwen2.5-Coder-14B-Instruct
+  date: 2024-10-29
+  versions: 0.59.2.dev
+  seconds_per_case: 18.3
+  total_cost: 0.0000
+
+- dirname: 2024-11-09-10-57-11--Qwen2.5-Coder-32B-Instruct
+  test_cases: 133
+  model: Qwen2.5-Coder-32B-Instruct (whole)
+  edit_format: whole
+  commit_hash: ec9982a
+  pass_rate_1: 60.9
+  pass_rate_2: 73.7
+  percent_cases_well_formed: 100.0
+  error_outputs: 1
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 1
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 1
+  test_timeouts: 1
+  command: aider --model openai/Qwen2.5-Coder-32B-Instruct
+  date: 2024-11-09
+  versions: 0.59.2.dev
+  seconds_per_case: 26.6
+  total_cost: 0.0000
+
+- dirname: 2024-11-09-11-09-15--Qwen2.5-Coder-32B-Instruct
+  test_cases: 133
+  model: Qwen2.5-Coder-32B-Instruct (diff)
+  edit_format: diff
+  commit_hash: ec9982a
+  pass_rate_1: 59.4
+  pass_rate_2: 71.4
+  percent_cases_well_formed: 94.7
+  error_outputs: 17
+  num_malformed_responses: 17
+  num_with_malformed_responses: 7
+  user_asks: 1
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: aider --model openai/Qwen2.5-Coder-32B-Instruct
+  date: 2024-11-09
+  versions: 0.59.2.dev
+  seconds_per_case: 22.5
+  total_cost: 0.0000

aider/website/_data/refactor_leaderboard.yml

@@ -145,7 +145,7 @@
 
 - dirname: 2024-07-01-18-30-33--refac-claude-3.5-sonnet-diff-not-lazy
   test_cases: 89
-  model: claude-3.5-sonnet (diff)
+  model: claude-3.5-sonnet-20240620
   edit_format: diff
   commit_hash: 7396e38-dirty
   pass_rate_1: 64.0
@@ -229,4 +229,70 @@
   date: 2024-09-05
   versions: 0.55.1.dev
   seconds_per_case: 225.4
-  total_cost: 1.0338
+  total_cost: 1.0338
+
+- dirname: 2024-10-22-19-57-27--refac-openrouter-sonnet-1022
+  test_cases: 89
+  model: claude-3-5-sonnet-20241022
+  edit_format: diff
+  commit_hash: 4a3e6ef
+  pass_rate_1: 92.1
+  percent_cases_well_formed: 91.0
+  error_outputs: 13
+  num_malformed_responses: 12
+  num_with_malformed_responses: 8
+  user_asks: 14
+  lazy_comments: 2
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 0
+  command: aider --sonnet
+  date: 2024-10-22
+  versions: 0.60.1.dev
+  seconds_per_case: 32.5
+  total_cost: 8.4644
+
+- dirname: 2024-10-22-20-03-10--refac-o1mini
+  test_cases: 89
+  model: o1-mini
+  edit_format: diff
+  commit_hash: 4a3e6ef-dirty
+  pass_rate_1: 44.9
+  percent_cases_well_formed: 29.2
+  error_outputs: 151
+  num_malformed_responses: 150
+  num_with_malformed_responses: 63
+  user_asks: 28
+  lazy_comments: 2
+  syntax_errors: 5
+  indentation_errors: 4
+  exhausted_context_windows: 1
+  test_timeouts: 0
+  command: aider --model o1-mini
+  date: 2024-10-22
+  versions: 0.60.1.dev
+  seconds_per_case: 115.3
+  total_cost: 29.0492
+
+- dirname: 2024-10-22-20-26-36--refac-o1preview
+  test_cases: 89
+  model: o1-preview
+  edit_format: diff
+  commit_hash: 4a3e6ef-dirty
+  pass_rate_1: 75.3
+  percent_cases_well_formed: 57.3
+  error_outputs: 75
+  num_malformed_responses: 74
+  num_with_malformed_responses: 38
+  user_asks: 19
+  lazy_comments: 2
+  syntax_errors: 2
+  indentation_errors: 3
+  exhausted_context_windows: 1
+  test_timeouts: 0
+  command: aider --model o1-preview
+  date: 2024-10-22
+  versions: 0.60.1.dev
+  seconds_per_case: 231.7
+  total_cost: 120.9850

aider/website/_includes/help.md

@@ -1,5 +1,5 @@
 If you need more help, please check our
-[GitHub issues](https://github.com/paul-gauthier/aider/issues)
+[GitHub issues](https://github.com/Aider-AI/aider/issues)
 and file a new issue if your problem isn't discussed.
 Or drop into our
 [Discord](https://discord.gg/Tv2uQnR88V)

aider/website/_includes/multi-line.md

@@ -2,4 +2,4 @@ You can send long, multi-line messages in the chat in a few ways:
   - Paste a multi-line message directly into the chat.
   - Enter `{` alone on the first line to start a multiline message and `}` alone on the last line to end it.
   - Use Meta-ENTER to start a new line without sending the message (Esc+ENTER in some environments).
-  - Use `/clipboard` to paste text from the clipboard into the chat.
+  - Use `/paste` to paste text from the clipboard into the chat.

aider/website/_includes/nav_footer_custom.html

@@ -1,7 +1,7 @@
 <footer class="site-footer">
     Aider is AI pair programming in your terminal.
     Aider is on
-    <a href="https://github.com/paul-gauthier/aider">GitHub</a>
+    <a href="https://github.com/Aider-AI/aider">GitHub</a>
     and
     <a href="https://discord.gg/Tv2uQnR88V">Discord</a>.
 </footer>

aider/website/_posts/2023-10-22-repomap.md

@@ -110,9 +110,9 @@ source code, by including the critical lines of code for each definition.
 
 Here's a
 sample of the map of the aider repo, just showing the maps of
-[base_coder.py](https://github.com/paul-gauthier/aider/blob/main/aider/coders/base_coder.py)
+[base_coder.py](https://github.com/Aider-AI/aider/blob/main/aider/coders/base_coder.py)
 and
-[commands.py](https://github.com/paul-gauthier/aider/blob/main/aider/commands.py)
+[commands.py](https://github.com/Aider-AI/aider/blob/main/aider/commands.py)
 :
 
 ```
@@ -188,7 +188,7 @@ It specifically uses the
 [py-tree-sitter-languages](https://github.com/grantjenks/py-tree-sitter-languages)
 python module,
 which provides simple, pip-installable binary wheels for
-[most popular programming languages](https://github.com/paul-gauthier/grep-ast/blob/main/grep_ast/parsers.py).
+[most popular programming languages](https://github.com/Aider-AI/grep-ast/blob/main/grep_ast/parsers.py).
 
 Tree-sitter parses source code into an Abstract Syntax Tree (AST) based
 on the syntax of the programming language.
@@ -245,7 +245,7 @@ just install [aider](https://aider.chat/docs/install.html).
 ## Credits
 
 Aider uses
-[modified versions of the tags.scm files](https://github.com/paul-gauthier/aider/tree/main/aider/queries)
+[modified versions of the tags.scm files](https://github.com/Aider-AI/aider/tree/main/aider/queries)
 from these
 open source tree-sitter language implementations:
 

aider/website/_posts/2024-03-08-claude-3.md

@@ -30,7 +30,7 @@ aider --opus
 
 ## Aider's code editing benchmark
 
-[Aider](https://github.com/paul-gauthier/aider)
+[Aider](https://github.com/Aider-AI/aider)
 is an open source command line chat tool that lets you
 pair program with AI on code in your local git repo.
 

aider/website/_posts/2024-04-09-gpt-4-turbo.md

@@ -52,7 +52,7 @@ def some_complex_method(foo, bar):
     # ... implement method here ...
 ```
 
-Aider uses a ["laziness" benchmark suite](https://github.com/paul-gauthier/refactor-benchmark)
+Aider uses a ["laziness" benchmark suite](https://github.com/Aider-AI/refactor-benchmark)
 which is designed to both provoke and quantify lazy coding.
 It consists of
 89 python refactoring tasks

aider/website/_posts/2024-05-13-models-over-time.md

@@ -15,7 +15,7 @@ nav_exclude: true
 I recently wanted to draw a graph showing how LLM code editing skill has been
 changing over time as new models have been released by OpenAI, Anthropic and others.
 I have all the
-[data in a yaml file](https://github.com/paul-gauthier/aider/blob/main/website/_data/edit_leaderboard.yml) that is used to render
+[data in a yaml file](https://github.com/Aider-AI/aider/blob/main/website/_data/edit_leaderboard.yml) that is used to render
 [aider's LLM leaderboards](https://aider.chat/docs/leaderboards/).
 
 Below is the aider chat transcript, which shows:

aider/website/_posts/2024-05-22-linting.md

@@ -25,7 +25,7 @@ This increases the ability of the LLM to understand the problem and
 make the correct changes to resolve it.
 
 Aider ships with basic linters built with tree-sitter that support
-[most popular programming languages](https://github.com/paul-gauthier/grep-ast/blob/main/grep_ast/parsers.py).
+[most popular programming languages](https://github.com/Aider-AI/grep-ast/blob/main/grep_ast/parsers.py).
 These built in linters will detect syntax errors and other fatal problems with the code.
 
 You can also configure aider to use your preferred linters.

aider/website/_posts/2024-05-22-swe-bench-lite.md

@@ -76,7 +76,7 @@ The held out "acceptance tests" were *only* used
 after benchmarking to compute statistics on which problems aider
 correctly resolved.
 
-The [full harness to run aider on SWE Bench Lite is available on GitHub](https://github.com/paul-gauthier/aider-swe-bench).
+The [full harness to run aider on SWE Bench Lite is available on GitHub](https://github.com/Aider-AI/aider-swe-bench).
 
 The benchmarking process was similar to how a developer might use aider to
 resolve a GitHub issue:

aider/website/_posts/2024-05-24-self-assembly.md

@@ -12,8 +12,12 @@ nav_exclude: true
 
 [![self assembly](/assets/self-assembly.jpg)](https://aider.chat/assets/self-assembly.jpg)
 
+{: .note }
+This article is quite out dated. For current statistics, see
+[aider's release history](/HISTORY.html).
+
 The
-[aider git repo](https://github.com/paul-gauthier/aider)
+[aider git repo](https://github.com/Aider-AI/aider)
 currently contains about 4K commits and 14K lines of code.
 
 Aider made 15% of the commits, inserting 4.8K and deleting 1.5K lines of code.

aider/website/_posts/2024-06-02-main-swe-bench.md

@@ -64,7 +64,7 @@ with the problem statement
 submitted as the opening chat message from "the user".
 - After that aider ran as normal, except all of aider's
 suggestions were always accepted without user approval.
-- A [simple harness](https://github.com/paul-gauthier/aider-swe-bench#the-aider-agent) was used to retry the SWE Bench problem if aider produced code that wasn't *plausibly correct*.
+- A [simple harness](https://github.com/Aider-AI/aider-swe-bench#the-aider-agent) was used to retry the SWE Bench problem if aider produced code that wasn't *plausibly correct*.
 Plausibly correct means that aider reported that it had successfully edited the repo
 without causing syntax errors or breaking any *pre-existing* tests.
 - If the solution from aider with GPT-4o wasn't plausible, the harness launched aider to try again from scratch using Claude 3 Opus.
@@ -90,7 +90,7 @@ For a detailed discussion of the benchmark
 methodology, see the
 [article about aider's SWE Bench Lite results](https://aider.chat/2024/05/22/swe-bench-lite.html).
 Also, the
-[aider SWE Bench repository on GitHub](https://github.com/paul-gauthier/aider-swe-bench)
+[aider SWE Bench repository on GitHub](https://github.com/Aider-AI/aider-swe-bench)
 contains the harness and statistics code used for the benchmarks.
 
 The benchmarking process was similar to how a developer might use aider to

aider/website/_posts/2024-07-01-sonnet-not-lazy.md

@@ -37,8 +37,8 @@ Users who tested Sonnet with a preview of
 [aider's latest release](https://aider.chat/HISTORY.html#aider-v0410)
 were thrilled:
 
-- *Works like a charm. It is a monster. It refactors files of any size like it is nothing. The continue trick with Sonnet is truly the holy grail. Aider beats [other tools] hands down. I'm going to cancel both subscriptions.* -- [Emasoft](https://github.com/paul-gauthier/aider/issues/705#issuecomment-2200338971)
-- *Thanks heaps for this feature - it's a real game changer. I can be more ambitious when asking Claude for larger features.* -- [cngarrison](https://github.com/paul-gauthier/aider/issues/705#issuecomment-2196026656)
+- *Works like a charm. It is a monster. It refactors files of any size like it is nothing. The continue trick with Sonnet is truly the holy grail. Aider beats [other tools] hands down. I'm going to cancel both subscriptions.* -- [Emasoft](https://github.com/Aider-AI/aider/issues/705#issuecomment-2200338971)
+- *Thanks heaps for this feature - it's a real game changer. I can be more ambitious when asking Claude for larger features.* -- [cngarrison](https://github.com/Aider-AI/aider/issues/705#issuecomment-2196026656)
 - *Fantastic...! It's such an improvement not being constrained by output token length issues. [I refactored] a single JavaScript file into seven smaller files using a single Aider request.* -- [John Galt](https://discord.com/channels/1131200896827654144/1253492379336441907/1256250487934554143)
 
 ## Hitting the 4k token output limit

aider/website/_posts/2024-09-26-architect.md

@@ -19,7 +19,10 @@ Aider now has experimental support for using two models to complete each coding
 Splitting up "code reasoning" and "code editing" in this manner
 has produced SOTA results on
 [aider's code editing benchmark](/docs/benchmarks.html#the-benchmark).
-It also significantly improved the benchmark scores of many
+Using o1-preview as the Architect with either DeepSeek or o1-mini as the
+Editor produced the SOTA score of 85%.
+Using the Architect/Editor approach
+also significantly improved the benchmark scores of many
 models, compared to their previous "solo" baseline scores (striped bars).
 
 <style>
@@ -338,7 +341,7 @@ score for various combinations of Architect and Editor models.
 
 Some noteworthy observations:
 
-- Pairing o1-preview as Architect with Deepseek as Editor sets a SOTA significantly above the previous best score. This result is obtained with Deepseek using the "whole" editing format, requiring it to output a full update copy of each edited source file. Both of these steps are therefore quite slow, so probably not practical for interactive use with aider.
+- Pairing o1-preview as Architect with either Deepseek or o1-mini as Editor sets a SOTA significantly above the previous best score. This result is obtained with the "whole" editing format, requiring the Editor to output a full update copy of each edited source file. Both of these steps are therefore quite slow, so probably not practical for interactive use with aider.
 - Pairing OpenAI's o1-preview with Anthropic's Sonnet as the Editor produces the second best result. This is an entirely practical configuration for users able to work with both providers.
 - Pairing many models with themselves in the Architect/Editor configuration can provide
 significant benefits. 
@@ -404,7 +407,7 @@ this model with aider.
         {% for item in group.items %}
           <tr class="{% if group_class == 1 %}shaded{% endif %}">
             <td>{{ item.model }}</td>
-            <td>{{ item.editor_model | default: "<b>Baseline<b>" }}</td>
+            <td>{% if item.editor_model %}{{ item.editor_model }}{% else %}<b>Baseline</b>{% endif %}</td>
             <td style="text-align: center;">{{ item.editor_edit_format | default: item.edit_format }}</td>
             <td style="text-align: right;">{{ item.pass_rate_2 }}%</td>
           </tr>
@@ -413,5 +416,3 @@ this model with aider.
     </tbody>
   </table>
 </div>
-
-

aider/website/assets/sample.aider.conf.yml

@@ -29,9 +29,12 @@
 ## Use claude-3-opus-20240229 model for the main chat
 #opus: false
 
-## Use claude-3-5-sonnet-20240620 model for the main chat
+## Use claude-3-5-sonnet-20241022 model for the main chat
 #sonnet: false
 
+## Use claude-3-5-haiku-20241022 model for the main chat
+#haiku: false
+
 ## Use gpt-4-0613 model for the main chat
 #4: false
 
@@ -104,7 +107,7 @@
 ## Only work with models that have meta-data available (default: True)
 #show-model-warnings: true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
+## Soft limit on tokens for chat history, after which summarization begins. If unspecified, defaults to the model's max_chat_history_tokens.
 #max-chat-history-tokens: xxx
 
 ## Specify the .env file to load (default: .env in git root)
@@ -236,6 +239,9 @@
 ## Perform a dry run without modifying files (default: False)
 #dry-run: false
 
+## Skip the sanity check for the git repository (default: False)
+#skip-sanity-check-repo: false
+
 ########################
 # Fixing and committing:
 
@@ -245,7 +251,10 @@
 ## Specify lint commands to run for different languages, eg: "python: flake8 --select=..." (can be used multiple times)
 #lint-cmd: xxx
 ## Specify multiple values like this:
-#lint-cmd: [xxx,yyyy,zzz]
+#lint-cmd:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## Enable/disable automatic linting after changes (default: True)
 #auto-lint: true
@@ -259,18 +268,36 @@
 ## Run tests and fix problems found
 #test: false
 
+############
+# Analytics:
+
+## Enable/disable analytics for one session (default: False)
+#analytics: false
+
+## Specify a file to log analytics events
+#analytics-log: xxx
+
+## Permanently disable analytics
+#analytics-disable: false
+
 #################
 # Other Settings:
 
 ## specify a file to edit (can be used multiple times)
 #file: xxx
 ## Specify multiple values like this:
-#file: [xxx,yyyy,zzz]
+#file:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## specify a read-only file (can be used multiple times)
 #read: xxx
 ## Specify multiple values like this:
-#read: [xxx,yyyy,zzz]
+#read:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## Use VI editing mode in the terminal (default: False)
 #vim: false
@@ -296,8 +323,11 @@
 ## Apply the changes from the given file instead of running the chat (debug)
 #apply: xxx
 
+## Apply clipboard contents as edits using the main model's editor format
+#apply-clipboard-edits: false
+
 ## Always say yes to every confirmation
-#yes: false
+#yes-always: false
 
 ## Enable verbose output
 #verbose: false
@@ -317,18 +347,24 @@
 ## Specify a file containing the message to send the LLM, process reply, then exit (disables chat mode)
 #message-file: xxx
 
+## Load and execute /commands from a file on launch
+#load: xxx
+
 ## Specify the encoding for input and output (default: utf-8)
 #encoding: utf-8
 
 ## Specify the config file (default: search for .aider.conf.yml in git root, cwd or home directory)
 #config: xxx
 
-## Run aider in your browser
+## Run aider in your browser (default: False)
 #gui: false
 
 ## Enable/disable suggesting shell commands (default: True)
 #suggest-shell-commands: true
 
+## Enable/disable fancy input with history and completion (default: True)
+#fancy-input: true
+
 #################
 # Voice Settings:
 

aider/website/assets/sample.env

@@ -33,9 +33,12 @@
 ## Use claude-3-opus-20240229 model for the main chat
 #AIDER_OPUS=
 
-## Use claude-3-5-sonnet-20240620 model for the main chat
+## Use claude-3-5-sonnet-20241022 model for the main chat
 #AIDER_SONNET=
 
+## Use claude-3-5-haiku-20241022 model for the main chat
+#AIDER_HAIKU=
+
 ## Use gpt-4-0613 model for the main chat
 #AIDER_4=
 
@@ -108,7 +111,7 @@
 ## Only work with models that have meta-data available (default: True)
 #AIDER_SHOW_MODEL_WARNINGS=true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
+## Soft limit on tokens for chat history, after which summarization begins. If unspecified, defaults to the model's max_chat_history_tokens.
 #AIDER_MAX_CHAT_HISTORY_TOKENS=
 
 ## Specify the .env file to load (default: .env in git root)
@@ -240,6 +243,9 @@
 ## Perform a dry run without modifying files (default: False)
 #AIDER_DRY_RUN=false
 
+## Skip the sanity check for the git repository (default: False)
+#AIDER_SKIP_SANITY_CHECK_REPO=false
+
 ########################
 # Fixing and committing:
 
@@ -261,6 +267,18 @@
 ## Run tests and fix problems found
 #AIDER_TEST=false
 
+############
+# Analytics:
+
+## Enable/disable analytics for one session (default: False)
+#AIDER_ANALYTICS=false
+
+## Specify a file to log analytics events
+#AIDER_ANALYTICS_LOG=
+
+## Permanently disable analytics
+#AIDER_ANALYTICS_DISABLE=false
+
 #################
 # Other Settings:
 
@@ -291,8 +309,11 @@
 ## Apply the changes from the given file instead of running the chat (debug)
 #AIDER_APPLY=
 
+## Apply clipboard contents as edits using the main model's editor format
+#AIDER_APPLY_CLIPBOARD_EDITS=false
+
 ## Always say yes to every confirmation
-#AIDER_YES=
+#AIDER_YES_ALWAYS=
 
 ## Enable verbose output
 #AIDER_VERBOSE=false
@@ -312,15 +333,21 @@
 ## Specify a file containing the message to send the LLM, process reply, then exit (disables chat mode)
 #AIDER_MESSAGE_FILE=
 
+## Load and execute /commands from a file on launch
+#AIDER_LOAD=
+
 ## Specify the encoding for input and output (default: utf-8)
 #AIDER_ENCODING=utf-8
 
-## Run aider in your browser
+## Run aider in your browser (default: False)
 #AIDER_GUI=false
 
 ## Enable/disable suggesting shell commands (default: True)
 #AIDER_SUGGEST_SHELL_COMMANDS=true
 
+## Enable/disable fancy input with history and completion (default: True)
+#AIDER_FANCY_INPUT=true
+
 #################
 # Voice Settings:
 

aider/website/docs/benchmarks-1106.md

@@ -19,7 +19,7 @@ and there's a lot
 of interest about their ability to code compared to the previous versions.
 With that in mind, I've been benchmarking the new models.
 
-[Aider](https://github.com/paul-gauthier/aider)
+[Aider](https://github.com/Aider-AI/aider)
 is an open source command line chat tool that lets you work with GPT to edit
 code in your local git repo.
 To do this, aider needs to be able to reliably recognize when GPT wants to edit

aider/website/docs/benchmarks-speed-1106.md

@@ -20,7 +20,7 @@ and there's a lot
 of interest about their capabilities and performance.
 With that in mind, I've been benchmarking the new models.
 
-[Aider](https://github.com/paul-gauthier/aider)
+[Aider](https://github.com/Aider-AI/aider)
 is an open source command line chat tool that lets you work with GPT to edit
 code in your local git repo.
 Aider relies on a

aider/website/docs/benchmarks.md

@@ -168,7 +168,7 @@ requests:
 ### whole
 
 The
-[whole](https://github.com/paul-gauthier/aider/blob/main/aider/coders/wholefile_prompts.py)
+[whole](https://github.com/Aider-AI/aider/blob/main/aider/coders/wholefile_prompts.py)
 format asks GPT to return an updated copy of the entire file, including any changes.
 The file should be
 formatted with normal markdown triple-backtick fences, inlined with the rest of its response text.
@@ -187,7 +187,7 @@ def main():
 
 ### diff
 
-The [diff](https://github.com/paul-gauthier/aider/blob/main/aider/coders/editblock_prompts.py)
+The [diff](https://github.com/Aider-AI/aider/blob/main/aider/coders/editblock_prompts.py)
 format also asks GPT to return edits as part of the normal response text,
 in a simple diff format.
 Each edit is a fenced code block that
@@ -209,7 +209,7 @@ demo.py
 
 ### whole-func
 
-The [whole-func](https://github.com/paul-gauthier/aider/blob/main/aider/coders/wholefile_func_coder.py)
+The [whole-func](https://github.com/Aider-AI/aider/blob/main/aider/coders/wholefile_func_coder.py)
 format requests updated copies of whole files to be returned using the function call API.
 
 
@@ -227,7 +227,7 @@ format requests updated copies of whole files to be returned using the function
 ### diff-func
 
 The
-[diff-func](https://github.com/paul-gauthier/aider/blob/main/aider/coders/editblock_func_coder.py)
+[diff-func](https://github.com/Aider-AI/aider/blob/main/aider/coders/editblock_func_coder.py)
 format requests a list of
 original/updated style edits to be returned using the function call API.
 

aider/website/docs/config/adv-model-settings.md

@@ -71,7 +71,7 @@ For example, below are all the pre-configured model settings
 to give a sense for the settings which are supported.
 
 You can also look at the `ModelSettings` class in
-[models.py](https://github.com/paul-gauthier/aider/blob/main/aider/models.py)
+[models.py](https://github.com/Aider-AI/aider/blob/main/aider/models.py)
 file for more details about all of the model setting that aider supports.
 
 <!--[[[cog
@@ -81,8 +81,7 @@ cog.out(get_model_settings_as_yaml())
 cog.out("```\n")
 ]]]-->
 ```yaml
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -98,8 +97,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -115,8 +113,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -132,8 +129,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -149,8 +145,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -166,8 +161,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: udiff
   editor_edit_format: null
@@ -183,8 +177,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: udiff
   editor_edit_format: null
@@ -200,8 +193,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -217,8 +209,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -234,8 +225,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -251,8 +241,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -268,8 +257,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -285,8 +273,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -302,8 +289,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: openai/gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: udiff
   editor_edit_format: null
@@ -319,8 +305,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: udiff
   editor_edit_format: null
@@ -336,8 +321,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -353,8 +337,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -370,8 +353,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -387,8 +369,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -404,8 +385,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -420,9 +400,8 @@ cog.out("```\n")
   use_repo_map: true
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: claude-3-haiku-20240307
-- accepts_images: false
-  cache_control: false
+  weak_model_name: claude-3-5-haiku-20241022
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -437,9 +416,8 @@ cog.out("```\n")
   use_repo_map: true
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: openrouter/anthropic/claude-3-haiku
-- accepts_images: false
-  cache_control: false
+  weak_model_name: openrouter/anthropic/claude-3-5-haiku
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -454,9 +432,8 @@ cog.out("```\n")
   use_repo_map: false
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: claude-3-haiku-20240307
-- accepts_images: true
-  cache_control: true
+  weak_model_name: claude-3-5-haiku-20241022
+- cache_control: true
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -474,9 +451,8 @@ cog.out("```\n")
   use_repo_map: true
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: claude-3-haiku-20240307
-- accepts_images: false
-  cache_control: true
+  weak_model_name: claude-3-5-haiku-20241022
+- cache_control: true
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -494,9 +470,84 @@ cog.out("```\n")
   use_repo_map: true
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: claude-3-haiku-20240307
-- accepts_images: false
-  cache_control: true
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: anthropic/claude-3-5-sonnet-20241022
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31
+    max_tokens: 8192
+  lazy: false
+  name: anthropic/claude-3-5-sonnet-20241022
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31
+    max_tokens: 8192
+  lazy: false
+  name: bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: anthropic/claude-3-5-sonnet-20241022
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31
+    max_tokens: 8192
+  lazy: false
+  name: anthropic/claude-3-5-sonnet-latest
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: claude-3-5-sonnet-20241022
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31
+    max_tokens: 8192
+  lazy: false
+  name: claude-3-5-sonnet-20241022
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: claude-3-5-haiku-20241022
+- cache_control: true
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -514,8 +565,78 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: anthropic/claude-3-haiku-20240307
-- accepts_images: false
-  cache_control: true
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: null
+  editor_model_name: null
+  examples_as_sys_msg: false
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31
+  lazy: false
+  name: anthropic/claude-3-5-haiku-20241022
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: null
+  editor_model_name: null
+  examples_as_sys_msg: false
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31
+  lazy: false
+  name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: null
+  editor_model_name: null
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31
+  lazy: false
+  name: claude-3-5-haiku-20241022
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: claude-3-5-haiku-20241022
+- cache_control: false
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: null
+  editor_model_name: null
+  examples_as_sys_msg: false
+  extra_params:
+    max_tokens: 4096
+  lazy: false
+  name: vertex_ai/claude-3-5-haiku@20241022
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+- cache_control: true
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -533,8 +654,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: claude-3-haiku-20240307
-- accepts_images: true
-  cache_control: true
+- cache_control: true
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -550,9 +670,25 @@ cog.out("```\n")
   use_repo_map: true
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: openrouter/anthropic/claude-3-haiku-20240307
-- accepts_images: true
-  cache_control: false
+  weak_model_name: openrouter/anthropic/claude-3-5-haiku
+- cache_control: true
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: openrouter/anthropic/claude-3.5-sonnet:beta
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  lazy: false
+  name: openrouter/anthropic/claude-3.5-sonnet:beta
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: openrouter/anthropic/claude-3-5-haiku:beta
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -568,9 +704,25 @@ cog.out("```\n")
   use_repo_map: true
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: vertex_ai/claude-3-haiku@20240307
-- accepts_images: false
-  cache_control: false
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+- cache_control: false
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: vertex_ai/claude-3-5-sonnet-v2@20241022
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  lazy: false
+  name: vertex_ai/claude-3-5-sonnet-v2@20241022
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -585,9 +737,8 @@ cog.out("```\n")
   use_repo_map: true
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: vertex_ai/claude-3-haiku@20240307
-- accepts_images: false
-  cache_control: false
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -602,9 +753,8 @@ cog.out("```\n")
   use_repo_map: false
   use_system_prompt: true
   use_temperature: true
-  weak_model_name: vertex_ai/claude-3-haiku@20240307
-- accepts_images: false
-  cache_control: false
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -620,8 +770,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: command-r-plus
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -637,8 +786,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: command-r-08-2024
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -654,8 +802,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: command-r-plus-08-2024
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -671,8 +818,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: groq/llama3-8b-8192
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -688,8 +834,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: openrouter/meta-llama/llama-3-70b-instruct
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -705,8 +850,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -722,8 +866,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff-fenced
   editor_edit_format: null
@@ -739,8 +882,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff-fenced
   editor_edit_format: null
@@ -756,8 +898,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff-fenced
   editor_edit_format: null
@@ -773,8 +914,23 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
+  caches_by_default: false
+  edit_format: diff-fenced
+  editor_edit_format: null
+  editor_model_name: null
+  examples_as_sys_msg: false
+  extra_params: null
+  lazy: false
+  name: vertex_ai/gemini-pro-experimental
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: null
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: null
@@ -790,8 +946,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -808,8 +963,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: true
   edit_format: diff
   editor_edit_format: null
@@ -826,8 +980,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -844,8 +997,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: true
   edit_format: diff
   editor_edit_format: null
@@ -862,8 +1014,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: null
@@ -879,8 +1030,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: null
-- accepts_images: true
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -896,8 +1046,7 @@ cog.out("```\n")
   use_system_prompt: true
   use_temperature: true
   weak_model_name: openrouter/openai/gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: editor-diff
@@ -913,8 +1062,23 @@ cog.out("```\n")
   use_system_prompt: false
   use_temperature: false
   weak_model_name: openai/gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
+  caches_by_default: false
+  edit_format: whole
+  editor_edit_format: editor-diff
+  editor_model_name: azure/gpt-4o
+  examples_as_sys_msg: false
+  extra_params: null
+  lazy: false
+  name: azure/o1-mini
+  reminder: user
+  send_undo_reply: false
+  streaming: false
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  weak_model_name: azure/gpt-4o-mini
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: editor-diff
@@ -930,8 +1094,7 @@ cog.out("```\n")
   use_system_prompt: false
   use_temperature: false
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -947,8 +1110,23 @@ cog.out("```\n")
   use_system_prompt: false
   use_temperature: false
   weak_model_name: openai/gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: azure/gpt-4o
+  examples_as_sys_msg: false
+  extra_params: null
+  lazy: false
+  name: azure/o1-preview
+  reminder: user
+  send_undo_reply: false
+  streaming: false
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  weak_model_name: azure/gpt-4o-mini
+- cache_control: false
   caches_by_default: false
   edit_format: architect
   editor_edit_format: editor-diff
@@ -964,8 +1142,7 @@ cog.out("```\n")
   use_system_prompt: false
   use_temperature: false
   weak_model_name: gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: whole
   editor_edit_format: editor-diff
@@ -981,8 +1158,7 @@ cog.out("```\n")
   use_system_prompt: false
   use_temperature: false
   weak_model_name: openrouter/openai/gpt-4o-mini
-- accepts_images: false
-  cache_control: false
+- cache_control: false
   caches_by_default: false
   edit_format: diff
   editor_edit_format: editor-diff
@@ -998,6 +1174,22 @@ cog.out("```\n")
   use_system_prompt: false
   use_temperature: false
   weak_model_name: openrouter/openai/gpt-4o-mini
+- cache_control: false
+  caches_by_default: false
+  edit_format: diff
+  editor_edit_format: editor-diff
+  editor_model_name: openrouter/qwen/qwen-2.5-coder-32b-instruct
+  examples_as_sys_msg: false
+  extra_params: null
+  lazy: false
+  name: openrouter/qwen/qwen-2.5-coder-32b-instruct
+  reminder: user
+  send_undo_reply: false
+  streaming: true
+  use_repo_map: true
+  use_system_prompt: true
+  use_temperature: true
+  weak_model_name: openrouter/qwen/qwen-2.5-coder-32b-instruct
 ```
 <!--[[[end]]]-->
 

aider/website/docs/config/aider_conf.md

@@ -23,8 +23,16 @@ load whichever is found first.
 
 ## A note on lists
 
-The syntax for specifying a list of values is not standard yaml.
-Instead, use this format:
+Lists of values can be specified either as a bulleted list:
+
+```
+read:
+  - CONVENTIONS.md
+  - anotherfile.txt
+  - thirdfile.py
+```
+
+Or lists can be specified using commas and square brackets:
 
 ```
 read: [CONVENTIONS.md, anotherfile.txt, thirdfile.py]
@@ -34,7 +42,7 @@ read: [CONVENTIONS.md, anotherfile.txt, thirdfile.py]
 
 Below is a sample of the YAML config file, which you
 can also
-[download from GitHub](https://github.com/paul-gauthier/aider/blob/main/aider/website/assets/sample.aider.conf.yml).
+[download from GitHub](https://github.com/Aider-AI/aider/blob/main/aider/website/assets/sample.aider.conf.yml).
 
 <!--[[[cog
 from aider.args import get_sample_yaml
@@ -77,9 +85,12 @@ cog.outl("```")
 ## Use claude-3-opus-20240229 model for the main chat
 #opus: false
 
-## Use claude-3-5-sonnet-20240620 model for the main chat
+## Use claude-3-5-sonnet-20241022 model for the main chat
 #sonnet: false
 
+## Use claude-3-5-haiku-20241022 model for the main chat
+#haiku: false
+
 ## Use gpt-4-0613 model for the main chat
 #4: false
 
@@ -152,7 +163,7 @@ cog.outl("```")
 ## Only work with models that have meta-data available (default: True)
 #show-model-warnings: true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
+## Soft limit on tokens for chat history, after which summarization begins. If unspecified, defaults to the model's max_chat_history_tokens.
 #max-chat-history-tokens: xxx
 
 ## Specify the .env file to load (default: .env in git root)
@@ -284,6 +295,9 @@ cog.outl("```")
 ## Perform a dry run without modifying files (default: False)
 #dry-run: false
 
+## Skip the sanity check for the git repository (default: False)
+#skip-sanity-check-repo: false
+
 ########################
 # Fixing and committing:
 
@@ -293,7 +307,10 @@ cog.outl("```")
 ## Specify lint commands to run for different languages, eg: "python: flake8 --select=..." (can be used multiple times)
 #lint-cmd: xxx
 ## Specify multiple values like this:
-#lint-cmd: [xxx,yyyy,zzz]
+#lint-cmd:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## Enable/disable automatic linting after changes (default: True)
 #auto-lint: true
@@ -307,18 +324,36 @@ cog.outl("```")
 ## Run tests and fix problems found
 #test: false
 
+############
+# Analytics:
+
+## Enable/disable analytics for one session (default: False)
+#analytics: false
+
+## Specify a file to log analytics events
+#analytics-log: xxx
+
+## Permanently disable analytics
+#analytics-disable: false
+
 #################
 # Other Settings:
 
 ## specify a file to edit (can be used multiple times)
 #file: xxx
 ## Specify multiple values like this:
-#file: [xxx,yyyy,zzz]
+#file:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## specify a read-only file (can be used multiple times)
 #read: xxx
 ## Specify multiple values like this:
-#read: [xxx,yyyy,zzz]
+#read:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## Use VI editing mode in the terminal (default: False)
 #vim: false
@@ -344,8 +379,11 @@ cog.outl("```")
 ## Apply the changes from the given file instead of running the chat (debug)
 #apply: xxx
 
+## Apply clipboard contents as edits using the main model's editor format
+#apply-clipboard-edits: false
+
 ## Always say yes to every confirmation
-#yes: false
+#yes-always: false
 
 ## Enable verbose output
 #verbose: false
@@ -365,18 +403,24 @@ cog.outl("```")
 ## Specify a file containing the message to send the LLM, process reply, then exit (disables chat mode)
 #message-file: xxx
 
+## Load and execute /commands from a file on launch
+#load: xxx
+
 ## Specify the encoding for input and output (default: utf-8)
 #encoding: utf-8
 
 ## Specify the config file (default: search for .aider.conf.yml in git root, cwd or home directory)
 #config: xxx
 
-## Run aider in your browser
+## Run aider in your browser (default: False)
 #gui: false
 
 ## Enable/disable suggesting shell commands (default: True)
 #suggest-shell-commands: true
 
+## Enable/disable fancy input with history and completion (default: True)
+#fancy-input: true
+
 #################
 # Voice Settings:
 

aider/website/docs/config/dotenv.md

@@ -28,7 +28,7 @@ If the files above exist, they will be loaded in that order. Files loaded last w
 
 Below is a sample `.env` file, which you
 can also
-[download from GitHub](https://github.com/paul-gauthier/aider/blob/main/aider/website/assets/sample.env).
+[download from GitHub](https://github.com/Aider-AI/aider/blob/main/aider/website/assets/sample.env).
 
 <!--[[[cog
 from aider.args import get_sample_dotenv
@@ -75,9 +75,12 @@ cog.outl("```")
 ## Use claude-3-opus-20240229 model for the main chat
 #AIDER_OPUS=
 
-## Use claude-3-5-sonnet-20240620 model for the main chat
+## Use claude-3-5-sonnet-20241022 model for the main chat
 #AIDER_SONNET=
 
+## Use claude-3-5-haiku-20241022 model for the main chat
+#AIDER_HAIKU=
+
 ## Use gpt-4-0613 model for the main chat
 #AIDER_4=
 
@@ -150,7 +153,7 @@ cog.outl("```")
 ## Only work with models that have meta-data available (default: True)
 #AIDER_SHOW_MODEL_WARNINGS=true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
+## Soft limit on tokens for chat history, after which summarization begins. If unspecified, defaults to the model's max_chat_history_tokens.
 #AIDER_MAX_CHAT_HISTORY_TOKENS=
 
 ## Specify the .env file to load (default: .env in git root)
@@ -282,6 +285,9 @@ cog.outl("```")
 ## Perform a dry run without modifying files (default: False)
 #AIDER_DRY_RUN=false
 
+## Skip the sanity check for the git repository (default: False)
+#AIDER_SKIP_SANITY_CHECK_REPO=false
+
 ########################
 # Fixing and committing:
 
@@ -303,6 +309,18 @@ cog.outl("```")
 ## Run tests and fix problems found
 #AIDER_TEST=false
 
+############
+# Analytics:
+
+## Enable/disable analytics for one session (default: False)
+#AIDER_ANALYTICS=false
+
+## Specify a file to log analytics events
+#AIDER_ANALYTICS_LOG=
+
+## Permanently disable analytics
+#AIDER_ANALYTICS_DISABLE=false
+
 #################
 # Other Settings:
 
@@ -333,8 +351,11 @@ cog.outl("```")
 ## Apply the changes from the given file instead of running the chat (debug)
 #AIDER_APPLY=
 
+## Apply clipboard contents as edits using the main model's editor format
+#AIDER_APPLY_CLIPBOARD_EDITS=false
+
 ## Always say yes to every confirmation
-#AIDER_YES=
+#AIDER_YES_ALWAYS=
 
 ## Enable verbose output
 #AIDER_VERBOSE=false
@@ -354,15 +375,21 @@ cog.outl("```")
 ## Specify a file containing the message to send the LLM, process reply, then exit (disables chat mode)
 #AIDER_MESSAGE_FILE=
 
+## Load and execute /commands from a file on launch
+#AIDER_LOAD=
+
 ## Specify the encoding for input and output (default: utf-8)
 #AIDER_ENCODING=utf-8
 
-## Run aider in your browser
+## Run aider in your browser (default: False)
 #AIDER_GUI=false
 
 ## Enable/disable suggesting shell commands (default: True)
 #AIDER_SUGGEST_SHELL_COMMANDS=true
 
+## Enable/disable fancy input with history and completion (default: True)
+#AIDER_FANCY_INPUT=true
+
 #################
 # Voice Settings:
 

aider/website/docs/config/options.md

@@ -26,12 +26,12 @@ cog.out(get_md_help())
 ]]]-->
 ```
 usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
-             [--opus] [--sonnet] [--4] [--4o] [--mini] [--4-turbo]
-             [--35turbo] [--deepseek] [--o1-mini] [--o1-preview]
-             [--list-models] [--openai-api-base] [--openai-api-type]
-             [--openai-api-version] [--openai-api-deployment-id]
-             [--openai-organization-id] [--model-settings-file]
-             [--model-metadata-file]
+             [--opus] [--sonnet] [--haiku] [--4] [--4o] [--mini]
+             [--4-turbo] [--35turbo] [--deepseek] [--o1-mini]
+             [--o1-preview] [--list-models] [--openai-api-base]
+             [--openai-api-type] [--openai-api-version]
+             [--openai-api-deployment-id] [--openai-organization-id]
+             [--model-settings-file] [--model-metadata-file]
              [--verify-ssl | --no-verify-ssl] [--edit-format]
              [--architect] [--weak-model] [--editor-model]
              [--editor-edit-format]
@@ -59,16 +59,21 @@ usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
              [--attribute-commit-message-author | --no-attribute-commit-message-author]
              [--attribute-commit-message-committer | --no-attribute-commit-message-committer]
              [--commit] [--commit-prompt] [--dry-run | --no-dry-run]
-             [--lint] [--lint-cmd] [--auto-lint | --no-auto-lint]
-             [--test-cmd] [--auto-test | --no-auto-test] [--test]
-             [--file] [--read] [--vim] [--chat-language] [--version]
-             [--just-check-update]
+             [--skip-sanity-check-repo] [--lint] [--lint-cmd]
+             [--auto-lint | --no-auto-lint] [--test-cmd]
+             [--auto-test | --no-auto-test] [--test]
+             [--analytics | --no-analytics] [--analytics-log]
+             [--analytics-disable] [--file] [--read] [--vim]
+             [--chat-language] [--version] [--just-check-update]
              [--check-update | --no-check-update]
-             [--install-main-branch] [--upgrade] [--apply] [--yes]
-             [-v] [--show-repo-map] [--show-prompts] [--exit]
-             [--message] [--message-file] [--encoding] [-c] [--gui]
+             [--install-main-branch] [--upgrade] [--apply]
+             [--apply-clipboard-edits] [--yes-always] [-v]
+             [--show-repo-map] [--show-prompts] [--exit] [--message]
+             [--message-file] [--load] [--encoding] [-c]
+             [--gui | --no-gui | --browser | --no-browser]
              [--suggest-shell-commands | --no-suggest-shell-commands]
-             [--voice-format] [--voice-language]
+             [--fancy-input | --no-fancy-input] [--voice-format]
+             [--voice-language]
 
 ```
 
@@ -99,9 +104,13 @@ Use claude-3-opus-20240229 model for the main chat
 Environment variable: `AIDER_OPUS`  
 
 ### `--sonnet`
-Use claude-3-5-sonnet-20240620 model for the main chat  
+Use claude-3-5-sonnet-20241022 model for the main chat  
 Environment variable: `AIDER_SONNET`  
 
+### `--haiku`
+Use claude-3-5-haiku-20241022 model for the main chat  
+Environment variable: `AIDER_HAIKU`  
+
 ### `--4`
 Use gpt-4-0613 model for the main chat  
 Environment variable: `AIDER_4`  
@@ -221,7 +230,7 @@ Aliases:
   - `--no-show-model-warnings`
 
 ### `--max-chat-history-tokens VALUE`
-Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.  
+Soft limit on tokens for chat history, after which summarization begins. If unspecified, defaults to the model's max_chat_history_tokens.  
 Environment variable: `AIDER_MAX_CHAT_HISTORY_TOKENS`  
 
 ### `--env-file ENV_FILE`
@@ -455,6 +464,11 @@ Aliases:
   - `--dry-run`
   - `--no-dry-run`
 
+### `--skip-sanity-check-repo`
+Skip the sanity check for the git repository (default: False)  
+Default: False  
+Environment variable: `AIDER_SKIP_SANITY_CHECK_REPO`  
+
 ## Fixing and committing:
 
 ### `--lint`
@@ -493,6 +507,25 @@ Run tests and fix problems found
 Default: False  
 Environment variable: `AIDER_TEST`  
 
+## Analytics:
+
+### `--analytics`
+Enable/disable analytics for one session (default: False)  
+Default: False  
+Environment variable: `AIDER_ANALYTICS`  
+Aliases:
+  - `--analytics`
+  - `--no-analytics`
+
+### `--analytics-log ANALYTICS_LOG_FILE`
+Specify a file to log analytics events  
+Environment variable: `AIDER_ANALYTICS_LOG`  
+
+### `--analytics-disable`
+Permanently disable analytics  
+Default: False  
+Environment variable: `AIDER_ANALYTICS_DISABLE`  
+
 ## Other Settings:
 
 ### `--file FILE`
@@ -545,9 +578,14 @@ Aliases:
 Apply the changes from the given file instead of running the chat (debug)  
 Environment variable: `AIDER_APPLY`  
 
-### `--yes`
+### `--apply-clipboard-edits`
+Apply clipboard contents as edits using the main model's editor format  
+Default: False  
+Environment variable: `AIDER_APPLY_CLIPBOARD_EDITS`  
+
+### `--yes-always`
 Always say yes to every confirmation  
-Environment variable: `AIDER_YES`  
+Environment variable: `AIDER_YES_ALWAYS`  
 
 ### `--verbose`
 Enable verbose output  
@@ -587,6 +625,10 @@ Aliases:
   - `--message-file MESSAGE_FILE`
   - `-f MESSAGE_FILE`
 
+### `--load LOAD_FILE`
+Load and execute /commands from a file on launch  
+Environment variable: `AIDER_LOAD`  
+
 ### `--encoding VALUE`
 Specify the encoding for input and output (default: utf-8)  
 Default: utf-8  
@@ -599,12 +641,14 @@ Aliases:
   - `--config CONFIG_FILE`
 
 ### `--gui`
-Run aider in your browser  
+Run aider in your browser (default: False)  
 Default: False  
 Environment variable: `AIDER_GUI`  
 Aliases:
   - `--gui`
+  - `--no-gui`
   - `--browser`
+  - `--no-browser`
 
 ### `--suggest-shell-commands`
 Enable/disable suggesting shell commands (default: True)  
@@ -614,6 +658,14 @@ Aliases:
   - `--suggest-shell-commands`
   - `--no-suggest-shell-commands`
 
+### `--fancy-input`
+Enable/disable fancy input with history and completion (default: True)  
+Default: True  
+Environment variable: `AIDER_FANCY_INPUT`  
+Aliases:
+  - `--fancy-input`
+  - `--no-fancy-input`
+
 ## Voice Settings:
 
 ### `--voice-format VOICE_FORMAT`

aider/website/docs/ctags.md

@@ -112,9 +112,9 @@ like functions and methods also include their signatures.
 
 Here's a
 sample of the map of the aider repo, just showing the maps of
-[main.py](https://github.com/paul-gauthier/aider/blob/main/aider/main.py)
+[main.py](https://github.com/Aider-AI/aider/blob/main/aider/main.py)
 and
-[io.py](https://github.com/paul-gauthier/aider/blob/main/aider/io.py)
+[io.py](https://github.com/Aider-AI/aider/blob/main/aider/io.py)
 :
 
 ```

aider/website/docs/faq.md

@@ -30,7 +30,7 @@ current chat to build a compact
 Adding a bunch of files that are mostly irrelevant to the
 task at hand will often distract or confuse the LLM.
 The LLM will give worse coding results, and sometimese even fail to correctly edit files.
-Addings extra files will also increase the token costs on your OpenAI invoice.
+Addings extra files will also increase your token costs.
 
 Again, it's usually best to just add the files to the chat that will need to be modified.
 If you still wish to add lots of files to the chat, you can:
@@ -133,7 +133,7 @@ To run the project locally, follow these steps:
 
 ```
 # Clone the repository
-git clone git@github.com:paul-gauthier/aider.git
+git clone git@github.com:Aider-AI/aider.git
 
 # Navigate to the project directory
 cd aider
@@ -150,7 +150,6 @@ python -m aider
 
 
 
-
 ## Can I change the system prompts that aider uses?
 
 Aider is set up to support different system prompts and edit formats
@@ -191,6 +190,16 @@ You can also refer to the
 [instructions for installing a development version of aider](https://aider.chat/docs/install/optional.html#install-the-development-version-of-aider).
 
 
+## How are the "aider wrote xx% of code" stats computed?
+
+[Aider is tightly integrated with git](/docs/git.html) so all
+one of aider's code changes are committed to the repo with proper attribution.
+The 
+[stats are computed](https://github.com/Aider-AI/aider/blob/main/scripts/blame.py)
+by doing something like `git blame` on the repo,
+and counting up who wrote all the new lines of code in each release.
+Only lines in source code files are counted, not documentation or prompt files.
+
 ## Can I share my aider chat transcript?
 
 Yes, you can now share aider chat logs in a pretty way.
@@ -198,7 +207,7 @@ Yes, you can now share aider chat logs in a pretty way.
 1. Copy the markdown logs you want to share from `.aider.chat.history.md` and make a github gist. Or publish the raw markdown logs on the web any way you'd like.
 
    ```
-   https://gist.github.com/paul-gauthier/2087ab8b64034a078c0a209440ac8be0
+   https://gist.github.com/Aider-AI/2087ab8b64034a078c0a209440ac8be0
    ```
 
 2. Take the gist URL and append it to:
@@ -210,5 +219,26 @@ Yes, you can now share aider chat logs in a pretty way.
 This will give you a URL like this, which shows the chat history like you'd see in a terminal:
 
 ```
-https://aider.chat/share/?mdurl=https://gist.github.com/paul-gauthier/2087ab8b64034a078c0a209440ac8be0
+https://aider.chat/share/?mdurl=https://gist.github.com/Aider-AI/2087ab8b64034a078c0a209440ac8be0
 ```
+
+## Can I edit files myself while aider is running?
+
+Yes. Aider always reads the latest copy of files from the file
+system when you send each message.
+
+While you're waiting for aider's reply to complete, it's probably unwise to
+edit files that you've added to the chat.
+Your edits and aider's edits might conflict.
+
+## What is Aider AI LLC?
+
+Aider AI LLC is the company behind the aider AI coding tool.
+Aider is 
+[open source and available on GitHub](https://github.com/Aider-AI/aider)
+under an 
+[Apache 2.0 license](https://github.com/Aider-AI/aider/blob/main/LICENSE.txt).
+
+
+<div style="height:80vh"></div>
+

aider/website/docs/git.md

@@ -1,6 +1,6 @@
 ---
 parent: More info
-nav_order: 800
+nav_order: 100
 description: Aider is tightly integrated with git.
 ---
 
@@ -22,9 +22,16 @@ This keeps your edits separate from aider's edits, and makes sure you never lose
 
 ## In-chat commands
 
-Aider also allows you to use in-chat commands to `/diff` or `/undo` the last change.
-To do more complex management of your git history, you cat use raw `git` commands,
-either by using `/git` within the chat, or with standard git tools outside of aider.
+Aider also allows you to use 
+[in-chat commands](/docs/usage/commands.html)
+to perform git operations:
+
+- `/diff` will show all the file changes since the last message you sent.
+- `/undo` will undo and discard the last change.
+- `/commit` to commit all dirty changes with a sensible commit message.
+- `/git` will let you run raw git commands to do more complex management of your git history.
+
+You can also manage your git history outside of aider with your preferred git tools.
 
 ## Disabling git integration
 
@@ -36,15 +43,18 @@ While it is not recommended, you can disable aider's use of git in a few ways:
 
 ## Commit messages
 
+Aider sends the `--weak-model` a copy of the diffs and the chat history
+and asks it to produce a commit message.
 By default, aider creates commit messages which follow
 [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
 
 You can customize the
-[commit prompt](https://github.com/paul-gauthier/aider/blob/main/aider/prompts.py#L5)
+[commit prompt](https://github.com/Aider-AI/aider/blob/main/aider/prompts.py#L5)
 with the `--commit-prompt` option.
 You can place that on the command line, or 
 [configure it via a config file or environment variables](https://aider.chat/docs/config.html).
 
+
 ## Commit attribution
 
 Aider marks commits that it either authored or committed.

aider/website/docs/install/install.md

@@ -9,6 +9,10 @@ nav_order: 10
 - TOC
 {:toc}
 
+## Python version
+
+Aider currently works with python 3.9-3.12.
+
 ## Install git
 
 Make sure you have git installed.

aider/website/docs/install/optional.md

@@ -74,15 +74,11 @@ joshuavial also confirmed that aider works inside a VS Code terminal window.
 Aider detects if it is running inside VSCode and turns off pretty/color output,
 since the VSCode terminal doesn't seem to support it well.
 
-[MattFlower](https://github.com/MattFlower) provided a VSCode plugin for aider:
-
-[https://marketplace.visualstudio.com/items?itemName=MattFlower.aider](https://marketplace.visualstudio.com/items?itemName=MattFlower.aider)
-
 ### Other editors
 
 If you are interested in creating an aider plugin for your favorite editor,
 please let me know by opening a
-[GitHub issue](https://github.com/paul-gauthier/aider/issues).
+[GitHub issue](https://github.com/Aider-AI/aider/issues).
 
 
 ## Install the development version of aider 
@@ -91,7 +87,7 @@ If you want the very latest development version of aider
 you can install directly from GitHub:
 
 ```
-python -m pip install --upgrade git+https://github.com/paul-gauthier/aider.git
+python -m pip install --upgrade git+https://github.com/Aider-AI/aider.git
 ```
 
 If you've git cloned the aider repository already, you can install "live" from your local copy. This is mostly useful if you are developing aider and want your current modifications to take effect immediately.

aider/website/docs/languages.md

@@ -1,6 +1,6 @@
 ---
 parent: More info
-nav_order: 900
+nav_order: 200
 description: Aider supports pretty much all popular coding languages.
 ---
 # Supported languages
@@ -33,7 +33,7 @@ then it should be possible to add repo map support.
 To build a repo map, aider needs the `tags.scm` file
 from the given language's tree-sitter grammar.
 If you can find and share that file in a 
-[GitHub issue](https://github.com/paul-gauthier/aider/issues),
+[GitHub issue](https://github.com/Aider-AI/aider/issues),
 then it may be possible to add repo map support.
 
 If aider doesn't support linting, it will be complicated to

aider/website/docs/leaderboards/index.md

@@ -60,13 +60,20 @@ The model also has to successfully apply all its changes to the source file with
 <script>
   document.addEventListener('DOMContentLoaded', function () {
     var ctx = document.getElementById('editChart').getContext('2d');
+    const HIGHTLIGHT_MODEL = 'no no no no';
     var leaderboardData = {
       labels: [],
       datasets: [{
         label: 'Percent completed correctly',
         data: [],
-        backgroundColor: 'rgba(54, 162, 235, 0.2)',
-        borderColor: 'rgba(54, 162, 235, 1)',
+        backgroundColor: function(context) {
+          const label = context.chart.data.labels[context.dataIndex] || '';
+          return (label && label.includes(HIGHTLIGHT_MODEL)) ? 'rgba(255, 99, 132, 0.2)' : 'rgba(54, 162, 235, 0.2)';
+        },
+        borderColor: function(context) {
+          const label = context.chart.data.labels[context.dataIndex] || '';
+          return (label && label.includes(HIGHTLIGHT_MODEL)) ? 'rgba(255, 99, 132, 1)' : 'rgba(54, 162, 235, 1)';
+        },
         borderWidth: 1
       }]
     };
@@ -117,14 +124,9 @@ The model also has to successfully apply all its changes to the source file with
       data: leaderboardData,
       options: {
         scales: {
-          yAxes: [{
-            scaleLabel: {
-              display: true,
-            },
-            ticks: {
-              beginAtZero: true
-            }
-          }]
+          y: {
+            beginAtZero: true
+          }
         }
       }
     });
@@ -150,7 +152,7 @@ The model also has to successfully apply all its changes to the source file with
 
 ## Code refactoring leaderboard
 
-[Aider's refactoring benchmark](https://github.com/paul-gauthier/refactor-benchmark) asks the LLM to refactor 89 large methods from large python classes. This is a more challenging benchmark, which tests the model's ability to output long chunks of code without skipping sections or making mistakes. It was developed to provoke and measure [GPT-4 Turbo's "lazy coding" habit](/2023/12/21/unified-diffs.html).
+[Aider's refactoring benchmark](https://github.com/Aider-AI/refactor-benchmark) asks the LLM to refactor 89 large methods from large python classes. This is a more challenging benchmark, which tests the model's ability to output long chunks of code without skipping sections or making mistakes. It was developed to provoke and measure [GPT-4 Turbo's "lazy coding" habit](/2023/12/21/unified-diffs.html).
 
 The refactoring benchmark requires a large context window to
 work with large source files.
@@ -242,14 +244,9 @@ Therefore, results are available for fewer models.
       data: leaderboardData,
       options: {
         scales: {
-          yAxes: [{
-            scaleLabel: {
-              display: true,
-            },
-            ticks: {
-              beginAtZero: true
-            }
-          }]
+          y: {
+            beginAtZero: true
+          }
         }
       }
     });
@@ -291,10 +288,10 @@ since it is the easiest format for an LLM to use.
 
 Contributions of benchmark results are welcome!
 See the
-[benchmark README](https://github.com/paul-gauthier/aider/blob/main/benchmark/README.md)
+[benchmark README](https://github.com/Aider-AI/aider/blob/main/benchmark/README.md)
 for information on running aider's code editing benchmarks.
 Submit results by opening a PR with edits to the
-[benchmark results data files](https://github.com/paul-gauthier/aider/blob/main/aider/website/_data/).
+[benchmark results data files](https://github.com/Aider-AI/aider/blob/main/aider/website/_data/).
 
 
 <p class="post-date">
@@ -321,6 +318,6 @@ mod_dates = [get_last_modified_date(file) for file in files]
 latest_mod_date = max(mod_dates)
 cog.out(f"{latest_mod_date.strftime('%B %d, %Y.')}")
 ]]]-->
-September 29, 2024.
+November 11, 2024.
 <!--[[[end]]]-->
 </p>

aider/website/docs/legal/contributor-agreement.md

@@ -0,0 +1,111 @@
+
+Individual Contributor License Agreement
+
+Thank you for your interest in Aider AI LLC ("Aider AI").
+To clarify the intellectual property license
+granted with Contributions from any person or entity, Aider AI
+must have on file a signed Contributor License Agreement ("CLA")
+from each Contributor, indicating agreement with the license
+terms below. This agreement is for your protection as a Contributor
+as well as the protection of Aider AI and its users. It does not
+change your rights to use your own Contributions for any other purpose.
+
+Please complete and sign this Agreement. Read this document carefully
+before signing and keep a copy for your records.
+
+You accept and agree to the following terms and conditions for Your
+Contributions (present and future) that you submit to Aider AI.
+Except for the license granted herein to Aider AI and recipients
+of software distributed by Aider AI, You reserve all right, title,
+and interest in and to Your Contributions.
+
+1. Definitions.
+
+    "You" (or "Your") shall mean the copyright owner or legal entity
+    authorized by the copyright owner that is making this Agreement
+    with Aider AI. For legal entities, the entity making a
+    Contribution and all other entities that control, are controlled
+    by, or are under common control with that entity are considered to
+    be a single Contributor. For the purposes of this definition,
+    "control" means (i) the power, direct or indirect, to cause the
+    direction or management of such entity, whether by contract or
+    otherwise, or (ii) ownership of fifty percent (50%) or more of the
+    outstanding shares, or (iii) beneficial ownership of such entity.
+   
+    "Contribution" shall mean any original work of authorship,
+    including any modifications or additions to an existing work, that
+    is intentionally submitted by You to Aider AI for inclusion
+    in, or documentation of, any of the products owned or managed by
+    Aider AI (the "Work"). For the purposes of this definition,
+    "submitted" means any form of electronic, verbal, or written
+    communication sent to Aider AI or its representatives,   
+    including but not limited to communication on electronic mailing
+    lists, source code control systems, and issue tracking systems that
+    are managed by, or on behalf of, Aider AI for the purpose of
+    discussing and improving the Work, but excluding communication that
+    is conspicuously marked or otherwise designated in writing by You
+    as "Not a Contribution."
+   
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this Agreement, You hereby grant to Aider AI and to
+   recipients of software distributed by Aider AI a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare derivative works of,
+   publicly display, publicly perform, sublicense, and distribute Your
+   Contributions and such derivative works.
+   
+3. Grant of Patent License. Subject to the terms and conditions of
+   this Agreement, You hereby grant to Aider AI and to
+   recipients of software distributed by Aider AI a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have
+   made, use, offer to sell, sell, import, and otherwise transfer the
+   Work, where such license applies only to those patent claims
+   licensable by You that are necessarily infringed by Your
+   Contribution(s) alone or by combination of Your Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If any
+   entity institutes patent litigation against You or any other entity
+   (including a cross-claim or counterclaim in a lawsuit) alleging
+   that your Contribution, or the Work to which you have contributed,
+   constitutes direct or contributory patent infringement, then any
+   patent licenses granted to that entity under this Agreement for
+   that Contribution or Work shall terminate as of the date such
+   litigation is filed.
+   
+4. You represent that you are legally entitled to grant the above
+   license. If your employer(s) has rights to intellectual property
+   that you create that includes your Contributions, you represent
+   that you have received permission to make Contributions on behalf
+   of that employer, that your employer has waived such rights for
+   your Contributions to Aider AI, or that your employer has
+   executed a separate Corporate CLA with Aider AI.
+   
+5. You represent that each of Your Contributions is Your original
+   creation (see section 7 for submissions on behalf of others).  You
+   represent that Your Contribution submissions include complete
+   details of any third-party license or other restriction (including,
+   but not limited to, related patents and trademarks) of which you
+   are personally aware and which are associated with any part of Your
+   Contributions.
+   
+6. You are not expected to provide support for Your Contributions,
+   except to the extent You desire to provide support. You may provide
+   support for free, for a fee, or not at all. Unless required by
+   applicable law or agreed to in writing, You provide Your
+   Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+   OF ANY KIND, either express or implied, including, without
+   limitation, any warranties or conditions of TITLE, NON-
+   INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
+   
+7. Should You wish to submit work that is not Your original creation,
+   You may submit it to Aider AI separately from any
+   Contribution, identifying the complete details of its source and of
+   any license or other restriction (including, but not limited to,
+   related patents, trademarks, and license agreements) of which you
+   are personally aware, and conspicuously marking the work as
+   "Submitted on behalf of a third-party: [named here]".
+   
+8. You agree to notify Aider AI of any facts or circumstances of
+   which you become aware that would make these representations
+   inaccurate in any respect.
+   

aider/website/docs/legal/privacy.md

@@ -0,0 +1,104 @@
+---
+parent: More info
+nav_order: 500
+---
+
+# Privacy policy
+
+[Aider AI LLC](/docs/faq.html#what-is-aider-ai-llc)
+(“Aider,” “we,” “our,” and/or “us”) values the privacy of individuals who use our website, programming tools, and related services (collectively, our “Services”). This privacy policy (the “Privacy Policy”) explains how we collect, use, and disclose information from users of our Services. By using our Services, you agree to the collection, use, disclosure, and procedures this Privacy Policy describes. 
+
+### Information We Collect
+
+We may collect a variety of information from or about you or your devices from various sources, as described below.
+
+### A. Information You Provide to Us.
+
+**Communications.** If you contact us directly, we may receive additional information about you, such as your name, email address, the contents of a message or attachments that you may send to us, and other information you choose to provide.
+
+### B. Information We Collect When You Use Our Services. 
+
+**Device Information.** We may receive information about the device and software you use to access our Services, including IP address, device type, device identifiers, web browser type and version, and operating system version.
+
+**Usage Information.** We may automatically receive information about your interactions with our Services, like the pages or other content you view, referrer information (the website you visited before coming to our Services), and the dates and times of your visits.
+
+**Analytics Information.** If you use our programming tools, we may receive information about your interactions with the tools, such as how often certain features or commands are used, information about exceptions and errors, and which large language models are used. This information is associated with a randomly generated identifier, not any directly identifiable user information such as your name or email address. Please see the “Your Choices” section below for information on how to disable the collection of this information.
+
+**Information from Cookies and Other Tracking Technologies.** We and our third-party partners may collect information about your activities on our Services using cookies, pixel tags, SDKs, or other tracking technologies. Our third-party partners, such as analytics and security partners, may also use these technologies to collect information about your online activities over time and across different services. 
+
+
+### How We Use the Information We Collect
+
+We use the information we collect:
+ 
+- To provide, maintain, improve, and enhance our Services;
+- To understand and analyze how you use our Services and develop new products, services, features, and functionality;
+- To communicate with you, provide you with updates and other information relating to our Services, provide information that you request, respond to comments and questions, and otherwise provide customer support;
+- To generate anonymized or aggregate data containing only de-identified, non-personal information that we may use for any lawful purposes such as to publish reports;
+- To find and prevent fraud and abuse, and respond to trust and safety issues that may arise; 
+- For compliance purposes, including enforcing our legal rights, or as may be required by applicable laws and regulations or requested by any judicial process or governmental agency; and
+- For other purposes for which we provide specific notice at the time the information is collected.
+
+### How We Disclose the Information We Collect
+
+**Affiliates.** We may disclose any information we receive to our current or future affiliates for any of the purposes described in this Privacy Policy.  
+
+**Vendors and Service Providers.** We may disclose any information we receive to vendors and service providers retained in connection with the provision of our Services. 
+
+**Analytics Partners.** We may use analytics services to collect and process certain analytics data to improve our Services, such as by improving the ability of our programming tools to work with LLMs, edit code, and complete user requests. 
+
+**As Required By Law and Similar Disclosures.** We may access, preserve, and disclose your information if we believe doing so is required or appropriate to: (a) comply with law enforcement requests and legal process, such as a court order or subpoena; (b) respond to your requests; or (c) protect your, our, or others’ rights, property, or safety. For the avoidance of doubt, the disclosure of your information may occur if you post any objectionable content on or through the Services.
+
+**Merger, Sale, or Other Asset Transfers.** We may transfer your information to service providers, advisors, potential transactional partners, or other third parties in connection with the consideration, negotiation, or completion of a corporate transaction in which we are acquired by or merged with another company or we sell, liquidate, or transfer all or a portion of our assets. The use of your information following any of these events will be governed by the provisions of this Privacy Policy in effect at the time the applicable information was collected.
+
+**Consent.** We may also disclose your information with your permission.
+
+### Your Choices
+
+**Analytics Information.** You can turn off analytics collection when using our programming tools. Please visit this 
+[documentation page](/docs/more/analytics.html)
+for more information about the data collected and your options.
+
+### Third Parties
+
+Our Services may contain links to other websites, products, or services that we do not own or operate. We are not responsible for the privacy practices of these third parties. Please be aware that this Privacy Policy does not apply to your activities on these third-party services or any information you disclose to these third parties. We encourage you to read their privacy policies before providing any information to them.
+
+### Security 
+
+We make reasonable efforts to protect your information by using physical and electronic safeguards designed to improve the security of the information we maintain. However, because no electronic transmission or storage of information can be entirely secure, we can make no guarantees as to the security or privacy of your information.
+
+### Children’s Privacy
+
+We do not knowingly collect, maintain, or use personal information from children under 18 years of age, and no part of our Service(s) is directed to children. If you learn that a child has provided us with personal information in violation of this Privacy Policy, then you may alert us at [INSERT EMAIL ADDRESS].
+
+### International Visitors
+
+Our Services are hosted in the United States and intended for visitors located within the United States. If you choose to use the Services from the European Union or other regions of the world with laws governing data collection and use that may differ from U.S. law, then please note that you are transferring your personal information outside of those regions to the U.S. for storage and processing. We may also transfer your data from the U.S. to other countries or regions in connection with storage and processing of data, fulfilling your requests, and operating the Services. By providing any information, including personal information, on or to the Services, you consent to such transfer, storage, and processing. 
+
+
+### Changes to this Privacy Policy
+
+We will post any adjustments to the Privacy Policy on this page, and the revised version will be effective when it is posted. If we materially change the ways in which we use or disclose personal information previously collected from you through the Services, we will notify you through the Services, by email, or other communication.
+
+### Contact Information
+
+If you have any questions, comments, or concerns about our processing activities, please email us at privacy@aider.chat.
+
+----
+
+<p class="post-date">
+Last updated 
+<!--[[[cog
+import subprocess
+import datetime
+
+result = subprocess.run(['git', 'log', '-1', '--format=%ct', 'aider/website/docs/legal/privacy.md'], capture_output=True, text=True)
+if result.returncode == 0:
+    timestamp = int(result.stdout.strip())
+    date = datetime.datetime.fromtimestamp(timestamp)
+    cog.out(f"{date.strftime('%B %d, %Y.')}")
+]]]-->
+October 31, 2024.
+<!--[[[end]]]-->
+
+</p>

aider/website/docs/llms/bedrock.md

@@ -39,6 +39,14 @@ export AWS_PROFILE=your-profile
 You can add these to your 
 [.env file](/docs/config/dotenv.html).
 
+## Bedrock with `pipx` installation
+
+The AWS Bedrock provider requires the `boto3` package in order to function correctly. To use aider installed via `pipx` with AWS Bedrock, you must add the `boto3` dependency to aider's virtual environment by running
+
+```
+pipx inject aider boto3
+```
+
 
 ## Running Aider with Bedrock
 

aider/website/docs/llms/openai.md

@@ -22,12 +22,18 @@ setx   OPENAI_API_KEY <key> # Windows, restart shell after setx
 # Aider uses gpt-4o by default (or use --4o)
 aider
 
-# GPT-4 Turbo (1106)
-aider --4-turbo
+# GPT-4o
+aider --4o
 
 # GPT-3.5 Turbo
 aider --35-turbo
 
+# o1-mini
+aider --model o1-mini
+
+# o1-preview
+aider --model o1-preview
+
 # List models available from OpenAI
 aider --list-models openai/
 ```

aider/website/docs/llms/other.md

@@ -84,16 +84,17 @@ cog.out(''.join(lines))
 - NVIDIA_NIM_API_KEY
 - OLLAMA_API_KEY
 - OPENAI_API_KEY
+- OPENAI_LIKE_API_KEY
 - OPENROUTER_API_KEY
 - OR_API_KEY
 - PALM_API_KEY
 - PERPLEXITYAI_API_KEY
 - PREDIBASE_API_KEY
 - PROVIDER_API_KEY
-- QDRANT_API_KEY
 - REPLICATE_API_KEY
 - TOGETHERAI_API_KEY
 - VOLCENGINE_API_KEY
 - VOYAGE_API_KEY
+- XAI_API_KEY
 - XINFERENCE_API_KEY
 <!--[[[end]]]-->

aider/website/docs/more/analytics.md

@@ -0,0 +1,110 @@
+---
+parent: More info
+nav_order: 500
+description: Opt-in, anonymous, no personal info.
+---
+
+# Analytics
+
+Aider can collect anonymous analytics to help
+improve aider's ability to work with LLMs, edit code and complete user requests.
+
+## Opt-in, anonymous, no personal info
+
+Analytics are only collected if you agree and opt-in. 
+Aider respects your privacy and never collects your code, chat messages, keys or
+personal info.
+
+Aider collects information on:
+
+- which LLMs are used and with how many tokens,
+- which of aider's edit formats are used,
+- how often features and commands are used,
+- information about exceptions and errors,
+- etc
+
+These analytics are associated with an anonymous,
+randomly generated UUID4 user identifier.
+
+This information helps improve aider by identifying which models, edit formats,
+features and commands are most used.
+It also helps uncover bugs that users are experiencing, so that they can be fixed
+in upcoming releases.
+
+## Enabling & disabling analytics
+
+You can opt out of analytics forever by running this command one time:
+
+```
+aider --analytics-disable
+```
+
+To enable analytics for a single session, you can run aider with `--analytics`.
+This will *not* have any effect if you have permanently disabled analytics with the previous command.
+
+The first time, you will need to agree to opt-in.
+
+```
+aider --analytics
+
+Aider respects your privacy and never collects your code, prompts, chats, keys or any personal
+info.
+For more info: https://aider.chat/docs/more/analytics.html
+Allow collection of anonymous analytics to help improve aider? (Y)es/(N)o [Yes]:
+```
+
+If you've added `analytics: true` to your 
+[yaml config file](/docs/config/aider_conf.html), 
+you can disable analytics for a single session, you can run:
+
+```
+aider --no-analytics
+```
+
+## Details about data being collected
+
+### Sample analytics data
+
+To get a better sense of what type of data is collected, you can review some
+[sample analytics logs](https://github.com/aider-ai/aider/blob/main/aider/website/assets/sample-analytics.jsonl).
+These are the last 1,000 analytics events from the author's
+personal use of aider, updated regularly.
+
+
+### Analytics code
+
+Since aider is open source, all the places where aider collects analytics
+are visible in the source code.
+They can be viewed using 
+[GitHub search](https://github.com/search?q=repo%3Aaider-ai%2Faider+%22.event%28%22&type=code).
+
+
+### Logging and inspecting analytics
+
+You can get a full log of the analytics that aider is collecting,
+in case you would like to audit or inspect this data.
+
+```
+aider --analytics-log filename.jsonl
+```
+
+If you want to just log analytics without reporting them, you can do:
+
+```
+aider --analytics-log filename.jsonl --no-analytics
+```
+
+
+## Reporting issues
+
+If you have concerns about any of the analytics that aider is collecting
+or our data practices
+please contact us by opening a
+[GitHub Issue](https://github.com/aider-ai/aider/issues).
+
+## Privacy policy
+
+Please see aider's
+[privacy policy](/docs/legal/privacy.html)
+for more details.
+

aider/website/docs/more/edit-formats.md

@@ -1,6 +1,6 @@
 ---
 parent: More info
-nav_order: 960
+nav_order: 490
 description: Aider uses various "edit formats" to let LLMs edit source files.
 ---
 
@@ -98,3 +98,9 @@ to reduce their "lazy coding" tendencies with other edit formats.
 +class MathWeb:
 ```
 ````
+
+## editor-diff and editor-whole
+
+These are streamlined versions of the diff and whole formats, intended to be used
+with `--editor-edit-format` when using
+[architect mode](/docs/usage/modes.html).

aider/website/docs/more/infinite-output.md

@@ -0,0 +1,102 @@
+---
+parent: More info
+nav_order: 480
+description: Aider can handle "infinite output" from models that support prefill.
+---
+
+# Infinite output
+
+LLM providers limit how much output a model can generate from a single request.
+This is usually called the output token limit.
+
+Aider is able to work around this limit with models that support
+"prefilling" the assistant response.
+When you use aider with a model that supports prefill, you will see
+"infinite output" noted in the announcement lines displayed at launch:
+
+```
+Aider v0.58.0
+Main model: claude-3-5-sonnet-20240620 with diff edit format, prompt cache, infinite output
+```
+
+Models that support prefill can be primed to think they started their response
+with a specific piece of text.
+You can put words in their mouth, and they will continue generating
+text from that point forward.
+
+When aider is collecting code edits from a model and
+it hits the output token limit,
+aider simply initiates another LLM request with the partial
+response prefilled.
+This prompts the model to continue where it left off,
+generating more of the desired response.
+This prefilling of the partially completed response can be repeated,
+allowing for very long outputs.
+Joining the text across these output limit boundaries 
+requires some heuristics, but is typically fairly reliable.
+
+Aider supports "infinite output" for models that support "prefill",
+such as:
+
+<!--[[[cog
+import requests
+import json
+
+# Fetch the JSON data
+url = "https://raw.githubusercontent.com/BerriAI/litellm/refs/heads/main/model_prices_and_context_window.json"
+response = requests.get(url)
+data = json.loads(response.text)
+
+# Process the JSON to find models with supports_assistant_prefill=true
+prefill_models = [model for model, info in data.items() if info.get('supports_assistant_prefill') == True]
+
+# Generate the list of models
+model_list = "\n".join(f"- {model}" for model in sorted(prefill_models))
+
+cog.out(model_list)
+]]]-->
+- anthropic.claude-3-5-haiku-20241022-v1:0
+- anthropic.claude-3-5-sonnet-20241022-v2:0
+- anthropic/claude-3-5-sonnet-20241022
+- claude-3-5-haiku-20241022
+- claude-3-5-sonnet-20240620
+- claude-3-5-sonnet-20241022
+- claude-3-haiku-20240307
+- claude-3-opus-20240229
+- claude-3-sonnet-20240229
+- codestral/codestral-2405
+- codestral/codestral-latest
+- deepseek-chat
+- deepseek-coder
+- eu.anthropic.claude-3-5-sonnet-20241022-v2:0
+- mistral/codestral-2405
+- mistral/codestral-latest
+- mistral/codestral-mamba-latest
+- mistral/mistral-large-2402
+- mistral/mistral-large-2407
+- mistral/mistral-large-latest
+- mistral/mistral-medium
+- mistral/mistral-medium-2312
+- mistral/mistral-medium-latest
+- mistral/mistral-small
+- mistral/mistral-small-latest
+- mistral/mistral-tiny
+- mistral/open-codestral-mamba
+- mistral/open-mistral-7b
+- mistral/open-mistral-nemo
+- mistral/open-mistral-nemo-2407
+- mistral/open-mixtral-8x22b
+- mistral/open-mixtral-8x7b
+- mistral/pixtral-12b-2409
+- openrouter/anthropic/claude-3.5-sonnet
+- us.anthropic.claude-3-5-haiku-20241022-v1:0
+- us.anthropic.claude-3-5-sonnet-20241022-v2:0
+- vertex_ai/claude-3-5-haiku@20241022
+- vertex_ai/claude-3-5-sonnet-v2@20241022
+- vertex_ai/claude-3-5-sonnet@20240620
+- vertex_ai/claude-3-haiku@20240307
+- vertex_ai/claude-3-opus@20240229
+- vertex_ai/claude-3-sonnet@20240229
+<!--[[[end]]]-->
+
+

aider/website/docs/repomap.md

@@ -1,7 +1,7 @@
 ---
 parent: More info
 highlight_image: /assets/robot-ast.png
-nav_order: 900
+nav_order: 300
 description: Aider uses a map of your git repository to provide code context to LLMs.
 ---
 
@@ -29,9 +29,9 @@ It shows how each of these symbols are defined, by including the critical lines
 
 Here's a part of
 the repo map of aider's repo, for
-[base_coder.py](https://github.com/paul-gauthier/aider/blob/main/aider/coders/base_coder.py)
+[base_coder.py](https://github.com/Aider-AI/aider/blob/main/aider/coders/base_coder.py)
 and
-[commands.py](https://github.com/paul-gauthier/aider/blob/main/aider/commands.py)
+[commands.py](https://github.com/Aider-AI/aider/blob/main/aider/commands.py)
 :
 
 ```

aider/website/docs/scripting.md

@@ -1,6 +1,6 @@
 ---
 parent: More info
-nav_order: 900
+nav_order: 400
 description: You can script aider via the command line or python.
 ---
 
@@ -83,7 +83,7 @@ coder.run("/tokens")
 ```
 
 See the
-[Coder.create() and Coder.__init__() methods](https://github.com/paul-gauthier/aider/blob/main/aider/coders/base_coder.py)
+[Coder.create() and Coder.__init__() methods](https://github.com/Aider-AI/aider/blob/main/aider/coders/base_coder.py)
 for all the supported arguments.
 
 It can also be helpful to set the equivalent of `--yes` by doing this:
@@ -95,3 +95,6 @@ io = InputOutput(yes=True)
 coder = Coder.create(model=model, fnames=fnames, io=io)
 ```
 
+{: .note }
+The scripting API is not officially supported or documented and may
+change without warning.

aider/website/docs/troubleshooting/edit-errors.md

@@ -19,7 +19,19 @@ LLM edits that are "almost" correctly formatted.
 But sometimes the LLM just won't cooperate.
 In these cases, here are some things you might try.
 
-## Use a capable model
+## Don't add too many files
+
+Many LLMs now have very large context windows,
+but filling them with irrelevant code or conversation 
+can confuse the model.
+
+- Don't add too many files to the chat, *just* add the files you think need to be edited.
+Aider also sends the LLM a [map of your entire git repo](https://aider.chat/docs/repomap.html), so other relevant code will be included automatically.
+- Use `/drop` to remove files from the chat session which aren't needed for the task at hand. This will reduce distractions and may help the LLM produce properly formatted edits.
+- Use `/clear` to remove the conversation history, again to help the LLM focus.
+- Use `/tokens` to see how many tokens you are using for each message.
+
+## Use a more capable model
 
 If possible try using GPT-4o, Claude 3.5 Sonnet or Claude 3 Opus, 
 as they are the strongest and most capable models.
@@ -33,9 +45,9 @@ so editing errors are probably unavoidable.
 Local models which have been quantized are even more likely to have problems
 because they are not capable enough to follow aider's system prompts.
 
-## Try the whole format
+## Try the whole edit format
 
-Run aider with `--edit-format whole` if the model is using a different edit format.
+Run aider with `--edit-format whole` if were using a different edit format.
 You can see which edit format it is using in the announce lines:
 
 ```
@@ -43,17 +55,6 @@ Aider v0.50.2-dev
 Models: claude-3-5-sonnet-20240620 with ♾️ diff edit format
 ```
 
-## Reduce distractions
-
-Many LLMs now have very large context windows,
-but filling them with irrelevant code or conversation 
-can confuse the model.
-
-- Don't add too many files to the chat, *just* add the files you think need to be edited.
-Aider also sends the LLM a [map of your entire git repo](https://aider.chat/docs/repomap.html), so other relevant code will be included automatically.
-- Use `/drop` to remove files from the chat session which aren't needed for the task at hand. This will reduce distractions and may help the LLM produce properly formatted edits.
-- Use `/clear` to remove the conversation history, again to help the LLM focus.
-- Use `/tokens` to see how many tokens you are using for each message.
 
 ## More help
 

aider/website/docs/troubleshooting/imports.md

@@ -55,7 +55,7 @@ aider uses.
 
 In particular, be careful with the packages with pinned versions 
 noted at the end of
-[aider's requirements.in file](https://github.com/paul-gauthier/aider/blob/main/requirements/requirements.in).
+[aider's requirements.in file](https://github.com/Aider-AI/aider/blob/main/requirements/requirements.in).
 These versions are pinned because aider is known not to work with the
 latest versions of these libraries.
 

aider/website/docs/troubleshooting/token-limits.md

@@ -68,7 +68,7 @@ To avoid hitting output token limits:
 - Ask for smaller changes in each request.
 - Break your code into smaller source files.
 - Use a strong model like gpt-4o, sonnet or opus that can return diffs.
-
+- Use a model that supports [infinite output](/docs/more/infinite-output.html).
 
 ## Other causes
 

aider/website/docs/unified-diffs.md

@@ -317,7 +317,7 @@ the ones with the most code and which involve refactoring.
 Based on this observation, I set out to build a benchmark based on refactoring
 a non-trivial amount of code found in fairly large files.
 To do this, I used python's `ast` module to analyze
-[9 popular open source python repositories](https://github.com/paul-gauthier/refactor-benchmark)
+[9 popular open source python repositories](https://github.com/Aider-AI/refactor-benchmark)
 to identify challenging refactoring tasks.
 The goal was to find:
 
@@ -332,7 +332,7 @@ where we ask GPT to do something like:
 > Name the new function `_set_csrf_cookie`, exactly the same name as the existing method.
 > Update any existing `self._set_csrf_cookie` calls to work with the new `_set_csrf_cookie` function.
 
-A [simple python AST scanning script](https://github.com/paul-gauthier/aider/blob/main/benchmark/refactor_tools.py)
+A [simple python AST scanning script](https://github.com/Aider-AI/aider/blob/main/benchmark/refactor_tools.py)
 found 89 suitable files
 and packaged them up as benchmark tasks.
 Each task has a test
@@ -351,7 +351,7 @@ gathered during benchmarking like the
 introduction of new comments that contain "...".
 
 The result is a pragmatic
-[benchmark suite that provokes, detects and quantifies GPT coding laziness](https://github.com/paul-gauthier/refactor-benchmark).
+[benchmark suite that provokes, detects and quantifies GPT coding laziness](https://github.com/Aider-AI/refactor-benchmark).
 
 
 

aider/website/docs/usage/commands.md

@@ -28,6 +28,7 @@ cog.out(get_help_md())
 | **/git** | Run a git command (output excluded from chat) |
 | **/help** | Ask questions about aider |
 | **/lint** | Lint and fix in-chat files or all dirty files if none in chat |
+| **/load** | Load and execute commands from a file |
 | **/ls** | List all known files and indicate which are included in the chat session |
 | **/map** | Print out the current repository map |
 | **/map-refresh** | Force a refresh of the repository map |
@@ -39,6 +40,7 @@ cog.out(get_help_md())
 | **/report** | Report a problem by opening a GitHub Issue |
 | **/reset** | Drop all files and clear the chat history |
 | **/run** | Run a shell command and optionally add the output to the chat (alias: !) |
+| **/save** | Save commands to a file that can reconstruct the current chat session's files |
 | **/settings** | Print out the current settings |
 | **/test** | Run a shell command and add the output to the chat on non-zero exit code |
 | **/tokens** | Report on the number of tokens used by the current chat context |
@@ -67,6 +69,8 @@ The interactive prompt is built with [prompt-toolkit](https://github.com/prompt-
 
 ### Emacs
 
+- `Up Arrow` : Scroll back through previously sent messages.
+- `Down Arrow` : Scroll forward through previously sent messages.
 - `Ctrl-A` : Move cursor to the start of the line.
 - `Ctrl-B` : Move cursor back one character.
 - `Ctrl-D` : Delete the character under the cursor.
@@ -83,6 +87,8 @@ The interactive prompt is built with [prompt-toolkit](https://github.com/prompt-
 
 To use vi/vim keybindings, run aider with the `--vim` switch.
 
+- `Up Arrow` : Scroll back through previously sent messages.
+- `Down Arrow` : Scroll forward through previously sent messages.
 - `Esc` : Switch to command mode.
 - `i` : Switch to insert mode.
 - `a` : Move cursor one character to the right and switch to insert mode.

aider/website/docs/usage/modes.md

@@ -58,6 +58,13 @@ at both the architect and the editor.
 Allowing the model two requests to solve the problem and edit the files
 usually provides a better result.
 
+The editor model uses one of aider's edit formats to let the LLM
+edit source files.
+Aider will pick a suitable edit format by default,
+but you can customize it with `--editor-edit-format <format>`.
+The 
+["editor-diff" and "editor-whole" edit formats](/docs/more/edit-formats.html#editor-diff-and-editor-whole)
+are the recommended edit formats when using architect mode.
 See this article on 
 [aider's architect/editor mode](/2024/09/26/architect.html)
 for more details.

aider/website/docs/usage/tutorials.md

@@ -8,6 +8,7 @@ description: Intro and tutorial videos made by aider users.
 
 Here are some tutorial videos made by aider users:
 
+- [Using Architect/Editor mode](https://www.youtube.com/watch?v=OPXslklVBZc) -- AICodeKing
 - [Using aider to incrementally build a non-trivial app](https://youtu.be/QlUt06XLbJE) -- IndyDevDan
 - [Aider and Replit on mobile with your voice](https://x.com/itsPaulAi/status/1830987090617831810) -- Paul Couvert
 - [Aider is the OG AI Coding King (Mermaid Diagram AI Agent)](https://www.youtube.com/watch?v=ag-KxYS8Vuw) -- IndyDevDan

aider/website/index.md

@@ -134,7 +134,7 @@ projects like django, scikitlearn, matplotlib, etc.
 - [Configuration](https://aider.chat/docs/config.html)
 - [Troubleshooting](https://aider.chat/docs/troubleshooting.html)
 - [LLM Leaderboards](https://aider.chat/docs/leaderboards/)
-- [GitHub](https://github.com/paul-gauthier/aider)
+- [GitHub](https://github.com/Aider-AI/aider)
 - [Discord](https://discord.gg/Tv2uQnR88V)
 - [Blog](https://aider.chat/blog/)
 
@@ -145,14 +145,14 @@ projects like django, scikitlearn, matplotlib, etc.
 - *The best AI coding assistant so far.* -- [Matthew Berman](https://www.youtube.com/watch?v=df8afeb1FY8)
 - *Aider ... has easily quadrupled my coding productivity.* -- [SOLAR_FIELDS](https://news.ycombinator.com/item?id=36212100)
 - *It's a cool workflow... Aider's ergonomics are perfect for me.* -- [qup](https://news.ycombinator.com/item?id=38185326)
-- *It's really like having your senior developer live right in your Git repo - truly amazing!* -- [rappster](https://github.com/paul-gauthier/aider/issues/124)
-- *What an amazing tool. It's incredible.* -- [valyagolev](https://github.com/paul-gauthier/aider/issues/6#issue-1722897858)
-- *Aider is such an astounding thing!* -- [cgrothaus](https://github.com/paul-gauthier/aider/issues/82#issuecomment-1631876700)
+- *It's really like having your senior developer live right in your Git repo - truly amazing!* -- [rappster](https://github.com/Aider-AI/aider/issues/124)
+- *What an amazing tool. It's incredible.* -- [valyagolev](https://github.com/Aider-AI/aider/issues/6#issue-1722897858)
+- *Aider is such an astounding thing!* -- [cgrothaus](https://github.com/Aider-AI/aider/issues/82#issuecomment-1631876700)
 - *It was WAY faster than I would be getting off the ground and making the first few working versions.* -- [Daniel Feldman](https://twitter.com/d_feldman/status/1662295077387923456)
 - *THANK YOU for Aider! It really feels like a glimpse into the future of coding.* -- [derwiki](https://news.ycombinator.com/item?id=38205643)
 - *It's just amazing.  It is freeing me to do things I felt were out my comfort zone before.* -- [Dougie](https://discord.com/channels/1131200896827654144/1174002618058678323/1174084556257775656)
-- *This project is stellar.* -- [funkytaco](https://github.com/paul-gauthier/aider/issues/112#issuecomment-1637429008)
-- *Amazing project, definitely the best AI coding assistant I've used.* -- [joshuavial](https://github.com/paul-gauthier/aider/issues/84)
+- *This project is stellar.* -- [funkytaco](https://github.com/Aider-AI/aider/issues/112#issuecomment-1637429008)
+- *Amazing project, definitely the best AI coding assistant I've used.* -- [joshuavial](https://github.com/Aider-AI/aider/issues/84)
 - *I absolutely love using Aider ... It makes software development feel so much lighter as an experience.* -- [principalideal0](https://discord.com/channels/1131200896827654144/1133421607499595858/1229689636012691468)
 - *I have been recovering from multiple shoulder surgeries ... and have used aider extensively. It has allowed me to continue productivity.* -- [codeninja](https://www.reddit.com/r/OpenAI/s/nmNwkHy1zG)
 - *I am an aider addict. I'm getting so much more work done, but in less time.* -- [dandandan](https://discord.com/channels/1131200896827654144/1131200896827654149/1135913253483069470)

benchmark/README.md

@@ -44,7 +44,7 @@ These steps only need to be done once.
 
 ```
 # Clone the aider repo
-git clone git@github.com:paul-gauthier/aider.git
+git clone git@github.com:Aider-AI/aider.git
 
 # Create the scratch dir to hold benchmarking results inside the main aider dir:
 cd aider
@@ -138,13 +138,13 @@ This way the `model`, `edit_format` and `commit_hash`
 should be enough to reliably reproduce any benchmark run.
 
 You can see examples of the benchmark report yaml in the
-[aider leaderboard data files](https://github.com/paul-gauthier/aider/blob/main/aider/website/_data/).
+[aider leaderboard data files](https://github.com/Aider-AI/aider/blob/main/aider/website/_data/).
 
 
 ## Limitations, notes
 
 - Benchmarking all 133 exercises against Claude 3.5 Sonnet will cost about $4.
 - Contributions of benchmark results are welcome! Submit results by opening a PR with edits to the
-[aider leaderboard data files](https://github.com/paul-gauthier/aider/blob/main/aider/website/_data/).
+[aider leaderboard data files](https://github.com/Aider-AI/aider/blob/main/aider/website/_data/).
 - These scripts are not intended for use by typical aider end users.
 - Some of these tools are written as `bash` scripts, so it will be hard to use them on Windows.

pyproject.toml

@@ -24,7 +24,7 @@ requires-python = ">=3.9,<3.13"
 dynamic = ["dependencies", "optional-dependencies", "version"]
 
 [project.urls]
-Homepage = "https://github.com/paul-gauthier/aider"
+Homepage = "https://github.com/Aider-AI/aider"
 
 [project.scripts]
 aider = "aider.main:main"

requirements.txt

@@ -4,15 +4,15 @@
 #
 #    pip-compile --output-file=requirements.txt requirements/requirements.in
 #
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.3
     # via aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.2
     # via litellm
 aiosignal==1.3.1
     # via aiohttp
 annotated-types==0.7.0
     # via pydantic
-anyio==4.6.0
+anyio==4.6.2.post1
     # via
     #   httpx
     #   openai
@@ -22,7 +22,9 @@ attrs==24.2.0
     #   jsonschema
     #   referencing
 backoff==2.2.1
-    # via -r requirements/requirements.in
+    # via
+    #   -r requirements/requirements.in
+    #   posthog
 beautifulsoup4==4.12.3
     # via -r requirements/requirements.in
 certifi==2024.8.30
@@ -34,13 +36,13 @@ cffi==1.17.1
     # via
     #   sounddevice
     #   soundfile
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via requests
 click==8.1.7
     # via litellm
 configargparse==1.7
     # via -r requirements/requirements.in
-diff-match-patch==20230430
+diff-match-patch==20241021
     # via -r requirements/requirements.in
 diskcache==5.6.3
     # via -r requirements/requirements.in
@@ -50,11 +52,11 @@ filelock==3.16.1
     # via huggingface-hub
 flake8==7.1.1
     # via -r requirements/requirements.in
-frozenlist==1.4.1
+frozenlist==1.5.0
     # via
     #   aiohttp
     #   aiosignal
-fsspec==2024.9.0
+fsspec==2024.10.0
     # via huggingface-hub
 gitdb==4.0.11
     # via gitpython
@@ -64,11 +66,11 @@ grep-ast==0.3.3
     # via -r requirements/requirements.in
 h11==0.14.0
     # via httpcore
-httpcore==1.0.5
+httpcore==1.0.6
     # via httpx
 httpx==0.27.2
     # via openai
-huggingface-hub==0.25.0
+huggingface-hub==0.26.2
     # via tokenizers
 idna==3.10
     # via
@@ -84,26 +86,30 @@ importlib-resources==6.4.5
     # via -r requirements/requirements.in
 jinja2==3.1.4
     # via litellm
-jiter==0.5.0
+jiter==0.7.1
     # via openai
-json5==0.9.25
+json5==0.9.28
     # via -r requirements/requirements.in
 jsonschema==4.23.0
     # via
     #   -r requirements/requirements.in
     #   litellm
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via jsonschema
-litellm==1.47.0
+litellm==1.52.8
     # via -r requirements/requirements.in
 markdown-it-py==3.0.0
     # via rich
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via jinja2
 mccabe==0.7.0
     # via flake8
 mdurl==0.1.2
     # via markdown-it-py
+mixpanel==4.10.1
+    # via -r requirements/requirements.in
+monotonic==1.6
+    # via posthog
 multidict==6.1.0
     # via
     #   aiohttp
@@ -114,9 +120,9 @@ numpy==1.26.4
     # via
     #   -r requirements/requirements.in
     #   scipy
-openai==1.47.0
+openai==1.54.4
     # via litellm
-packaging==24.1
+packaging==24.2
     # via
     #   -r requirements/requirements.in
     #   huggingface-hub
@@ -128,9 +134,15 @@ pexpect==4.9.0
     # via -r requirements/requirements.in
 pillow==10.4.0
     # via -r requirements/requirements.in
-prompt-toolkit==3.0.47
+posthog==3.7.0
     # via -r requirements/requirements.in
-psutil==6.0.0
+prompt-toolkit==3.0.48
+    # via -r requirements/requirements.in
+propcache==0.2.0
+    # via
+    #   aiohttp
+    #   yarl
+psutil==6.1.0
     # via -r requirements/requirements.in
 ptyprocess==0.7.0
     # via pexpect
@@ -150,10 +162,12 @@ pyflakes==3.2.0
     # via flake8
 pygments==2.18.0
     # via rich
-pypandoc==1.13
+pypandoc==1.14
     # via -r requirements/requirements.in
 pyperclip==1.9.0
     # via -r requirements/requirements.in
+python-dateutil==2.9.0.post0
+    # via posthog
 python-dotenv==1.0.1
     # via litellm
 pyyaml==6.0.2
@@ -164,21 +178,28 @@ referencing==0.35.1
     # via
     #   jsonschema
     #   jsonschema-specifications
-regex==2024.9.11
+regex==2024.11.6
     # via tiktoken
 requests==2.32.3
     # via
     #   huggingface-hub
     #   litellm
+    #   mixpanel
+    #   posthog
     #   tiktoken
-rich==13.8.1
+rich==13.9.4
     # via -r requirements/requirements.in
-rpds-py==0.20.0
+rpds-py==0.21.0
     # via
     #   jsonschema
     #   referencing
 scipy==1.13.1
     # via -r requirements/requirements.in
+six==1.16.0
+    # via
+    #   mixpanel
+    #   posthog
+    #   python-dateutil
 smmap==5.0.1
     # via gitdb
 sniffio==1.3.1
@@ -186,19 +207,19 @@ sniffio==1.3.1
     #   anyio
     #   httpx
     #   openai
-sounddevice==0.5.0
+sounddevice==0.5.1
     # via -r requirements/requirements.in
 soundfile==0.12.1
     # via -r requirements/requirements.in
 soupsieve==2.6
     # via beautifulsoup4
-tiktoken==0.7.0
+tiktoken==0.8.0
     # via litellm
 tokenizers==0.19.1
     # via
     #   -r requirements/requirements.in
     #   litellm
-tqdm==4.66.5
+tqdm==4.67.0
     # via
     #   huggingface-hub
     #   openai
@@ -215,10 +236,12 @@ typing-extensions==4.12.2
     #   pydantic
     #   pydantic-core
 urllib3==2.2.3
-    # via requests
+    # via
+    #   mixpanel
+    #   requests
 wcwidth==0.2.13
     # via prompt-toolkit
-yarl==1.11.1
+yarl==1.17.1
     # via aiohttp
-zipp==3.20.2
+zipp==3.21.0
     # via importlib-metadata

requirements/requirements-browser.txt

@@ -2,144 +2,212 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements-browser.txt requirements/requirements-browser.in
+#    pip-compile --constraint=requirements.txt --constraint=requirements/requirements-dev.txt --constraint=requirements/requirements-help.txt --output-file=requirements/requirements-browser.txt requirements/requirements-browser.in
 #
 altair==5.4.1
     # via streamlit
 attrs==24.2.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-help.txt
     #   jsonschema
     #   referencing
-blinker==1.8.2
+blinker==1.9.0
     # via streamlit
 cachetools==5.5.0
     # via streamlit
 certifi==2024.8.30
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   requests
 click==8.1.7
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   streamlit
 gitdb==4.0.11
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   gitpython
 gitpython==3.1.43
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   streamlit
 idna==3.10
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   requests
 jinja2==3.1.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   altair
     #   pydeck
 jsonschema==4.23.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   altair
-jsonschema-specifications==2023.12.1
+jsonschema-specifications==2024.10.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   jsonschema
 markdown-it-py==3.0.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   rich
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   jinja2
 mdurl==0.1.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   markdown-it-py
-narwhals==1.8.2
+narwhals==1.13.5
     # via altair
 numpy==1.26.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   pandas
-    #   pyarrow
     #   pydeck
     #   streamlit
-packaging==24.1
+packaging==24.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   altair
     #   streamlit
 pandas==2.2.3
-    # via streamlit
+    # via
+    #   -c requirements/requirements-dev.txt
+    #   streamlit
 pillow==10.4.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   streamlit
-protobuf==5.28.2
+protobuf==5.28.3
     # via streamlit
-pyarrow==17.0.0
+pyarrow==18.0.0
     # via streamlit
 pydeck==0.9.1
     # via streamlit
 pygments==2.18.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   rich
 python-dateutil==2.9.0.post0
-    # via pandas
+    # via
+    #   -c requirements.txt
+    #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   pandas
 pytz==2024.2
-    # via pandas
+    # via
+    #   -c requirements/requirements-dev.txt
+    #   pandas
 referencing==0.35.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   jsonschema
     #   jsonschema-specifications
 requests==2.32.3
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   streamlit
-rich==13.8.1
+rich==13.9.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   streamlit
-rpds-py==0.20.0
+rpds-py==0.21.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   jsonschema
     #   referencing
 six==1.16.0
-    # via python-dateutil
+    # via
+    #   -c requirements.txt
+    #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   python-dateutil
 smmap==5.0.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   gitdb
-streamlit==1.38.0
+streamlit==1.40.1
     # via -r requirements/requirements-browser.in
 tenacity==8.5.0
-    # via streamlit
+    # via
+    #   -c requirements/requirements-help.txt
+    #   streamlit
 toml==0.10.2
     # via streamlit
 tornado==6.4.1
     # via streamlit
 typing-extensions==4.12.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   altair
     #   streamlit
-tzdata==2024.1
-    # via pandas
+tzdata==2024.2
+    # via
+    #   -c requirements/requirements-dev.txt
+    #   pandas
 urllib3==2.2.3
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   requests
 watchdog==4.0.2
     # via -r requirements/requirements-browser.in

requirements/requirements-dev.txt

@@ -2,26 +2,29 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
+#    pip-compile --constraint=requirements.txt --output-file=requirements/requirements-dev.txt requirements/requirements-dev.in
 #
-alabaster==0.7.16
+alabaster==1.0.0
     # via sphinx
 babel==2.16.0
     # via sphinx
-build==1.2.2
+build==1.2.2.post1
     # via pip-tools
 certifi==2024.8.30
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   requests
 cfgv==3.4.0
     # via pre-commit
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   requests
 click==8.1.7
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   pip-tools
     #   typer
@@ -29,30 +32,32 @@ codespell==2.3.0
     # via -r requirements/requirements-dev.in
 cogapp==3.4.1
     # via -r requirements/requirements-dev.in
-contourpy==1.3.0
+contourpy==1.3.1
     # via matplotlib
 cycler==0.12.1
     # via matplotlib
-dill==0.3.8
+dill==0.3.9
     # via
     #   multiprocess
     #   pathos
-distlib==0.3.8
+distlib==0.3.9
     # via virtualenv
-docutils==0.20.1
+docutils==0.21.2
     # via
     #   sphinx
     #   sphinx-rtd-theme
 filelock==3.16.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   virtualenv
-fonttools==4.53.1
+fonttools==4.55.0
     # via matplotlib
-identify==2.6.1
+identify==2.6.2
     # via pre-commit
 idna==3.10
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   requests
 imagesize==1.4.1
@@ -63,6 +68,7 @@ iniconfig==2.0.0
     # via pytest
 jinja2==3.1.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   sphinx
 kiwisolver==1.4.7
@@ -71,30 +77,35 @@ lox==0.12.0
     # via -r requirements/requirements-dev.in
 markdown-it-py==3.0.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   rich
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   jinja2
 matplotlib==3.9.2
     # via -r requirements/requirements-dev.in
 mdurl==0.1.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   markdown-it-py
-multiprocess==0.70.16
+multiprocess==0.70.17
     # via pathos
 nodeenv==1.9.1
     # via pre-commit
 numpy==1.26.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   contourpy
     #   matplotlib
     #   pandas
-packaging==24.1
+packaging==24.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   build
     #   matplotlib
@@ -102,10 +113,11 @@ packaging==24.1
     #   sphinx
 pandas==2.2.3
     # via -r requirements/requirements-dev.in
-pathos==0.3.2
+pathos==0.3.3
     # via lox
 pillow==10.4.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   matplotlib
 pip-tools==7.4.1
@@ -114,20 +126,21 @@ platformdirs==4.3.6
     # via virtualenv
 pluggy==1.5.0
     # via pytest
-pox==0.3.4
+pox==0.3.5
     # via pathos
-ppft==1.7.6.8
+ppft==1.7.6.9
     # via pathos
-pre-commit==3.8.0
+pre-commit==4.0.1
     # via -r requirements/requirements-dev.in
 pygments==2.18.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   rich
     #   sphinx
-pyparsing==3.1.4
+pyparsing==3.2.0
     # via matplotlib
-pyproject-hooks==1.1.0
+pyproject-hooks==1.2.0
     # via
     #   build
     #   pip-tools
@@ -135,20 +148,25 @@ pytest==8.3.3
     # via -r requirements/requirements-dev.in
 python-dateutil==2.9.0.post0
     # via
+    #   -c requirements.txt
+    #   -c requirements/../requirements.txt
     #   matplotlib
     #   pandas
 pytz==2024.2
     # via pandas
 pyyaml==6.0.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   pre-commit
 requests==2.32.3
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   sphinx
-rich==13.8.1
+rich==13.9.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   typer
 semver==3.0.2
@@ -156,14 +174,17 @@ semver==3.0.2
 shellingham==1.5.4
     # via typer
 six==1.16.0
-    # via python-dateutil
+    # via
+    #   -c requirements.txt
+    #   -c requirements/../requirements.txt
+    #   python-dateutil
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==7.4.7
+sphinx==8.1.3
     # via
     #   sphinx-rtd-theme
     #   sphinxcontrib-jquery
-sphinx-rtd-theme==2.0.0
+sphinx-rtd-theme==3.0.2
     # via lox
 sphinxcontrib-applehelp==2.0.0
     # via sphinx
@@ -179,21 +200,23 @@ sphinxcontrib-qthelp==2.0.0
     # via sphinx
 sphinxcontrib-serializinghtml==2.0.0
     # via sphinx
-typer==0.12.5
+typer==0.13.0
     # via -r requirements/requirements-dev.in
 typing-extensions==4.12.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   typer
-tzdata==2024.1
+tzdata==2024.2
     # via pandas
 urllib3==2.2.3
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   requests
-virtualenv==20.26.5
+virtualenv==20.27.1
     # via pre-commit
-wheel==0.44.0
+wheel==0.45.0
     # via pip-tools
 
 # The following packages are considered to be unsafe in a requirements file:

requirements/requirements-help.txt

@@ -2,46 +2,58 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements-help.txt requirements/requirements-help.in
+#    pip-compile --constraint=requirements.txt --constraint=requirements/requirements-dev.txt --output-file=requirements/requirements-help.txt requirements/requirements-help.in
 #
-aiohappyeyeballs==2.4.0
+aiohappyeyeballs==2.4.3
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   aiohttp
-aiohttp==3.10.5
+aiohttp==3.11.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   huggingface-hub
     #   llama-index-core
 aiosignal==1.3.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   aiohttp
 annotated-types==0.7.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   pydantic
-anyio==4.6.0
+anyio==4.6.2.post1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   httpx
 attrs==24.2.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   aiohttp
 certifi==2024.8.30
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   httpcore
     #   httpx
     #   requests
-charset-normalizer==3.3.2
+charset-normalizer==3.4.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   requests
 click==8.1.7
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   nltk
 dataclasses-json==0.6.7
     # via llama-index-core
@@ -51,17 +63,23 @@ dirtyjson==1.0.8
     # via llama-index-core
 filelock==3.16.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   huggingface-hub
     #   torch
     #   transformers
-frozenlist==1.4.1
+filetype==1.2.0
+    # via llama-index-core
+frozenlist==1.5.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   aiohttp
     #   aiosignal
-fsspec==2024.9.0
+fsspec==2024.10.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   huggingface-hub
     #   llama-index-core
@@ -72,18 +90,22 @@ greenlet==3.0.3
     #   sqlalchemy
 h11==0.14.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   httpcore
-httpcore==1.0.5
+httpcore==1.0.6
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   httpx
 httpx==0.27.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   llama-index-core
-huggingface-hub[inference]==0.25.0
+huggingface-hub[inference]==0.26.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   llama-index-embeddings-huggingface
     #   sentence-transformers
@@ -91,37 +113,42 @@ huggingface-hub[inference]==0.25.0
     #   transformers
 idna==3.10
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   anyio
     #   httpx
     #   requests
     #   yarl
 jinja2==3.1.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   torch
 joblib==1.4.2
     # via
     #   nltk
     #   scikit-learn
-llama-index-core==0.11.11
+llama-index-core==0.11.23
     # via
     #   -r requirements/requirements-help.in
     #   llama-index-embeddings-huggingface
 llama-index-embeddings-huggingface==0.3.1
     # via -r requirements/requirements-help.in
-markupsafe==2.1.5
+markupsafe==3.0.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   jinja2
-marshmallow==3.22.0
+marshmallow==3.23.1
     # via dataclasses-json
-minijinja==2.2.0
-    # via huggingface-hub
 mpmath==1.3.0
     # via sympy
 multidict==6.1.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   aiohttp
     #   yarl
@@ -131,6 +158,7 @@ nest-asyncio==1.6.0
     # via llama-index-core
 networkx==3.2.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   llama-index-core
     #   torch
@@ -138,45 +166,64 @@ nltk==3.9.1
     # via llama-index-core
 numpy==1.26.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   llama-index-core
     #   scikit-learn
     #   scipy
     #   transformers
-packaging==24.1
+packaging==24.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   huggingface-hub
     #   marshmallow
     #   transformers
 pillow==10.4.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   llama-index-core
     #   sentence-transformers
+propcache==0.2.0
+    # via
+    #   -c requirements.txt
+    #   -c requirements/../requirements.txt
+    #   aiohttp
+    #   yarl
 pydantic==2.9.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   llama-index-core
 pydantic-core==2.23.4
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   pydantic
 pyyaml==6.0.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   huggingface-hub
     #   llama-index-core
     #   transformers
-regex==2024.9.11
+regex==2024.11.6
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   nltk
     #   tiktoken
     #   transformers
 requests==2.32.3
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   huggingface-hub
     #   llama-index-core
     #   tiktoken
@@ -187,17 +234,19 @@ scikit-learn==1.5.2
     # via sentence-transformers
 scipy==1.13.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   scikit-learn
     #   sentence-transformers
-sentence-transformers==3.1.1
+sentence-transformers==3.3.0
     # via llama-index-embeddings-huggingface
 sniffio==1.3.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   anyio
     #   httpx
-sqlalchemy[asyncio]==2.0.35
+sqlalchemy[asyncio]==2.0.36
     # via
     #   llama-index-core
     #   sqlalchemy
@@ -207,18 +256,21 @@ tenacity==8.5.0
     # via llama-index-core
 threadpoolctl==3.5.0
     # via scikit-learn
-tiktoken==0.7.0
+tiktoken==0.8.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   llama-index-core
 tokenizers==0.19.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   transformers
 torch==2.2.2
     # via sentence-transformers
-tqdm==4.66.5
+tqdm==4.67.0
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   huggingface-hub
     #   llama-index-core
@@ -229,7 +281,9 @@ transformers==4.44.2
     # via sentence-transformers
 typing-extensions==4.12.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   huggingface-hub
     #   llama-index-core
     #   pydantic
@@ -243,13 +297,16 @@ typing-inspect==0.9.0
     #   llama-index-core
 urllib3==2.2.3
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-dev.txt
     #   requests
 wrapt==1.16.0
     # via
     #   deprecated
     #   llama-index-core
-yarl==1.11.1
+yarl==1.17.1
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
     #   aiohttp

requirements/requirements-playwright.txt

@@ -2,10 +2,11 @@
 # This file is autogenerated by pip-compile with Python 3.12
 # by the following command:
 #
-#    pip-compile --output-file=requirements/requirements-playwright.txt requirements/requirements-playwright.in
+#    pip-compile --constraint=requirements.txt --constraint=requirements/requirements-browser.txt --constraint=requirements/requirements-dev.txt --constraint=requirements/requirements-help.txt --output-file=requirements/requirements-playwright.txt requirements/requirements-playwright.in
 #
 greenlet==3.0.3
     # via
+    #   -c requirements/requirements-help.txt
     #   -r requirements/requirements-playwright.in
     #   playwright
 playwright==1.47.0
@@ -14,5 +15,9 @@ pyee==12.0.0
     # via playwright
 typing-extensions==4.12.2
     # via
+    #   -c requirements.txt
     #   -c requirements/../requirements.txt
+    #   -c requirements/requirements-browser.txt
+    #   -c requirements/requirements-dev.txt
+    #   -c requirements/requirements-help.txt
     #   pyee

requirements/requirements.in

@@ -17,13 +17,14 @@ sounddevice
 soundfile
 beautifulsoup4
 PyYAML
-Pillow
 diff-match-patch
 pypandoc
 litellm
 flake8
 importlib_resources
 pyperclip
+posthog
+mixpanel
 pexpect
 json5
 psutil
@@ -55,3 +56,6 @@ numpy<2
 # Going past this makes dependencies unresolvable
 # Seems to be caused by sentence-transformers
 tokenizers==0.19.1
+
+# streamlit 1.39.0 depends on this, as far back as 1.22 which is ancient and doesn't have chat ui
+Pillow<11

scripts/issues.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+import argparse
 import os
 import re
 from collections import defaultdict
@@ -27,9 +28,13 @@ This looks like a duplicate of #{oldest_issue_number}. Please see the comments t
 
 I'm going to close this issue for now. But please let me know if you think this is actually a distinct issue and I will reopen this issue."""  # noqa
 
+STALE_COMMENT = """I'm labeling this issue as stale because it has been open for 2 weeks with no activity. If there are no additional comments, it will be closed in 7 days."""  # noqa
+
+CLOSE_STALE_COMMENT = """I'm closing this issue because it has been stalled for 3 weeks with no activity. Feel free to add a comment here and we can re-open it. Or feel free to file a new issue at any time."""  # noqa
+
 # GitHub API configuration
 GITHUB_API_URL = "https://api.github.com"
-REPO_OWNER = "paul-gauthier"
+REPO_OWNER = "Aider-AI"
 REPO_NAME = "aider"
 TOKEN = os.getenv("GITHUB_TOKEN")
 
@@ -111,16 +116,187 @@ def comment_and_close_duplicate(issue, oldest_issue):
     print(f"  - Commented and closed issue #{issue['number']}")
 
 
-def main():
-    if not TOKEN:
-        print("Error: Missing GITHUB_TOKEN environment variable. Please check your .env file.")
+def find_unlabeled_with_paul_comments(issues):
+    unlabeled_issues = []
+    for issue in issues:
+        # Skip pull requests
+        if "pull_request" in issue:
+            continue
+
+        if not issue["labels"] and issue["state"] == "open":
+            # Get comments for this issue
+            comments_url = (
+                f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/comments"
+            )
+            response = requests.get(comments_url, headers=headers)
+            response.raise_for_status()
+            comments = response.json()
+
+            # Check if paul-gauthier has commented
+            if any(comment["user"]["login"] == "paul-gauthier" for comment in comments):
+                unlabeled_issues.append(issue)
+    return unlabeled_issues
+
+
+def handle_unlabeled_issues(all_issues, auto_yes):
+    print("\nFinding unlabeled issues with paul-gauthier comments...")
+    unlabeled_issues = find_unlabeled_with_paul_comments(all_issues)
+
+    if not unlabeled_issues:
+        print("No unlabeled issues with paul-gauthier comments found.")
         return
 
-    all_issues = get_issues("all")
+    print(f"\nFound {len(unlabeled_issues)} unlabeled issues with paul-gauthier comments:")
+    for issue in unlabeled_issues:
+        print(f"  - #{issue['number']}: {issue['title']} {issue['html_url']}")
+
+    if not auto_yes:
+        confirm = input("\nDo you want to add the 'question' label to these issues? (y/n): ")
+        if confirm.lower() != "y":
+            print("Skipping labeling.")
+            return
+
+    print("\nAdding 'question' label to issues...")
+    for issue in unlabeled_issues:
+        url = f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}"
+        response = requests.patch(url, headers=headers, json={"labels": ["question"]})
+        response.raise_for_status()
+        print(f"  - Added 'question' label to #{issue['number']}")
+
+
+def handle_stale_issues(all_issues, auto_yes):
+    print("\nChecking for stale question issues...")
+
+    for issue in all_issues:
+        # Skip if not open, not a question, already stale, or has been reopened
+        if (
+            issue["state"] != "open"
+            or "question" not in [label["name"] for label in issue["labels"]]
+            or "stale" in [label["name"] for label in issue["labels"]]
+            or has_been_reopened(issue["number"])
+        ):
+            continue
+
+        # Get latest activity timestamp from issue or its comments
+        latest_activity = datetime.strptime(issue["updated_at"], "%Y-%m-%dT%H:%M:%SZ")
+
+        # Check if issue is stale (no activity for 14 days)
+        days_inactive = (datetime.now() - latest_activity).days
+        if days_inactive >= 14:
+            print(f"\nStale issue found: #{issue['number']}: {issue['title']}\n{issue['html_url']}")
+            print(f"  No activity for {days_inactive} days")
+
+            if not auto_yes:
+                confirm = input("Add stale label and comment? (y/n): ")
+                if confirm.lower() != "y":
+                    print("Skipping this issue.")
+                    continue
+
+            # Add comment
+            comment_url = (
+                f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/comments"
+            )
+            response = requests.post(comment_url, headers=headers, json={"body": STALE_COMMENT})
+            response.raise_for_status()
+
+            # Add stale label
+            url = f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}"
+            response = requests.patch(url, headers=headers, json={"labels": ["question", "stale"]})
+            response.raise_for_status()
+
+            print(f"  Added stale label and comment to #{issue['number']}")
+
+
+def handle_stale_closing(all_issues, auto_yes):
+    print("\nChecking for issues to close or unstale...")
+
+    for issue in all_issues:
+        # Skip if not open or not stale
+        if issue["state"] != "open" or "stale" not in [label["name"] for label in issue["labels"]]:
+            continue
+
+        # Get the timeline to find when the stale label was last added
+        timeline_url = (
+            f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/timeline"
+        )
+        response = requests.get(timeline_url, headers=headers)
+        response.raise_for_status()
+        events = response.json()
+
+        # Find the most recent stale label addition
+        stale_events = [
+            event
+            for event in events
+            if event.get("event") == "labeled" and event.get("label", {}).get("name") == "stale"
+        ]
+
+        if not stale_events:
+            continue
+
+        latest_stale = datetime.strptime(stale_events[-1]["created_at"], "%Y-%m-%dT%H:%M:%SZ")
+
+        # Get comments since the stale label
+        comments_url = (
+            f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/comments"
+        )
+        response = requests.get(comments_url, headers=headers)
+        response.raise_for_status()
+        comments = response.json()
+
+        # Check for comments newer than the stale label
+        new_comments = [
+            comment
+            for comment in comments
+            if datetime.strptime(comment["created_at"], "%Y-%m-%dT%H:%M:%SZ") > latest_stale
+        ]
+
+        if new_comments:
+            print(f"\nFound new activity on stale issue #{issue['number']}: {issue['title']}")
+            print(f"  {len(new_comments)} new comments since stale label")
+
+            if not auto_yes:
+                confirm = input("Remove stale label? (y/n): ")
+                if confirm.lower() != "y":
+                    print("Skipping this issue.")
+                    continue
+
+            # Remove stale label but keep question label
+            url = f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}"
+            response = requests.patch(url, headers=headers, json={"labels": ["question"]})
+            response.raise_for_status()
+            print(f"  Removed stale label from #{issue['number']}")
+        else:
+            # Check if it's been 7 days since stale label
+            days_stale = (datetime.now() - latest_stale).days
+            if days_stale >= 7:
+                print(f"\nStale issue ready for closing #{issue['number']}: {issue['title']}")
+                print(f"  No activity for {days_stale} days since stale label")
+
+                if not auto_yes:
+                    confirm = input("Close this issue? (y/n): ")
+                    if confirm.lower() != "y":
+                        print("Skipping this issue.")
+                        continue
+
+                # Add closing comment
+                comment_url = f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}/comments"
+                response = requests.post(
+                    comment_url, headers=headers, json={"body": CLOSE_STALE_COMMENT}
+                )
+                response.raise_for_status()
+
+                # Close the issue
+                url = f"{GITHUB_API_URL}/repos/{REPO_OWNER}/{REPO_NAME}/issues/{issue['number']}"
+                response = requests.patch(url, headers=headers, json={"state": "closed"})
+                response.raise_for_status()
+                print(f"  Closed issue #{issue['number']}")
+
+
+def handle_duplicate_issues(all_issues, auto_yes):
     open_issues = [issue for issue in all_issues if issue["state"] == "open"]
     grouped_open_issues = group_issues_by_subject(open_issues)
 
-    print("Analyzing issues (skipping reopened issues)...")
+    print("Looking for duplicate issues (skipping reopened issues)...")
     for subject, issues in grouped_open_issues.items():
         oldest_issue = find_oldest_issue(subject, all_issues)
         if not oldest_issue:
@@ -142,13 +318,12 @@ def main():
             f" {oldest_issue['html_url']} ({oldest_issue['state']})"
         )
 
-        # Confirmation prompt
-        confirm = input("Do you want to comment and close duplicate issues? (y/n): ")
-        if confirm.lower() != "y":
-            print("Skipping this group of issues.")
-            continue
+        if not auto_yes:
+            confirm = input("Do you want to comment and close duplicate issues? (y/n): ")
+            if confirm.lower() != "y":
+                print("Skipping this group of issues.")
+                continue
 
-        # Comment and close duplicate issues
         for issue in issues:
             if issue["number"] != oldest_issue["number"]:
                 comment_and_close_duplicate(issue, oldest_issue)
@@ -157,5 +332,24 @@ def main():
             print(f"Oldest issue #{oldest_issue['number']} left open")
 
 
+def main():
+    parser = argparse.ArgumentParser(description="Handle duplicate GitHub issues")
+    parser.add_argument(
+        "--yes", action="store_true", help="Automatically close duplicates without prompting"
+    )
+    args = parser.parse_args()
+
+    if not TOKEN:
+        print("Error: Missing GITHUB_TOKEN environment variable. Please check your .env file.")
+        return
+
+    all_issues = get_issues("all")
+
+    handle_unlabeled_issues(all_issues, args.yes)
+    handle_stale_issues(all_issues, args.yes)
+    handle_stale_closing(all_issues, args.yes)
+    handle_duplicate_issues(all_issues, args.yes)
+
+
 if __name__ == "__main__":
     main()

scripts/pip-compile.sh

@@ -3,16 +3,23 @@
 # exit when any command fails
 set -e
 
+# First compile the base requirements
 pip-compile \
     requirements/requirements.in \
     --output-file=requirements.txt \
     $1
 
-for SUFFIX in dev help browser playwright; do
+# Then compile each additional requirements file in sequence
+SUFFIXES=(dev help browser playwright)
+CONSTRAINTS="--constraint=requirements.txt"
 
+for SUFFIX in "${SUFFIXES[@]}"; do
     pip-compile \
         requirements/requirements-${SUFFIX}.in \
         --output-file=requirements/requirements-${SUFFIX}.txt \
+        ${CONSTRAINTS} \
         $1
-done
     
+    # Add this file as a constraint for the next iteration
+    CONSTRAINTS+=" --constraint=requirements/requirements-${SUFFIX}.txt"
+done

scripts/update-docs.sh

@@ -9,6 +9,10 @@ else
   ARG=$1
 fi
 
+if [ "$ARG" != "--check" ]; then
+  tail -1000 ~/.aider/analytics.jsonl > aider/website/assets/sample-analytics.jsonl
+fi
+
 # README.md before index.md, because index.md uses cog to include README.md
 cog $ARG \
     README.md \
@@ -21,4 +25,6 @@ cog $ARG \
     aider/website/docs/config/aider_conf.md \
     aider/website/docs/config/adv-model-settings.md \
     aider/website/docs/leaderboards/index.md \
-    aider/website/docs/llms/other.md
+    aider/website/docs/llms/other.md \
+    aider/website/docs/more/infinite-output.md \
+    aider/website/docs/legal/privacy.md

tests/basic/test_analytics.py

@@ -0,0 +1,100 @@
+import json
+import os
+import tempfile
+from pathlib import Path
+from unittest.mock import patch
+
+import pytest
+
+from aider.analytics import Analytics
+
+
+@pytest.fixture
+def temp_analytics_file():
+    with tempfile.NamedTemporaryFile(delete=False) as f:
+        yield f.name
+    os.unlink(f.name)
+
+
+@pytest.fixture
+def temp_data_dir(monkeypatch):
+    with tempfile.TemporaryDirectory() as tmpdir:
+        temp_dir = Path(tmpdir)
+        monkeypatch.setattr(Path, "home", lambda: temp_dir)
+        yield temp_dir
+
+
+def test_analytics_initialization(temp_data_dir):
+    analytics = Analytics(permanently_disable=True)
+    assert analytics.mp is None
+    assert analytics.ph is None
+    assert analytics.permanently_disable is True
+    assert analytics.user_id is not None
+
+
+def test_analytics_enable_disable(temp_data_dir):
+    analytics = Analytics()
+    analytics.asked_opt_in = True
+
+    analytics.enable()
+    assert analytics.mp is not None
+    assert analytics.ph is not None
+
+    analytics.disable(permanently=False)
+    assert analytics.mp is None
+    assert analytics.ph is None
+    assert analytics.permanently_disable is not True
+
+    analytics.disable(permanently=True)
+    assert analytics.permanently_disable is True
+
+
+def test_analytics_data_persistence(temp_data_dir):
+    analytics1 = Analytics()
+    user_id = analytics1.user_id
+
+    analytics2 = Analytics()
+    assert analytics2.user_id == user_id
+
+
+def test_analytics_event_logging(temp_analytics_file, temp_data_dir):
+    analytics = Analytics(logfile=temp_analytics_file)
+    analytics.asked_opt_in = True
+    analytics.enable()
+
+    test_event = "test_event"
+    test_properties = {"test_key": "test_value"}
+
+    with patch.object(analytics.mp, "track") as mock_mp_track:
+        with patch.object(analytics.ph, "capture") as mock_ph_capture:
+            analytics.event(test_event, **test_properties)
+
+            mock_mp_track.assert_called_once()
+            mock_ph_capture.assert_called_once()
+
+            # Verify logfile
+            with open(temp_analytics_file) as f:
+                log_entry = json.loads(f.read().strip())
+                assert log_entry["event"] == test_event
+                assert "test_key" in log_entry["properties"]
+
+
+def test_system_info(temp_data_dir):
+    analytics = Analytics()
+    sys_info = analytics.get_system_info()
+
+    assert "python_version" in sys_info
+    assert "os_platform" in sys_info
+    assert "os_release" in sys_info
+    assert "machine" in sys_info
+
+
+def test_need_to_ask(temp_data_dir):
+    analytics = Analytics()
+    assert analytics.need_to_ask() is True
+
+    analytics.asked_opt_in = True
+    assert analytics.need_to_ask() is False
+
+    analytics.permanently_disable = True
+    assert analytics.need_to_ask() is False

tests/basic/test_coder.py

@@ -17,6 +17,8 @@ from aider.utils import GitTemporaryDirectory
 class TestCoder(unittest.TestCase):
     def setUp(self):
         self.GPT35 = Model("gpt-3.5-turbo")
+        self.webbrowser_patcher = patch("aider.io.webbrowser.open")
+        self.mock_webbrowser = self.webbrowser_patcher.start()
 
     def test_allowed_to_edit(self):
         with GitTemporaryDirectory():