set version to 0.65.2.dev

Add dart support

.github/workflows/docker-build-test.yml

@@ -27,17 +27,9 @@ jobs:
 
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
+      
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@v3
-    - name: Login to DockerHub
-      uses: docker/login-action@v3
-      with:
-        username: ${{ secrets.DOCKERHUB_USERNAME }}
-        password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      env:
-        dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
-        dockerhub_password: ${{ secrets.DOCKERHUB_PASSWORD }}
-      if: ${{ env.dockerhub_username }} && ${{ env.dockerhub_password }}
 
     - name: Build Docker standard image
       uses: docker/build-push-action@v5

.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: |

.gitignore

@@ -11,3 +11,5 @@ _site
 .jekyll-cache/
 .jekyll-metadata
 aider/__version__.py
+.venv/
+.gitattributes

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
 ```
 
@@ -154,6 +151,10 @@ The project's documentation is built using Jekyll and hosted on GitHub Pages. To
    ```
    bundle exec jekyll build
    ```
+5. Preview the website while editing (optional):
+   ```
+   bundle exec jekyll serve
+   ```
 
 The built documentation will be available in the `aider/website/_site` directory.
 
@@ -186,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,167 @@
-
 # Release history
 
+### Aider v0.65.0
+
+- Added `--alias` config to define [custom model aliases](https://aider.chat/docs/config/model-aliases.html).
+- Added `--[no-]detect-urls` flag to disable detecting and offering to scrape URLs found in the chat.
+- Ollama models now default to an 8k context window.
+- Added [RepoMap support for Dart language](https://aider.chat/docs/languages.html) by @malkoG.
+- Ask 2.5% of users if they want to opt-in to [analytics](https://aider.chat/docs/more/analytics.html).
+- Skip suggesting files that share names with files already in chat.
+- `/editor` returns and prefill the file content into the prompt, so you can use `/editor` to compose messages that start with `/commands`, etc.
+- Enhanced error handling for analytics.
+- Improved handling of UnknownEditFormat exceptions with helpful documentation links.
+- Bumped dependencies to pick up grep-ast 0.4.0 for Dart language support.
+- Aider wrote 81% of the code in this release.
+
+### Aider v0.64.1
+
+- Disable streaming for o1 on OpenRouter.
+
+### Aider v0.64.0
+
+- Added [`/editor` command](https://aider.chat/docs/usage/commands.html) to open system editor for writing prompts, by @thehunmonkgroup.
+- Full support for `gpt-4o-2024-11-20`.
+- Stream o1 models by default.
+- `/run` and suggested shell commands are less mysterious and now confirm that they "Added XX lines of output to the chat."
+- Ask 1% of users if they want to opt-in to [analytics](https://aider.chat/docs/more/analytics.html).
+- Added support for [optional multiline input tags](https://aider.chat/docs/usage/commands.html#entering-multi-line-chat-messages) with matching closing tags.
+- Improved [model settings configuration](https://aider.chat/docs/config/adv-model-settings.html#global-extra-params) with support for global `extra_params` for `litellm.completion()`.
+- Architect mode now asks to add files suggested by the LLM.
+- Fixed bug in fuzzy model name matching.
+- Added Timeout exception to handle API provider timeouts.
+- Added `--show-release-notes` to control release notes display on first run of new version.
+- Save empty dict to cache file on model metadata download failure, to delay retry.
+- Improved error handling and code formatting.
+- Aider wrote 74% of the code in this release.
+
+###  Aider v0.63.2
+
+- 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)
+  - Use a strong reasoning model like o1-preview as your Architect.
+  - Use a cheaper, faster model like gpt-4o as your Editor.
+- New `--o1-preview` and `--o1-mini` shortcuts.
+- Support for new Gemini 002 models.
+- Better support for Qwen 2.5 models.
+- Many confirmation questions can be skipped for the rest of the session with "(D)on't ask again" response.
+- Autocomplete for `/read-only` supports the entire filesystem.
+- New settings for completion menu colors.
+- New `/copy` command to copy the last LLM response to the clipboard.
+- Renamed `/clipboard` to `/paste`.
+- Will now follow HTTP redirects when scraping urls.
+- New `--voice-format` switch to send voice audio as wav/mp3/webm, by @mbailey.
+- ModelSettings takes `extra_params` dict to specify any extras to pass to `litellm.completion()`.
+- Support for cursor shapes when in vim mode.
+- Numerous bug fixes.
+- Aider wrote 53% of the code in this release.
+
 ### Aider v0.57.1
 
 - Fixed dependency conflict between aider-chat[help] and [playwright].
@@ -665,7 +826,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

@@ -46,7 +46,7 @@ cog.out(open("aider/website/_includes/get-started.md").read())
 You can get started quickly like this:
 
 ```
-python -m pip install aider-chat
+python -m pip install -U aider-chat
 
 # Change directory into a git repo
 cd /to/your/git/repo
@@ -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.57.2.dev"
+    __version__ = "0.65.2.dev"
 
 __all__ = [__version__]

aider/analytics.py

@@ -0,0 +1,206 @@
+import json
+import platform
+import sys
+import time
+import uuid
+from pathlib import Path
+
+from mixpanel import Mixpanel, MixpanelException
+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, args_analytics):
+        if args_analytics is False:
+            return False
+
+        could_ask = not self.asked_opt_in and not self.permanently_disable
+        if not could_ask:
+            return False
+
+        if args_analytics is True:
+            return True
+
+        assert args_analytics is None, args_analytics
+
+        if not self.user_id:
+            return False
+
+        PERCENT = 2.5
+        return self.is_uuid_in_percentage(self.user_id, PERCENT)
+
+    def is_uuid_in_percentage(self, uuid_str, percent):
+        """Check if a UUID string falls within the first X percent of the UUID space.
+
+        Args:
+            uuid_str: UUID string to test
+            percent: Percentage threshold (0-100)
+
+        Returns:
+            bool: True if UUID falls within the first X percent
+        """
+        if not (0 <= percent <= 100):
+            raise ValueError("Percentage must be between 0 and 100")
+
+        if not uuid_str:
+            return False
+
+        # Convert percentage to hex threshold (1% = "04...", 10% = "1a...", etc)
+        # Using first 6 hex digits
+        if percent == 0:
+            return False
+        threshold = format(int(0xFFFFFF * percent / 100), "06x")
+        return uuid_str[:6] <= threshold
+
+    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 and not 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:
+            try:
+                self.mp.track(self.user_id, event_name, dict(properties))
+            except MixpanelException:
+                self.mp = None  # Disable mixpanel on connection errors
+
+        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",
@@ -117,6 +126,22 @@ def get_parser(default_config_files, git_root):
         const=deepseek_model,
         help=f"Use {deepseek_model} model for the main chat",
     )
+    o1_mini_model = "o1-mini"
+    group.add_argument(
+        "--o1-mini",
+        action="store_const",
+        dest="model",
+        const=o1_mini_model,
+        help=f"Use {o1_mini_model} model for the main chat",
+    )
+    o1_preview_model = "o1-preview"
+    group.add_argument(
+        "--o1-preview",
+        action="store_const",
+        dest="model",
+        const=o1_preview_model,
+        help=f"Use {o1_preview_model} model for the main chat",
+    )
 
     ##########
     group = parser.add_argument_group("Model Settings")
@@ -168,6 +193,12 @@ def get_parser(default_config_files, git_root):
         default=".aider.model.metadata.json",
         help="Specify a file with context window and costs for unknown models",
     )
+    group.add_argument(
+        "--alias",
+        action="append",
+        metavar="ALIAS:MODEL",
+        help="Add a model alias (can be used multiple times)",
+    )
     group.add_argument(
         "--verify-ssl",
         action=argparse.BooleanOptionalAction,
@@ -181,6 +212,13 @@ def get_parser(default_config_files, git_root):
         default=None,
         help="Specify what edit format the LLM should use (default depends on model)",
     )
+    group.add_argument(
+        "--architect",
+        action="store_const",
+        dest="edit_format",
+        const="architect",
+        help="Use architect edit format for the main chat",
+    )
     group.add_argument(
         "--weak-model",
         metavar="WEAK_MODEL",
@@ -190,6 +228,18 @@ def get_parser(default_config_files, git_root):
             " depends on --model)"
         ),
     )
+    group.add_argument(
+        "--editor-model",
+        metavar="EDITOR_MODEL",
+        default=None,
+        help="Specify the model to use for editor tasks (default depends on --model)",
+    )
+    group.add_argument(
+        "--editor-edit-format",
+        metavar="EDITOR_EDIT_FORMAT",
+        default=None,
+        help="Specify the edit format for the editor model (default: depends on editor model)",
+    )
     group.add_argument(
         "--show-model-warnings",
         action=argparse.BooleanOptionalAction,
@@ -197,17 +247,25 @@ def get_parser(default_config_files, git_root):
         help="Only work with models that have meta-data available (default: True)",
     )
     group.add_argument(
-        "--map-tokens",
+        "--max-chat-history-tokens",
         type=int,
         default=None,
-        help="Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)",
+        help=(
+            "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
+    # argument parsing, but it's here so that the help is displayed as expected.
     group.add_argument(
-        "--map-refresh",
-        choices=["auto", "always", "files", "manual"],
-        default="auto",
-        help="Control how often the repo map is refreshed (default: auto)",
+        "--env-file",
+        metavar="ENV_FILE",
+        default=default_env_file(git_root),
+        help="Specify the .env file to load (default: .env in git root)",
     )
+
+    ##########
+    group = parser.add_argument_group("Cache Settings")
     group.add_argument(
         "--cache-prompts",
         action=argparse.BooleanOptionalAction,
@@ -220,29 +278,30 @@ def get_parser(default_config_files, git_root):
         default=0,
         help="Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)",
     )
+
+    ##########
+    group = parser.add_argument_group("Repomap Settings")
+    group.add_argument(
+        "--map-tokens",
+        type=int,
+        default=None,
+        help="Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)",
+    )
+    group.add_argument(
+        "--map-refresh",
+        choices=["auto", "always", "files", "manual"],
+        default="auto",
+        help=(
+            "Control how often the repo map is refreshed. Options: auto, always, files, manual"
+            " (default: auto)"
+        ),
+    )
     group.add_argument(
         "--map-multiplier-no-files",
         type=float,
         default=2,
         help="Multiplier for map tokens when no files are specified (default: 2)",
     )
-    group.add_argument(
-        "--max-chat-history-tokens",
-        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."
-        ),
-    )
-    # This is a duplicate of the argument in the preparser and is a no-op by this time of
-    # argument parsing, but it's here so that the help is displayed as expected.
-    group.add_argument(
-        "--env-file",
-        metavar="ENV_FILE",
-        default=default_env_file(git_root),
-        help="Specify the .env file to load (default: .env in git root)",
-    )
 
     ##########
     group = parser.add_argument_group("History Files")
@@ -328,6 +387,39 @@ def get_parser(default_config_files, git_root):
         default="#0088ff",
         help="Set the color for assistant output (default: #0088ff)",
     )
+    group.add_argument(
+        "--completion-menu-color",
+        metavar="COLOR",
+        default=None,
+        help="Set the color for the completion menu (default: terminal's default text color)",
+    )
+    group.add_argument(
+        "--completion-menu-bg-color",
+        metavar="COLOR",
+        default=None,
+        help=(
+            "Set the background color for the completion menu (default: terminal's default"
+            " background color)"
+        ),
+    )
+    group.add_argument(
+        "--completion-menu-current-color",
+        metavar="COLOR",
+        default=None,
+        help=(
+            "Set the color for the current item in the completion menu (default: terminal's default"
+            " background color)"
+        ),
+    )
+    group.add_argument(
+        "--completion-menu-current-bg-color",
+        metavar="COLOR",
+        default=None,
+        help=(
+            "Set the background color for the current item in the completion menu (default:"
+            " terminal's default text color)"
+        ),
+    )
     group.add_argument(
         "--code-theme",
         default="default",
@@ -425,6 +517,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",
@@ -466,6 +564,25 @@ def get_parser(default_config_files, git_root):
     )
 
     ##########
+    group = parser.add_argument_group("Analytics")
+    group.add_argument(
+        "--analytics",
+        action=argparse.BooleanOptionalAction,
+        default=None,
+        help="Enable/disable analytics for current session (default: random)",
+    )
+    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",
@@ -485,12 +602,6 @@ def get_parser(default_config_files, git_root):
         help="Use VI editing mode in the terminal (default: False)",
         default=False,
     )
-    group.add_argument(
-        "--voice-language",
-        metavar="VOICE_LANGUAGE",
-        default="en",
-        help="Specify the language for voice using ISO 639-1 code (default: auto)",
-    )
     group.add_argument(
         "--chat-language",
         metavar="CHAT_LANGUAGE",
@@ -515,6 +626,12 @@ def get_parser(default_config_files, git_root):
         help="Check for new aider versions on launch",
         default=True,
     )
+    group.add_argument(
+        "--show-release-notes",
+        action=argparse.BooleanOptionalAction,
+        help="Show release notes on first run of new version (default: None, ask user)",
+        default=None,
+    )
     group.add_argument(
         "--install-main-branch",
         action="store_true",
@@ -534,7 +651,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,
@@ -582,6 +705,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",
@@ -600,8 +728,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(
@@ -610,6 +738,38 @@ 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.add_argument(
+        "--detect-urls",
+        action=argparse.BooleanOptionalAction,
+        default=True,
+        help="Enable/disable detection and offering to add URLs to chat (default: True)",
+    )
+    group.add_argument(
+        "--editor",
+        help="Specify which editor to use for the /editor command",
+    )
+
+    ##########
+    group = parser.add_argument_group("Voice Settings")
+    group.add_argument(
+        "--voice-format",
+        metavar="VOICE_FORMAT",
+        default="wav",
+        choices=["wav", "mp3", "webm"],
+        help="Audio format for voice recording (default: wav). webm and mp3 require ffmpeg",
+    )
+    group.add_argument(
+        "--voice-language",
+        metavar="VOICE_LANGUAGE",
+        default="en",
+        help="Specify the language for voice using ISO 639-1 code (default: auto)",
+    )
 
     return parser
 
@@ -625,7 +785,6 @@ def get_md_help():
     parser.formatter_class = MarkdownHelpFormatter
 
     return argparse.ArgumentParser.format_help(parser)
-    return parser.format_help()
 
 
 def get_sample_yaml():
@@ -639,7 +798,6 @@ def get_sample_yaml():
     parser.formatter_class = YamlHelpFormatter
 
     return argparse.ArgumentParser.format_help(parser)
-    return parser.format_help()
 
 
 def get_sample_dotenv():
@@ -653,7 +811,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/__init__.py

@@ -1,13 +1,16 @@
+from .architect_coder import ArchitectCoder
 from .ask_coder import AskCoder
 from .base_coder import Coder
 from .editblock_coder import EditBlockCoder
 from .editblock_fenced_coder import EditBlockFencedCoder
+from .editor_editblock_coder import EditorEditBlockCoder
+from .editor_whole_coder import EditorWholeFileCoder
 from .help_coder import HelpCoder
-
-# from .single_wholefile_func_coder import SingleWholeFileFunctionCoder
 from .udiff_coder import UnifiedDiffCoder
 from .wholefile_coder import WholeFileCoder
 
+# from .single_wholefile_func_coder import SingleWholeFileFunctionCoder
+
 __all__ = [
     HelpCoder,
     AskCoder,
@@ -17,4 +20,7 @@ __all__ = [
     WholeFileCoder,
     UnifiedDiffCoder,
     #    SingleWholeFileFunctionCoder,
+    ArchitectCoder,
+    EditorEditBlockCoder,
+    EditorWholeFileCoder,
 ]

aider/coders/architect_coder.py

@@ -0,0 +1,47 @@
+from .architect_prompts import ArchitectPrompts
+from .ask_coder import AskCoder
+from .base_coder import Coder
+
+
+class ArchitectCoder(AskCoder):
+    edit_format = "architect"
+    gpt_prompts = ArchitectPrompts()
+
+    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
+
+        kwargs = dict()
+
+        # Use the editor_model from the main_model if it exists, otherwise use the main_model itself
+        editor_model = self.main_model.editor_model or self.main_model
+
+        kwargs["main_model"] = editor_model
+        kwargs["edit_format"] = self.main_model.editor_edit_format
+        kwargs["suggest_shell_commands"] = False
+        kwargs["map_tokens"] = 0
+        kwargs["total_cost"] = self.total_cost
+        kwargs["cache_prompts"] = False
+        kwargs["num_cache_warming_pings"] = 0
+        kwargs["summarize_from_coder"] = False
+
+        new_kwargs = dict(io=self.io, from_coder=self)
+        new_kwargs.update(kwargs)
+
+        editor_coder = Coder.create(**new_kwargs)
+        editor_coder.cur_messages = []
+        editor_coder.done_messages = []
+
+        if self.verbose:
+            editor_coder.show_announcements()
+
+        editor_coder.run(with_message=content, preproc=False)
+
+        self.move_back_cur_messages("I made those changes to the files.")
+        self.total_cost = editor_coder.total_cost
+        self.aider_commit_hashes = editor_coder.aider_commit_hashes

aider/coders/architect_prompts.py

@@ -0,0 +1,40 @@
+# flake8: noqa: E501
+
+from .base_prompts import CoderPrompts
+
+
+class ArchitectPrompts(CoderPrompts):
+    main_system = """Act as an expert architect engineer and provide direction to your editor engineer.
+Study the change request and the current code.
+Describe how to modify the code to complete the request.
+The editor engineer will rely solely on your instructions, so make them unambiguous and complete.
+Explain all needed code changes clearly and completely, but concisely.
+Just show the changes needed.
+
+DO NOT show the entire updated function/file/etc!
+
+Always reply to the user in {language}.
+"""
+
+    example_messages = []
+
+    files_content_prefix = """I have *added these files to the chat* so you see all of their contents.
+*Trust this message as the true contents of the files!*
+Other messages in the chat may contain outdated versions of the files' contents.
+"""  # noqa: E501
+
+    files_content_assistant_reply = (
+        "Ok, I will use that as the true, current contents of the files."
+    )
+
+    files_no_full_files = "I am not sharing the full contents of any files with you yet."
+
+    files_no_full_files_with_repo_map = ""
+    files_no_full_files_with_repo_map_reply = ""
+
+    repo_content_prefix = """I am working with you on code in a git repository.
+Here are summaries of some files present in my git repo.
+If you need to see the full contents of any files to answer my questions, ask me to *add them to the chat*.
+"""
+
+    system_reminder = ""

aider/coders/ask_prompts.py

@@ -6,8 +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 = []
@@ -17,6 +16,10 @@ Always reply to the user in the same language they are using.
 Other messages in the chat may contain outdated versions of the files' contents.
 """  # noqa: E501
 
+    files_content_assistant_reply = (
+        "Ok, I will use that as the true, current contents of the files."
+    )
+
     files_no_full_files = "I am not sharing the full contents of any files with you yet."
 
     files_no_full_files_with_repo_map = ""

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,13 +30,22 @@ 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
 from .chat_chunks import ChatChunks
 
 
+class UnknownEditFormat(ValueError):
+    def __init__(self, edit_format, valid_formats):
+        self.edit_format = edit_format
+        self.valid_formats = valid_formats
+        super().__init__(
+            f"Unknown edit format {edit_format}. Valid formats are: {', '.join(valid_formats)}"
+        )
+
+
 class MissingAPIKeyError(ValueError):
     pass
 
@@ -88,6 +100,7 @@ class Coder:
     cache_warming_thread = None
     num_cache_warming_pings = 0
     suggest_shell_commands = True
+    detect_urls = True
     ignore_mentions = None
     chat_language = None
 
@@ -153,7 +166,12 @@ class Coder:
                 res.original_kwargs = dict(kwargs)
                 return res
 
-        raise ValueError(f"Unknown edit format {edit_format}")
+        valid_formats = [
+            str(c.edit_format)
+            for c in coders.__all__
+            if hasattr(c, "edit_format") and c.edit_format is not None
+        ]
+        raise UnknownEditFormat(edit_format, valid_formats)
 
     def clone(self, **kwargs):
         new_coder = Coder.create(from_coder=self, **kwargs)
@@ -180,6 +198,13 @@ class Coder:
             output += ", infinite output"
         lines.append(output)
 
+        if self.edit_format == "architect":
+            output = (
+                f"Editor model: {main_model.editor_model.name} with"
+                f" {main_model.editor_edit_format} edit format"
+            )
+            lines.append(output)
+
         if weak_model is not main_model:
             output = f"Weak model: {weak_model.name}"
             lines.append(output)
@@ -251,12 +276,18 @@ 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,
+        detect_urls=True,
     ):
+        # 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()
@@ -265,6 +296,7 @@ class Coder:
         self.ignore_mentions = set()
 
         self.suggest_shell_commands = suggest_shell_commands
+        self.detect_urls = detect_urls
 
         self.num_cache_warming_pings = num_cache_warming_pings
 
@@ -340,6 +372,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
@@ -648,7 +683,7 @@ class Coder:
         if self.abs_fnames:
             files_content = self.gpt_prompts.files_content_prefix
             files_content += self.get_files_content()
-            files_reply = "Ok, any changes I propose will be to those files."
+            files_reply = self.gpt_prompts.files_content_assistant_reply
         elif self.get_repo_map() and self.gpt_prompts.files_no_full_files_with_repo_map:
             files_content = self.gpt_prompts.files_no_full_files_with_repo_map
             files_reply = self.gpt_prompts.files_no_full_files_with_repo_map_reply
@@ -672,7 +707,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 = []
@@ -775,16 +810,40 @@ 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."""
+        if not self.detect_urls:
+            return []
+
         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:
-                if self.io.confirm_ask("Add URL to the chat?", subject=url, group=group):
+                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)
@@ -920,12 +979,18 @@ class Coder:
                 platform=platform_text
             )
 
+        if self.chat_language:
+            language = self.chat_language
+        else:
+            language = "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
 
@@ -1014,7 +1079,7 @@ class Coder:
         max_input_tokens = self.main_model.info.get("max_input_tokens") or 0
         # Add the reminder prompt if we still have room to include it.
         if (
-            max_input_tokens is None
+            not max_input_tokens
             or total_tokens < max_input_tokens
             and self.gpt_prompts.system_reminder
         ):
@@ -1064,13 +1129,15 @@ class Coder:
                 self.warming_pings_left -= 1
                 self.next_cache_warm = time.time() + delay
 
+                kwargs = dict(self.main_model.extra_params) or dict()
+                kwargs["max_tokens"] = 1
+
                 try:
                     completion = litellm.completion(
                         model=self.main_model.name,
                         messages=self.cache_warming_chunks.cacheable_messages(),
                         stream=False,
-                        max_tokens=1,
-                        extra_headers=self.main_model.extra_headers,
+                        **kwargs,
                     )
                 except Exception as err:
                     self.io.tool_warning(f"Cache warming error: {str(err)}")
@@ -1102,10 +1169,15 @@ class Coder:
             utils.show_messages(messages, functions=self.functions)
 
         self.multi_response_content = ""
-        self.mdstream = self.io.assistant_output("", self.stream)
+        if self.show_pretty() and self.stream:
+            self.mdstream = self.io.get_assistant_mdstream()
+        else:
+            self.mdstream = None
 
         retry_delay = 0.125
 
+        litellm_ex = LiteLLMExceptions()
+
         self.usage_report = None
         exhausted = False
         interrupted = False
@@ -1114,24 +1186,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"):
@@ -1147,9 +1232,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:
@@ -1179,6 +1265,20 @@ class Coder:
         else:
             content = ""
 
+        if not interrupted:
+            add_rel_files_message = self.check_for_file_mentions(content)
+            if add_rel_files_message:
+                if self.reflected_message:
+                    self.reflected_message += "\n\n" + add_rel_files_message
+                else:
+                    self.reflected_message = add_rel_files_message
+                return
+
+            try:
+                self.reply_completed()
+            except KeyboardInterrupt:
+                interrupted = True
+
         if interrupted:
             content += "\n^C KeyboardInterrupt"
             self.cur_messages += [dict(role="assistant", content=content)]
@@ -1228,12 +1328,8 @@ class Coder:
                     self.update_cur_messages()
                     return
 
-        add_rel_files_message = self.check_for_file_mentions(content)
-        if add_rel_files_message:
-            if self.reflected_message:
-                self.reflected_message += "\n\n" + add_rel_files_message
-            else:
-                self.reflected_message = add_rel_files_message
+    def reply_completed(self):
+        pass
 
     def show_exhausted_error(self):
         output_tokens = 0
@@ -1286,11 +1382,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 = ""
@@ -1331,9 +1425,18 @@ class Coder:
 
         addable_rel_fnames = self.get_addable_relative_files()
 
+        # Get basenames of files already in chat or read-only
+        existing_basenames = {os.path.basename(f) for f in self.get_inchat_relative_files()} | {
+            os.path.basename(self.get_rel_fname(f)) for f in self.abs_read_only_fnames
+        }
+
         mentioned_rel_fnames = set()
         fname_to_rel_fnames = {}
         for rel_fname in addable_rel_fnames:
+            # Skip files that share a basename with files already in chat
+            if os.path.basename(rel_fname) in existing_basenames:
+                continue
+
             normalized_rel_fname = rel_fname.replace("\\", "/")
             normalized_words = set(word.replace("\\", "/") for word in words)
             if normalized_rel_fname in normalized_words:
@@ -1364,7 +1467,7 @@ class Coder:
         added_fnames = []
         group = ConfirmGroup(new_mentions)
         for rel_fname in sorted(new_mentions):
-            if self.io.confirm_ask(f"Add {rel_fname} to the chat?", group=group):
+            if self.io.confirm_ask(f"Add {rel_fname} to the chat?", group=group, allow_never=True):
                 self.add_rel_fname(rel_fname)
                 added_fnames.append(rel_fname)
             else:
@@ -1395,8 +1498,7 @@ class Coder:
                 functions,
                 self.stream,
                 temp,
-                extra_headers=model.extra_headers,
-                max_tokens=model.max_tokens,
+                extra_params=model.extra_params,
             )
             self.chat_completion_call_hashes.append(hash_object.hexdigest())
 
@@ -1459,7 +1561,7 @@ class Coder:
             raise Exception("No data found in LLM response!")
 
         show_resp = self.render_incremental_response(True)
-        self.io.assistant_output(show_resp)
+        self.io.assistant_output(show_resp, pretty=self.show_pretty())
 
         if (
             hasattr(completion.choices[0], "finish_reason")
@@ -1535,7 +1637,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
@@ -1617,11 +1718,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 ""
@@ -1696,6 +1813,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}")
@@ -1790,8 +1911,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
@@ -1919,6 +2042,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 ""
@@ -1942,7 +2068,11 @@ class Coder:
         )
         prompt = "Run shell command?" if command_count == 1 else "Run shell commands?"
         if not self.io.confirm_ask(
-            prompt, subject="\n".join(commands), explicit_yes_required=True, group=group
+            prompt,
+            subject="\n".join(commands),
+            explicit_yes_required=True,
+            group=group,
+            allow_never=True,
         ):
             return
 
@@ -1960,9 +2090,10 @@ class Coder:
             if output:
                 accumulated_output += f"Output from {command}\n{output}\n"
 
-        if accumulated_output.strip() and not self.io.confirm_ask(
-            "Add command output to the chat?"
+        if accumulated_output.strip() and self.io.confirm_ask(
+            "Add command output to the chat?", allow_never=True
         ):
-            accumulated_output = ""
-
-        return accumulated_output
+            num_lines = len(accumulated_output.strip().splitlines())
+            line_plural = "line" if num_lines == 1 else "lines"
+            self.io.tool_output(f"Added {num_lines} {line_plural} of output to the chat.")
+            return accumulated_output

aider/coders/base_prompts.py

@@ -22,6 +22,8 @@ You always COMPLETELY IMPLEMENT the needed code!
 Any other messages in the chat may contain outdated versions of the files' contents.
 """  # noqa: E501
 
+    files_content_assistant_reply = "Ok, any changes I propose will be to those files."
+
     files_no_full_files = "I am not sharing any files that you can edit yet."
 
     files_no_full_files_with_repo_map = """Don't try and edit any existing code without asking me to add the files to the chat!

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/editor_editblock_coder.py

@@ -0,0 +1,7 @@
+from .editblock_coder import EditBlockCoder
+from .editor_editblock_prompts import EditorEditBlockPrompts
+
+
+class EditorEditBlockCoder(EditBlockCoder):
+    edit_format = "editor-diff"
+    gpt_prompts = EditorEditBlockPrompts()

aider/coders/editor_editblock_prompts.py

@@ -0,0 +1,16 @@
+# flake8: noqa: E501
+
+from .editblock_prompts import EditBlockPrompts
+
+
+class EditorEditBlockPrompts(EditBlockPrompts):
+    main_system = """Act as an expert software developer who edits source code.
+{lazy_prompt}
+Describe each change with a *SEARCH/REPLACE block* per the examples below.
+All changes to files must use this *SEARCH/REPLACE block* format.
+ONLY EVER RETURN CODE IN A *SEARCH/REPLACE BLOCK*!
+"""
+
+    shell_cmd_prompt = ""
+    no_shell_cmd_prompt = ""
+    shell_cmd_reminder = ""

aider/coders/editor_whole_coder.py

@@ -0,0 +1,7 @@
+from .editor_whole_prompts import EditorWholeFilePrompts
+from .wholefile_coder import WholeFileCoder
+
+
+class EditorWholeFileCoder(WholeFileCoder):
+    edit_format = "editor-whole"
+    gpt_prompts = EditorWholeFilePrompts()

aider/coders/editor_whole_prompts.py

@@ -0,0 +1,10 @@
+# flake8: noqa: E501
+
+from .wholefile_prompts import WholeFilePrompts
+
+
+class EditorWholeFilePrompts(WholeFilePrompts):
+    main_system = """Act as an expert software developer and make changes to source code.
+{lazy_prompt}
+Output a copy of each file that needs changes.
+"""

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_coder.py

@@ -58,6 +58,8 @@ class WholeFileCoder(Coder):
                     fname = fname.strip("*")  # handle **filename.py**
                     fname = fname.rstrip(":")
                     fname = fname.strip("`")
+                    fname = fname.lstrip("#")
+                    fname = fname.strip()
 
                     # Issue #1232
                     if len(fname) > 250:

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,15 +1,20 @@
+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
 from PIL import Image, ImageGrab
+from prompt_toolkit.completion import Completion, PathCompleter
+from prompt_toolkit.document import Document
 
 from aider import models, prompts, voice
+from aider.editor import pipe_editor
 from aider.format_settings import format_settings
 from aider.help import Help, install_help_extra
 from aider.llm import litellm
@@ -41,7 +46,15 @@ class Commands:
         )
 
     def __init__(
-        self, io, coder, voice_language=None, verify_ssl=True, args=None, parser=None, verbose=False
+        self,
+        io,
+        coder,
+        voice_language=None,
+        verify_ssl=True,
+        args=None,
+        parser=None,
+        verbose=False,
+        editor=None,
     ):
         self.io = io
         self.coder = coder
@@ -56,6 +69,7 @@ class Commands:
         self.voice_language = voice_language
 
         self.help = None
+        self.editor = editor
 
     def cmd_model(self, args):
         "Switch to a new LLM"
@@ -135,7 +149,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()
@@ -154,15 +168,28 @@ 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 "/!"
 
+    def get_raw_completions(self, cmd):
+        assert cmd.startswith("/")
+        cmd = cmd[1:]
+        cmd = cmd.replace("-", "_")
+
+        raw_completer = getattr(self, f"completions_raw_{cmd}", None)
+        return raw_completer
+
     def get_completions(self, cmd):
         assert cmd.startswith("/")
         cmd = cmd[1:]
@@ -211,6 +238,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)
@@ -218,9 +246,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:
@@ -569,8 +601,62 @@ class Commands:
             fname = f'"{fname}"'
         return fname
 
-    def completions_read_only(self):
-        return self.completions_add()
+    def completions_raw_read_only(self, document, complete_event):
+        # Get the text before the cursor
+        text = document.text_before_cursor
+
+        # Skip the first word and the space after it
+        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))
+
+        def get_paths():
+            return [self.coder.root] if self.coder.root else None
+
+        path_completer = PathCompleter(
+            get_paths=get_paths,
+            only_directories=False,
+            expanduser=True,
+        )
+
+        # 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)
+            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())
@@ -588,7 +674,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}")
@@ -658,7 +744,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):
@@ -667,8 +753,13 @@ 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_warning(f"{matched_file} is already in the chat")
+                self.io.tool_error(f"{matched_file} is already in the chat as an editable file")
+                continue
             elif abs_file_path in self.coder.abs_read_only_fnames:
                 if self.coder.repo and self.coder.repo.path_in_repo(matched_file):
                     self.coder.abs_read_only_fnames.remove(abs_file_path)
@@ -681,7 +772,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."
@@ -735,7 +828,7 @@ class Commands:
                     self.io.tool_output(f"Removed {matched_file} from the chat")
 
     def cmd_git(self, args):
-        "Run a git command"
+        "Run a git command (output excluded from chat)"
         combined_output = None
         try:
             args = "git " + args
@@ -785,7 +878,6 @@ class Commands:
         exit_status, combined_output = run_cmd(
             args, verbose=self.verbose, error_print=self.io.tool_error
         )
-        instructions = None
 
         if combined_output is None:
             return
@@ -793,36 +885,22 @@ class Commands:
         if add_on_nonzero_exit:
             add = exit_status != 0
         else:
-            self.io.tool_output()
-            response = self.io.prompt_ask(
-                "Add the output to the chat?\n(Y)es/(n)o/message with instructions:",
-            ).strip()
-            self.io.tool_output()
-
-            if response.lower() in ["yes", "y"]:
-                add = True
-            elif response.lower() in ["no", "n"]:
-                add = False
-            else:
-                add = True
-                instructions = response
-                if response.strip():
-                    self.io.user_input(response, log_only=True)
-                    self.io.add_to_input_history(response)
+            add = self.io.confirm_ask("Add command output to the chat?")
 
         if add:
-            for line in combined_output.splitlines():
-                self.io.tool_output(line, log_only=True)
+            num_lines = len(combined_output.strip().splitlines())
+            line_plural = "line" if num_lines == 1 else "lines"
+            self.io.tool_output(f"Added {num_lines} {line_plural} of output to the chat.")
 
             msg = prompts.run_output.format(
                 command=args,
                 output=combined_output,
             )
 
-            if instructions:
-                msg = instructions + "\n\n" + msg
-
-            return msg
+            self.coder.cur_messages += [
+                dict(role="user", content=msg),
+                dict(role="assistant", content="Ok."),
+            ]
 
     def cmd_exit(self, args):
         "Exit the application"
@@ -894,6 +972,7 @@ class Commands:
             self.basic_help()
             return
 
+        self.coder.event("interactive help")
         from aider.coders import Coder
 
         if not self.help:
@@ -945,6 +1024,10 @@ class Commands:
         "Ask for changes to your code"
         return self._generic_chat_command(args, self.coder.main_model.edit_format)
 
+    def cmd_architect(self, args):
+        "Enter architect mode to discuss high-level design and architecture"
+        return self._generic_chat_command(args, "architect")
+
     def _generic_chat_command(self, args, edit_format):
         if not args.strip():
             self.io.tool_error(f"Please provide a question or topic for the {edit_format} chat.")
@@ -997,7 +1080,7 @@ class Commands:
                 self.io.tool_error("To use /voice you must provide an OpenAI API key.")
                 return
             try:
-                self.voice = voice.Voice()
+                self.voice = voice.Voice(audio_format=self.args.voice_format)
             except voice.SoundDeviceError:
                 self.io.tool_error(
                     "Unable to import `sounddevice` and/or `soundfile`, is portaudio installed?"
@@ -1035,8 +1118,9 @@ class Commands:
 
         return text
 
-    def cmd_clipboard(self, args):
-        "Add image/text from the clipboard to the chat (optionally provide a name for the image)"
+    def cmd_paste(self, args):
+        """Paste image/text from the clipboard into the chat.\
+        Optionally provide a name for the image."""
         try:
             # Check for image first
             image = ImageGrab.grabclipboard()
@@ -1091,27 +1175,50 @@ 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 abs_path in self.coder.abs_fnames:
-            self.io.tool_error(f"{original_name} is already in the chat as an editable file")
-        elif abs_path in self.coder.abs_read_only_fnames:
+        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
+        elif abs_path in self.coder.abs_fnames:
+            self.coder.abs_fnames.remove(abs_path)
+            self.coder.abs_read_only_fnames.add(abs_path)
+            self.io.tool_output(
+                f"Moved {original_name} from editable to read-only files in the chat"
+            )
         else:
             self.coder.abs_read_only_fnames.add(abs_path)
             self.io.tool_output(f"Added {original_name} to read-only files.")
@@ -1152,7 +1259,93 @@ 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"
+        all_messages = self.coder.done_messages + self.coder.cur_messages
+        assistant_messages = [msg for msg in reversed(all_messages) if msg["role"] == "assistant"]
+
+        if not assistant_messages:
+            self.io.tool_error("No assistant messages found to copy.")
+            return
+
+        last_assistant_message = assistant_messages[0]["content"]
+
+        try:
+            pyperclip.copy(last_assistant_message)
+            preview = (
+                last_assistant_message[:50] + "..."
+                if len(last_assistant_message) > 50
+                else last_assistant_message
+            )
+            self.io.tool_output(f"Copied last assistant message to clipboard. Preview: {preview}")
+        except pyperclip.PyperclipException as e:
+            self.io.tool_error(f"Failed to copy to clipboard: {str(e)}")
+            self.io.tool_output(
+                "You may need to install xclip or xsel on Linux, or pbcopy on macOS."
+            )
+        except Exception as e:
+            self.io.tool_error(f"An unexpected error occurred while copying to clipboard: {str(e)}")
 
     def cmd_report(self, args):
         "Report a problem by opening a GitHub Issue"
@@ -1168,6 +1361,13 @@ class Commands:
 
         report_github_issue(issue_text, title=title, confirm=False)
 
+    def cmd_editor(self, initial_content=""):
+        "Open an editor to write a prompt"
+
+        user_input = pipe_editor(initial_content, suffix="md", editor=self.editor)
+        if user_input.strip():
+            self.io.set_placeholder(user_input.rstrip())
+
 
 def expand_subdir(file_path):
     if file_path.is_file():

aider/diffs.py

@@ -50,7 +50,6 @@ def diff_partial_update(lines_orig, lines_updated, final=False, fname=None):
     # dump(lines_orig)
     # dump(lines_updated)
 
-    assert_newlines(lines_orig)
     assert_newlines(lines_orig)
 
     num_orig_lines = len(lines_orig)

aider/editor.py

@@ -0,0 +1,146 @@
+"""
+Editor module for handling system text editor interactions.
+
+This module provides functionality to:
+- Discover and launch the system's configured text editor
+- Create and manage temporary files for editing
+- Handle editor preferences from environment variables
+- Support cross-platform editor operations
+"""
+
+import os
+import platform
+import shlex
+import subprocess
+import tempfile
+
+from rich.console import Console
+
+DEFAULT_EDITOR_NIX = "vi"
+DEFAULT_EDITOR_OS_X = "vim"
+DEFAULT_EDITOR_WINDOWS = "notepad"
+
+console = Console()
+
+
+def print_status_message(success, message, style=None):
+    """
+    Print a status message with appropriate styling.
+
+    :param success: Whether the operation was successful
+    :param message: The message to display
+    :param style: Optional style override. If None, uses green for success and red for failure
+    """
+    if style is None:
+        style = "bold green" if success else "bold red"
+    console.print(message, style=style)
+    print("")
+
+
+def write_temp_file(
+    input_data="",
+    suffix=None,
+    prefix=None,
+    dir=None,
+):
+    """
+    Create a temporary file with the given input data.
+
+    :param input_data: Content to write to the temporary file
+    :param suffix: Optional file extension (without the dot)
+    :param prefix: Optional prefix for the temporary filename
+    :param dir: Optional directory to create the file in
+    :return: Path to the created temporary file
+    :raises: OSError if file creation or writing fails
+    """
+    kwargs = {"prefix": prefix, "dir": dir}
+    if suffix:
+        kwargs["suffix"] = f".{suffix}"
+    fd, filepath = tempfile.mkstemp(**kwargs)
+    try:
+        with os.fdopen(fd, "w") as f:
+            f.write(input_data)
+    except Exception:
+        os.close(fd)
+        raise
+    return filepath
+
+
+def get_environment_editor(default=None):
+    """
+    Fetches the preferred editor from the environment variables.
+
+    This function checks the following environment variables in order to
+    determine the user's preferred editor:
+
+     - VISUAL
+     - EDITOR
+
+    :param default: The default editor to return if no environment variable is set.
+    :type default: str or None
+    :return: The preferred editor as specified by environment variables or the default value.
+    :rtype: str or None
+    """
+    editor = os.environ.get("VISUAL", os.environ.get("EDITOR", default))
+    return editor
+
+
+def discover_editor(editor_override=None):
+    """
+    Discovers and returns the appropriate editor command as a list of arguments.
+
+    Handles cases where the editor command includes arguments, including quoted arguments
+    with spaces (e.g. 'vim -c "set noswapfile"').
+
+    :return: A list of command parts ready for subprocess execution
+    :rtype: list[str]
+    """
+    system = platform.system()
+    if system == "Windows":
+        default_editor = DEFAULT_EDITOR_WINDOWS
+    elif system == "Darwin":
+        default_editor = DEFAULT_EDITOR_OS_X
+    else:
+        default_editor = DEFAULT_EDITOR_NIX
+    if editor_override:
+        editor = editor_override
+    else:
+        editor = get_environment_editor(default_editor)
+    try:
+        return shlex.split(editor)
+    except ValueError as e:
+        raise RuntimeError(f"Invalid editor command format '{editor}': {e}")
+
+
+def pipe_editor(input_data="", suffix=None, editor=None):
+    """
+    Opens the system editor with optional input data and returns the edited content.
+
+    This function creates a temporary file with the provided input data, opens it in
+    the system editor, waits for the user to make changes and close the editor, then
+    reads and returns the modified content. The temporary file is deleted afterwards.
+
+    :param input_data: Initial content to populate the editor with
+    :type input_data: str
+    :param suffix: Optional file extension for the temporary file (e.g. '.txt', '.md')
+    :type suffix: str or None
+    :return: The edited content after the editor is closed
+    :rtype: str
+    """
+    filepath = write_temp_file(input_data, suffix)
+    command_parts = discover_editor(editor)
+    command_parts.append(filepath)
+    subprocess.call(command_parts)
+    with open(filepath, "r") as f:
+        output_data = f.read()
+    try:
+        os.remove(filepath)
+    except PermissionError:
+        print_status_message(
+            False,
+            (
+                f"WARNING: Unable to delete temporary file {filepath!r}. You may need to delete it"
+                " manually."
+            ),
+        )
+    return output_data

aider/exceptions.py

@@ -0,0 +1,81 @@
+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),
+    ExInfo(
+        "Timeout",
+        True,
+        "The API provider timed out without returning a response. They may be down or overloaded.",
+    ),
+]
+
+
+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

@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 
+import json
 import os
+import shutil
 import warnings
 from pathlib import Path
 
@@ -38,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():
@@ -69,12 +92,17 @@ def get_index():
 
     dname = Path.home() / ".aider" / "caches" / ("help." + __version__)
 
-    if dname.exists():
-        storage_context = StorageContext.from_defaults(
-            persist_dir=dname,
-        )
-        index = load_index_from_storage(storage_context)
-    else:
+    index = None
+    try:
+        if dname.exists():
+            storage_context = StorageContext.from_defaults(
+                persist_dir=dname,
+            )
+            index = load_index_from_storage(storage_context)
+    except (OSError, json.JSONDecodeError):
+        shutil.rmtree(dname)
+
+    if index is None:
         parser = MarkdownNodeParser()
 
         nodes = []

aider/help_pats.py

@@ -7,4 +7,5 @@ exclude_website_pats = [
     "docs/unified-diffs.md",
     "docs/leaderboards/index.md",
     "assets/**",
+    "**/.DS_Store",
 ]

aider/history.py

@@ -109,7 +109,7 @@ class ChatSummary:
         for model in self.models:
             try:
                 summary = simple_send_with_retries(
-                    model.name, summarize_messages, extra_headers=model.extra_headers
+                    model.name, summarize_messages, extra_params=model.extra_params
                 )
                 if summary is not None:
                     summary = prompts.summary_prefix + summary

aider/io.py

@@ -1,11 +1,15 @@
 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
+from prompt_toolkit.cursor_shapes import ModalCursorShapeConfig
 from prompt_toolkit.enums import EditingMode
 from prompt_toolkit.history import FileHistory
 from prompt_toolkit.key_binding import KeyBindings
@@ -14,10 +18,12 @@ 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
 from rich.text import Text
-from rich.markdown import Markdown
+
 from aider.mdstream import MarkdownStream
 
 from .dump import dump  # noqa: F401
@@ -91,17 +97,16 @@ class AutoCompleter(Completer):
                 (token[1], f"`{token[1]}`") for token in tokens if token[0] in Token.Name
             )
 
-    def get_command_completions(self, text, words):
-        candidates = []
+    def get_command_completions(self, document, complete_event, text, words):
         if len(words) == 1 and not text[-1].isspace():
             partial = words[0].lower()
             candidates = [cmd for cmd in self.command_names if cmd.startswith(partial)]
-            return candidates
+            for candidate in sorted(candidates):
+                yield Completion(candidate, start_position=-len(words[-1]))
+            return
 
-        if len(words) <= 1:
-            return []
-        if text[-1].isspace():
-            return []
+        if len(words) <= 1 or text[-1].isspace():
+            return
 
         cmd = words[0]
         partial = words[-1].lower()
@@ -112,6 +117,11 @@ class AutoCompleter(Completer):
         elif cmd not in matches:
             return
 
+        raw_completer = self.commands.get_raw_completions(cmd)
+        if raw_completer:
+            yield from raw_completer(document, complete_event)
+            return
+
         if cmd not in self.command_completions:
             candidates = self.commands.get_completions(cmd)
             self.command_completions[cmd] = candidates
@@ -122,7 +132,8 @@ class AutoCompleter(Completer):
             return
 
         candidates = [word for word in candidates if partial in word.lower()]
-        return candidates
+        for candidate in sorted(candidates):
+            yield Completion(candidate, start_position=-len(words[-1]))
 
     def get_completions(self, document, complete_event):
         self.tokenize()
@@ -137,11 +148,8 @@ class AutoCompleter(Completer):
             return
 
         if text[0] == "/":
-            candidates = self.get_command_completions(text, words)
-            if candidates is not None:
-                for candidate in sorted(candidates):
-                    yield Completion(candidate, start_position=-len(words[-1]))
-                return
+            yield from self.get_command_completions(document, complete_event, text, words)
+            return
 
         candidates = self.words
         candidates.update(set(self.fname_to_rel_fnames))
@@ -179,12 +187,19 @@ class InputOutput:
         tool_error_color="red",
         tool_warning_color="#FFA500",
         assistant_output_color="blue",
+        completion_menu_color=None,
+        completion_menu_bg_color=None,
+        completion_menu_current_color=None,
+        completion_menu_current_bg_color=None,
         code_theme="default",
         encoding="utf-8",
         dry_run=False,
         llm_history_file=None,
         editingmode=EditingMode.EMACS,
+        fancy_input=True,
     ):
+        self.placeholder = None
+        self.never_prompts = set()
         self.editingmode = editingmode
         no_color = os.environ.get("NO_COLOR")
         if no_color is not None and no_color != "":
@@ -195,6 +210,11 @@ class InputOutput:
         self.tool_error_color = tool_error_color if pretty else None
         self.tool_warning_color = tool_warning_color if pretty else None
         self.assistant_output_color = assistant_output_color
+        self.completion_menu_color = completion_menu_color if pretty else None
+        self.completion_menu_bg_color = completion_menu_bg_color if pretty else None
+        self.completion_menu_current_color = completion_menu_current_color if pretty else None
+        self.completion_menu_current_bg_color = completion_menu_current_bg_color if pretty else None
+
         self.code_theme = code_theme
 
         self.input = input
@@ -220,7 +240,7 @@ 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,
@@ -228,6 +248,8 @@ class InputOutput:
                 "lexer": PygmentsLexer(MarkdownLexer),
                 "editing_mode": self.editingmode,
             }
+            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:
@@ -239,6 +261,41 @@ class InputOutput:
         else:
             self.console = Console(force_terminal=False, no_color=True)  # non-pretty
 
+    def _get_style(self):
+        style_dict = {}
+        if not self.pretty:
+            return Style.from_dict(style_dict)
+
+        if self.user_input_color:
+            style_dict.setdefault("", self.user_input_color)
+            style_dict.update(
+                {
+                    "pygments.literal.string": f"bold italic {self.user_input_color}",
+                }
+            )
+
+        # Conditionally add 'completion-menu' style
+        completion_menu_style = []
+        if self.completion_menu_bg_color:
+            completion_menu_style.append(f"bg:{self.completion_menu_bg_color}")
+        if self.completion_menu_color:
+            completion_menu_style.append(self.completion_menu_color)
+        if completion_menu_style:
+            style_dict["completion-menu"] = " ".join(completion_menu_style)
+
+        # Conditionally add 'completion-menu.completion.current' style
+        completion_menu_current_style = []
+        if self.completion_menu_current_bg_color:
+            completion_menu_current_style.append(f"bg:{self.completion_menu_current_bg_color}")
+        if self.completion_menu_current_color:
+            completion_menu_current_style.append(self.completion_menu_current_color)
+        if completion_menu_current_style:
+            style_dict["completion-menu.completion.current"] = " ".join(
+                completion_menu_current_style
+            )
+
+        return Style.from_dict(style_dict)
+
     def read_image(self, filename):
         try:
             with open(str(filename), "rb") as image_file:
@@ -278,14 +335,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:
@@ -308,7 +387,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 += "> "
@@ -316,15 +398,7 @@ class InputOutput:
         inp = ""
         multiline_input = False
 
-        if self.user_input_color and self.pretty:
-            style = Style.from_dict(
-                {
-                    "": self.user_input_color,
-                    "pygments.literal.string": f"bold italic {self.user_input_color}",
-                }
-            )
-        else:
-            style = None
+        style = self._get_style()
 
         completer_instance = ThreadedCompleter(
             AutoCompleter(
@@ -339,6 +413,11 @@ class InputOutput:
 
         kb = KeyBindings()
 
+        @kb.add("c-space")
+        def _(event):
+            "Ignore Ctrl when pressing space bar"
+            event.current_buffer.insert_text(" ")
+
         @kb.add("escape", "c-m", eager=True)
         def _(event):
             event.current_buffer.insert_text("\n")
@@ -349,8 +428,13 @@ class InputOutput:
 
             try:
                 if self.prompt_session:
+                    # Use placeholder if set, then clear it
+                    default = self.placeholder or ""
+                    self.placeholder = None
+
                     line = self.prompt_session.prompt(
                         show,
+                        default=default,
                         completer=completer_instance,
                         reserve_space_for_menu=4,
                         complete_style=CompleteStyle.MULTI_COLUMN,
@@ -363,13 +447,38 @@ class InputOutput:
                 self.tool_error(str(err))
                 return ""
 
-            if line and line[0] == "{" and not multiline_input:
-                multiline_input = True
-                inp += line[1:] + "\n"
+            if line.strip("\r\n") and not multiline_input:
+                stripped = line.strip("\r\n")
+                if stripped == "{":
+                    multiline_input = True
+                    multiline_tag = None
+                    inp += ""
+                elif stripped[0] == "{":
+                    # Extract tag if it exists (only alphanumeric chars)
+                    tag = "".join(c for c in stripped[1:] if c.isalnum())
+                    if stripped == "{" + tag:
+                        multiline_input = True
+                        multiline_tag = tag
+                        inp += ""
+                    else:
+                        inp = line
+                        break
+                else:
+                    inp = line
+                    break
                 continue
-            elif line and line[-1] == "}" and multiline_input:
-                inp += line[:-1] + "\n"
-                break
+            elif multiline_input and line.strip():
+                if multiline_tag:
+                    # Check if line is exactly "tag}"
+                    if line.strip("\r\n") == f"{multiline_tag}}}":
+                        break
+                    else:
+                        inp += line + "\n"
+                # Check if line is exactly "}"
+                elif line.strip("\r\n") == "}":
+                    break
+                else:
+                    inp += line + "\n"
             elif multiline_input:
                 inp += line + "\n"
             else:
@@ -385,8 +494,8 @@ class InputOutput:
             return
         FileHistory(self.input_history_file).append_string(inp)
         # Also add to the in-memory history if it exists
-        if hasattr(self, "session") and hasattr(self.session, "history"):
-            self.session.history.append_string(inp)
+        if self.prompt_session and self.prompt_session.history:
+            self.prompt_session.history.append_string(inp)
 
     def get_input_history(self):
         if not self.input_history_file:
@@ -403,14 +512,17 @@ class InputOutput:
             log_file.write(f"{role.upper()} {timestamp}\n")
             log_file.write(content + "\n")
 
+    def display_user_input(self, inp):
+        if self.pretty and self.user_input_color:
+            style = dict(style=self.user_input_color)
+        else:
+            style = dict()
+
+        self.console.print(Text(inp), **style)
+
     def user_input(self, inp, log_only=True):
         if not log_only:
-            if self.pretty and self.user_input_color:
-                style = dict(style=self.user_input_color)
-            else:
-                style = dict()
-
-            self.console.print(Text(inp), **style)
+            self.display_user_input(inp)
 
         prefix = "####"
         if inp:
@@ -430,13 +542,35 @@ class InputOutput:
         hist = "\n" + content.strip() + "\n\n"
         self.append_chat_history(hist)
 
+    def offer_url(self, url, prompt="Open URL for more info?", allow_never=True):
+        """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=allow_never):
+            webbrowser.open(url)
+            return True
+        return False
+
     def confirm_ask(
-        self, question, default="y", subject=None, explicit_yes_required=False, group=None
+        self,
+        question,
+        default="y",
+        subject=None,
+        explicit_yes_required=False,
+        group=None,
+        allow_never=False,
     ):
         self.num_user_asks += 1
 
+        question_id = (question, subject)
+
+        if question_id in self.never_prompts:
+            return False
+
         if group and not group.show_group:
             group = None
+        if group:
+            allow_never = True
 
         valid_responses = ["yes", "no"]
         options = " (Y)es/(N)o"
@@ -446,6 +580,10 @@ class InputOutput:
                 valid_responses.append("all")
             options += "/(S)kip all"
             valid_responses.append("skip")
+        if allow_never:
+            options += "/(D)on't ask again"
+            valid_responses.append("don't")
+
         question += options + " [Yes]: "
 
         if subject:
@@ -459,10 +597,7 @@ class InputOutput:
             else:
                 self.tool_output(subject, bold=True)
 
-        if self.pretty and self.user_input_color:
-            style = {"": self.user_input_color}
-        else:
-            style = dict()
+        style = self._get_style()
 
         def is_valid_response(text):
             if not text:
@@ -481,7 +616,7 @@ class InputOutput:
                 if self.prompt_session:
                     res = self.prompt_session.prompt(
                         question,
-                        style=Style.from_dict(style),
+                        style=style,
                     )
                 else:
                     res = input(question)
@@ -499,6 +634,12 @@ class InputOutput:
 
         res = res.lower()[0]
 
+        if res == "d" and allow_never:
+            self.never_prompts.add(question_id)
+            hist = f"{question.strip()} {res}"
+            self.append_chat_history(hist, linebreak=True, blockquote=True)
+            return False
+
         if explicit_yes_required:
             is_yes = res == "y"
         else:
@@ -525,10 +666,7 @@ class InputOutput:
             self.tool_output()
             self.tool_output(subject, bold=True)
 
-        if self.pretty and self.user_input_color:
-            style = Style.from_dict({"": self.user_input_color})
-        else:
-            style = None
+        style = self._get_style()
 
         if self.yes is True:
             res = "yes"
@@ -586,27 +724,34 @@ class InputOutput:
         style = RichStyle(**style)
         self.console.print(*messages, style=style)
 
-    def assistant_output(self, message, stream=False):
-        mdStream = None
+    def get_assistant_mdstream(self):
+        mdargs = dict(style=self.assistant_output_color, code_theme=self.code_theme)
+        mdStream = MarkdownStream(mdargs=mdargs)
+        return mdStream
+
+    def assistant_output(self, message, pretty=None):
         show_resp = message
-        
-        if self.pretty:
-            if stream:
-                mdargs = dict(style=self.assistant_output_color, code_theme=self.code_theme)
-                mdStream = MarkdownStream(mdargs=mdargs)
-            else:
-                show_resp = Markdown(
-                    message, style=self.assistant_output_color, code_theme=self.code_theme
-                )
+
+        # Coder will force pretty off if fence is not triple-backticks
+        if pretty is None:
+            pretty = self.pretty
+
+        if pretty:
+            show_resp = Markdown(
+                message, style=self.assistant_output_color, code_theme=self.code_theme
+            )
         else:
             show_resp = Text(message or "<no response>")
 
         self.console.print(show_resp)
-        return mdStream
-        
+
+    def set_placeholder(self, placeholder):
+        """Set a one-time placeholder text for the next input prompt."""
+        self.placeholder = placeholder
+
     def print(self, message=""):
         print(message)
-        
+
     def append_chat_history(self, text, linebreak=False, blockquote=False, strip=True):
         if blockquote:
             if strip:
@@ -620,11 +765,57 @@ class InputOutput:
             text += "\n"
         if self.chat_history_file is not None:
             try:
-                with self.chat_history_file.open("a", encoding=self.encoding) as f:
+                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

@@ -83,7 +83,11 @@ class Linter:
 
     def lint(self, fname, cmd=None):
         rel_fname = self.get_rel_fname(fname)
-        code = Path(fname).read_text(encoding=self.encoding, errors="replace")
+        try:
+            code = Path(fname).read_text(encoding=self.encoding, errors="replace")
+        except OSError as err:
+            print(f"Unable to read {fname}: {err}")
+            return
 
         if cmd:
             cmd = cmd.strip()
@@ -211,13 +215,18 @@ def basic_lint(fname, code):
 
     try:
         parser = get_parser(lang)
-    except OSError as err:
+    except Exception as err:
         print(f"Unable to load parser: {err}")
         return
 
     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

@@ -5,20 +5,26 @@ import re
 import sys
 import threading
 import traceback
+import webbrowser
+from dataclasses import fields
 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.coders.base_coder import UnknownEditFormat
 from aider.commands import Commands, SwitchCoder
 from aider.format_settings import format_settings, scrub_sensitive_info
 from aider.history import ChatSummary
 from aider.io import InputOutput
 from aider.llm import litellm  # noqa: F401; properly init litellm on launch
+from aider.models import ModelSettings
 from aider.repo import ANY_GIT_ERROR, GitRepo
 from aider.report import report_uncaught_exceptions
 from aider.versioncheck import check_version, install_from_main_branch, install_upgrade
@@ -26,6 +32,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 +63,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 +91,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 +147,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 +209,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 +260,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:
@@ -266,7 +316,7 @@ def register_models(git_root, model_settings_fname, io, verbose=False):
     return None
 
 
-def load_dotenv_files(git_root, dotenv_fname):
+def load_dotenv_files(git_root, dotenv_fname, encoding="utf-8"):
     dotenv_files = generate_search_path_list(
         ".env",
         git_root,
@@ -274,14 +324,25 @@ def load_dotenv_files(git_root, dotenv_fname):
     )
     loaded = []
     for fname in dotenv_files:
-        if Path(fname).exists():
-            loaded.append(fname)
-            load_dotenv(fname, override=True)
+        try:
+            if Path(fname).exists():
+                load_dotenv(fname, override=True, encoding=encoding)
+                loaded.append(fname)
+        except OSError as e:
+            print(f"OSError loading {fname}: {e}")
+        except Exception as e:
+            print(f"Error loading {fname}: {e}")
     return loaded
 
 
 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
     )
 
@@ -304,6 +365,7 @@ def sanity_check_repo(repo, io):
         io.tool_error("The git repo does not seem to have a working tree?")
         return False
 
+    bad_ver = False
     try:
         repo.get_tracked_files()
         if not repo.git_repo_error:
@@ -320,7 +382,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?")
@@ -341,7 +403,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:
@@ -350,7 +417,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:")
@@ -361,19 +434,26 @@ 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
-    loaded_dotenvs = load_dotenv_files(git_root, args.env_file)
+    loaded_dotenvs = load_dotenv_files(git_root, args.env_file, args.encoding)
 
     # 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
 
+        os.environ["SSL_VERIFY"] = ""
         litellm._load_litellm()
         litellm._lazy_module.client_session = httpx.Client(verify=False)
+        litellm._lazy_module.aclient_session = httpx.AsyncClient(verify=False)
 
     if args.dark_mode:
         args.user_input_color = "#32FF32"
@@ -389,28 +469,34 @@ 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,
             output=output,
             user_input_color=args.user_input_color,
             tool_output_color=args.tool_output_color,
+            tool_warning_color=args.tool_warning_color,
             tool_error_color=args.tool_error_color,
+            completion_menu_color=args.completion_menu_color,
+            completion_menu_bg_color=args.completion_menu_bg_color,
+            completion_menu_current_color=args.completion_menu_current_color,
+            completion_menu_current_bg_color=args.completion_menu_current_bg_color,
             assistant_output_color=args.assistant_output_color,
             code_theme=args.code_theme,
             dry_run=args.dry_run,
             encoding=args.encoding,
             llm_history_file=args.llm_history_file,
             editingmode=editing_mode,
+            fancy_input=args.fancy_input,
         )
 
     io = get_io(args.pretty)
@@ -422,9 +508,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 is not False:
+        if analytics.need_to_ask(args.analytics):
+            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
 
@@ -434,7 +546,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:
@@ -497,7 +616,8 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     cmd_line = scrub_sensitive_info(args, cmd_line)
     io.tool_output(cmd_line, log_only=True)
 
-    check_and_load_imports(io, verbose=args.verbose)
+    is_first_run = is_first_run_of_new_version(io, verbose=args.verbose)
+    check_and_load_imports(io, is_first_run, verbose=args.verbose)
 
     if args.anthropic_api_key:
         os.environ["ANTHROPIC_API_KEY"] = args.anthropic_api_key
@@ -516,17 +636,40 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     register_models(git_root, args.model_settings_file, io, verbose=args.verbose)
     register_litellm_models(git_root, args.model_metadata_file, io, verbose=args.verbose)
 
+    # Process any command line aliases
+    if args.alias:
+        for alias_def in args.alias:
+            # Split on first colon only
+            parts = alias_def.split(":", 1)
+            if len(parts) != 2:
+                io.tool_error(f"Invalid alias format: {alias_def}")
+                io.tool_output("Format should be: alias:model-name")
+                return 1
+            alias, model = parts
+            models.MODEL_ALIASES[alias.strip()] = model.strip()
+
     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, weak_model=args.weak_model)
+    main_model = models.Model(
+        args.model,
+        weak_model=args.weak_model,
+        editor_model=args.editor_model,
+        editor_edit_format=args.editor_edit_format,
+    )
 
     if args.verbose:
-        io.tool_output("Model info:")
+        io.tool_output("Model metadata:")
         io.tool_output(json.dumps(main_model.info, indent=4))
 
+        io.tool_output("Model settings:")
+        for attr in sorted(fields(ModelSettings), key=lambda x: x.name):
+            val = getattr(main_model, attr.name)
+            val = json.dumps(val, indent=4)
+            io.tool_output(f"{attr.name}: {val}")
+
     lint_cmds = parse_lint_cmds(args.lint_cmd, io)
     if lint_cmds is None:
         return 1
@@ -534,11 +677,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
 
@@ -561,11 +705,18 @@ 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
+        io,
+        None,
+        verify_ssl=args.verify_ssl,
+        args=args,
+        parser=parser,
+        verbose=args.verbose,
+        editor=args.editor,
     )
 
     summarizer = ChatSummary(
@@ -579,7 +730,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
     if not main_model.streaming:
         if args.stream:
             io.tool_warning(
-                "Warning: Streaming is not supported by the selected model. Disabling streaming."
+                f"Warning: Streaming is not supported by {main_model.name}. Disabling streaming."
             )
         args.stream = False
 
@@ -606,13 +757,19 @@ 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,
             num_cache_warming_pings=args.cache_keepalive_pings,
             suggest_shell_commands=args.suggest_shell_commands,
             chat_language=args.chat_language,
+            detect_urls=args.detect_urls,
         )
+    except UnknownEditFormat as err:
+        io.tool_error(str(err))
+        io.offer_url(urls.edit_formats, "Open documentation about edit formats?")
+        return 1
     except ValueError as err:
         io.tool_error(str(err))
         return 1
@@ -664,12 +821,28 @@ 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.")
 
     io.tool_output('Use /help <question> for help, run "aider --help" to see cmd line args')
 
+    if args.show_release_notes is True:
+        io.tool_output(f"Opening release notes: {urls.release_notes}")
+        io.tool_output()
+        webbrowser.open(urls.release_notes)
+    elif args.show_release_notes is None and is_first_run:
+        io.tool_output()
+        io.offer_url(
+            urls.release_notes,
+            "Would you like to see what's new in this version?",
+            allow_never=False,
+        )
+
     if git_root and Path.cwd().resolve() != Path(git_root).resolve():
         io.tool_warning(
             "Note: in-chat filenames are always relative to the git working dir, not the current"
@@ -679,6 +852,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()
@@ -704,6 +880,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()
@@ -720,7 +898,8 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
                 coder.show_announcements()
 
 
-def check_and_load_imports(io, verbose=False):
+def is_first_run_of_new_version(io, verbose=False):
+    """Check if this is the first run of a new version/executable combination"""
     installs_file = Path.home() / ".aider" / "installs.json"
     key = (__version__, sys.executable)
 
@@ -741,7 +920,26 @@ def check_and_load_imports(io, verbose=False):
             if verbose:
                 io.tool_output("Installs file does not exist, creating new dictionary")
 
-        if str(key) not in installs:
+        is_first_run = str(key) not in installs
+
+        if is_first_run:
+            installs[str(key)] = True
+            installs_file.parent.mkdir(parents=True, exist_ok=True)
+            with open(installs_file, "w") as f:
+                json.dump(installs, f, indent=4)
+
+        return is_first_run
+
+    except Exception as e:
+        io.tool_warning(f"Error checking version: {e}")
+        if verbose:
+            io.tool_output(f"Full exception details: {traceback.format_exc()}")
+        return True  # Safer to assume it's a first run if we hit an error
+
+
+def check_and_load_imports(io, is_first_run, verbose=False):
+    try:
+        if is_first_run:
             if verbose:
                 io.tool_output(
                     "First run for this version and executable, loading imports synchronously"
@@ -751,13 +949,9 @@ 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
-            installs_file.parent.mkdir(parents=True, exist_ok=True)
-            with open(installs_file, "w") as f:
-                json.dump(installs, f, indent=4)
             if verbose:
                 io.tool_output("Imports loaded and installs file updated")
         else:
@@ -766,8 +960,9 @@ def check_and_load_imports(io, verbose=False):
             thread = threading.Thread(target=load_slow_imports)
             thread.daemon = True
             thread.start()
+
     except Exception as e:
-        io.tool_warning(f"Error in checking imports: {e}")
+        io.tool_warning(f"Error in loading imports: {e}")
         if verbose:
             io.tool_output(f"Full exception details: {traceback.format_exc()}")
 

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,13 +52,32 @@ 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()]
 
+# Mapping of model aliases to their canonical names
+MODEL_ALIASES = {
+    # Claude models
+    "sonnet": "claude-3-5-sonnet-20241022",
+    "haiku": "claude-3-5-haiku-20241022",
+    "opus": "claude-3-opus-20240229",
+    # GPT models
+    "4": "gpt-4-0613",
+    "4o": "gpt-4o-2024-08-06",
+    "4-turbo": "gpt-4-1106-preview",
+    "35turbo": "gpt-3.5-turbo",
+    "35-turbo": "gpt-3.5-turbo",
+    "3": "gpt-3.5-turbo",
+    # Other models
+    "deepseek": "deepseek/deepseek-coder",
+}
+
 
 @dataclass
 class ModelSettings:
@@ -69,17 +87,17 @@ 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
-    extra_headers: Optional[dict] = None
-    max_tokens: Optional[int] = None
+    extra_params: Optional[dict] = None
     cache_control: bool = False
     caches_by_default: bool = False
     use_system_prompt: bool = True
     use_temperature: bool = True
     streaming: bool = True
+    editor_model_name: Optional[str] = None
+    editor_edit_format: Optional[str] = None
 
 
 # https://platform.openai.com/docs/models/gpt-4-and-gpt-4-turbo
@@ -124,7 +142,6 @@ MODEL_SETTINGS = [
         "udiff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -133,7 +150,6 @@ MODEL_SETTINGS = [
         "udiff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -142,16 +158,15 @@ 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",
     ),
     ModelSettings(
         "openai/gpt-4o-2024-08-06",
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -160,7 +175,22 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
+        lazy=True,
+        reminder="sys",
+    ),
+    ModelSettings(
+        "gpt-4o-2024-11-20",
+        "diff",
+        weak_model_name="gpt-4o-mini",
+        use_repo_map=True,
+        lazy=True,
+        reminder="sys",
+    ),
+    ModelSettings(
+        "openai/gpt-4o-2024-11-20",
+        "diff",
+        weak_model_name="gpt-4o-mini",
+        use_repo_map=True,
         lazy=True,
         reminder="sys",
     ),
@@ -169,15 +199,14 @@ 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",
     ),
     ModelSettings(
         "gpt-4o-mini",
         "whole",
         weak_model_name="gpt-4o-mini",
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -185,7 +214,6 @@ MODEL_SETTINGS = [
         "openai/gpt-4o-mini",
         "whole",
         weak_model_name="openai/gpt-4o-mini",
-        accepts_images=True,
         lazy=True,
         reminder="sys",
     ),
@@ -211,7 +239,6 @@ MODEL_SETTINGS = [
         "diff",
         weak_model_name="gpt-4o-mini",
         use_repo_map=True,
-        accepts_images=True,
         reminder="sys",
     ),
     ModelSettings(
@@ -240,30 +267,33 @@ 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,
-        max_tokens=8192,
-        extra_headers={
-            "anthropic-beta": ANTHROPIC_BETA_HEADER,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+            "max_tokens": 8192,
         },
         cache_control=True,
         reminder="user",
@@ -271,12 +301,84 @@ 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,
         examples_as_sys_msg=True,
-        max_tokens=8192,
-        extra_headers={
-            "anthropic-beta": ANTHROPIC_BETA_HEADER,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
+            "max_tokens": 8192,
+        },
+        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",
@@ -286,29 +388,96 @@ MODEL_SETTINGS = [
         "whole",
         weak_model_name="anthropic/claude-3-haiku-20240307",
         examples_as_sys_msg=True,
-        extra_headers={
-            "anthropic-beta": ANTHROPIC_BETA_HEADER,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
         },
         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",
         weak_model_name="claude-3-haiku-20240307",
         examples_as_sys_msg=True,
-        extra_headers={
-            "anthropic-beta": ANTHROPIC_BETA_HEADER,
+        extra_params={
+            "extra_headers": {
+                "anthropic-beta": ANTHROPIC_BETA_HEADER,
+            },
         },
         cache_control=True,
     ),
     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,
-        max_tokens=8192,
+        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,
+        },
         reminder="user",
         cache_control=True,
     ),
@@ -317,23 +486,39 @@ 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,
-        max_tokens=8192,
+        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,
+        },
         reminder="user",
     ),
     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(
@@ -374,6 +559,15 @@ MODEL_SETTINGS = [
         examples_as_sys_msg=True,
     ),
     # Gemini
+    ModelSettings(
+        "gemini/gemini-1.5-pro-002",
+        "diff",
+        use_repo_map=True,
+    ),
+    ModelSettings(
+        "gemini/gemini-1.5-flash-002",
+        "whole",
+    ),
     ModelSettings(
         "gemini/gemini-1.5-pro",
         "diff-fenced",
@@ -389,6 +583,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",
@@ -401,7 +600,9 @@ MODEL_SETTINGS = [
         use_repo_map=True,
         examples_as_sys_msg=True,
         reminder="sys",
-        max_tokens=8192,
+        extra_params={
+            "max_tokens": 8192,
+        },
     ),
     ModelSettings(
         "deepseek/deepseek-coder",
@@ -410,7 +611,9 @@ MODEL_SETTINGS = [
         examples_as_sys_msg=True,
         reminder="sys",
         caches_by_default=True,
-        max_tokens=8192,
+        extra_params={
+            "max_tokens": 8192,
+        },
     ),
     ModelSettings(
         "deepseek-chat",
@@ -418,7 +621,9 @@ MODEL_SETTINGS = [
         use_repo_map=True,
         examples_as_sys_msg=True,
         reminder="sys",
-        max_tokens=8192,
+        extra_params={
+            "max_tokens": 8192,
+        },
     ),
     ModelSettings(
         "deepseek-coder",
@@ -427,7 +632,9 @@ MODEL_SETTINGS = [
         examples_as_sys_msg=True,
         reminder="sys",
         caches_by_default=True,
-        max_tokens=8192,
+        extra_params={
+            "max_tokens": 8192,
+        },
     ),
     ModelSettings(
         "openrouter/deepseek/deepseek-coder",
@@ -441,54 +648,82 @@ 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",
     ),
     ModelSettings(
         "openai/o1-mini",
         "whole",
         weak_model_name="openai/gpt-4o-mini",
+        editor_model_name="openai/gpt-4o",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        reminder="user",
+        use_system_prompt=False,
+        use_temperature=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",
         weak_model_name="gpt-4o-mini",
+        editor_model_name="gpt-4o",
+        editor_edit_format="editor-diff",
         use_repo_map=True,
         reminder="user",
         use_system_prompt=False,
         use_temperature=False,
-        streaming=False,
     ),
     ModelSettings(
         "openai/o1-preview",
         "diff",
         weak_model_name="openai/gpt-4o-mini",
+        editor_model_name="openai/gpt-4o",
+        editor_edit_format="editor-diff",
+        use_repo_map=True,
+        reminder="user",
+        use_system_prompt=False,
+        use_temperature=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",
-        "diff",
+        "architect",
         weak_model_name="gpt-4o-mini",
+        editor_model_name="gpt-4o",
+        editor_edit_format="editor-diff",
         use_repo_map=True,
         reminder="user",
         use_system_prompt=False,
         use_temperature=False,
-        streaming=False,
     ),
     ModelSettings(
         "openrouter/openai/o1-mini",
         "whole",
         weak_model_name="openrouter/openai/gpt-4o-mini",
+        editor_model_name="openrouter/openai/gpt-4o",
+        editor_edit_format="editor-diff",
         use_repo_map=True,
         reminder="user",
         use_system_prompt=False,
@@ -499,92 +734,121 @@ MODEL_SETTINGS = [
         "openrouter/openai/o1-preview",
         "diff",
         weak_model_name="openrouter/openai/gpt-4o-mini",
+        editor_model_name="openrouter/openai/gpt-4o",
+        editor_edit_format="editor-diff",
         use_repo_map=True,
         reminder="user",
         use_system_prompt=False,
         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))
+            try:
+                # Save empty dict to cache file on failure
+                self.cache_file.write_text("{}")
+            except OSError:
+                pass
+
+    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
 
-    # If all else fails, do it the slow way...
-    try:
-        info = litellm.get_model_info(model)
-        return info
-    except Exception:
         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):
+    def __init__(self, model, weak_model=None, editor_model=None, editor_edit_format=None):
+        # Map any alias to its canonical name
+        model = MODEL_ALIASES.get(model, model)
+
         self.name = model
+
         self.max_chat_history_tokens = 1024
         self.weak_model = None
+        self.editor_model = None
+
+        # Find the extra settings
+        self.extra_model_settings = next(
+            (ms for ms in MODEL_SETTINGS if ms.name == "aider/extra_params"), None
+        )
 
         self.info = self.get_model_info(model)
 
@@ -605,20 +869,52 @@ class Model(ModelSettings):
         else:
             self.get_weak_model(weak_model)
 
+        if editor_model is False:
+            self.editor_model_name = None
+        else:
+            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 _copy_fields(self, source):
+        """Helper to copy fields from a ModelSettings instance to self"""
+        for field in fields(ModelSettings):
+            val = getattr(source, field.name)
+            setattr(self, field.name, val)
 
     def configure_model_settings(self, model):
+        # Look for exact model match
+        exact_match = False
         for ms in MODEL_SETTINGS:
             # direct match, or match "provider/<model>"
             if model == ms.name:
-                for field in fields(ModelSettings):
-                    val = getattr(ms, field.name)
-                    setattr(self, field.name, val)
-                return  # <--
+                self._copy_fields(ms)
+                exact_match = True
+                break  # Continue to apply overrides
 
         model = model.lower()
 
+        # If no exact match, try generic settings
+        if not exact_match:
+            self.apply_generic_model_settings(model)
+
+        # Apply override settings last if they exist
+        if self.extra_model_settings and self.extra_model_settings.extra_params:
+            # Initialize extra_params if it doesn't exist
+            if not self.extra_params:
+                self.extra_params = {}
+
+            # Deep merge the extra_params dicts
+            for key, value in self.extra_model_settings.extra_params.items():
+                if isinstance(value, dict) and isinstance(self.extra_params.get(key), dict):
+                    # For nested dicts, merge recursively
+                    self.extra_params[key] = {**self.extra_params[key], **value}
+                else:
+                    # For non-dict values, simply update
+                    self.extra_params[key] = value
+
+    def apply_generic_model_settings(self, model):
         if ("llama3" in model or "llama-3" in model) and "70b" in model:
             self.edit_format = "diff"
             self.use_repo_map = True
@@ -640,16 +936,37 @@ class Model(ModelSettings):
 
         if "gpt-3.5" in model or "gpt-4" in model:
             self.reminder = "sys"
+            return  # <--
 
         if "3.5-sonnet" in model or "3-5-sonnet" in model:
             self.edit_format = "diff"
             self.use_repo_map = True
             self.examples_as_sys_msg = True
-            self.reminder = None
+            self.reminder = "user"
+            return  # <--
+
+        if model.startswith("o1-") or "/o1-" in model:
+            self.use_system_prompt = False
+            self.use_temperature = False
+            return  # <--
+
+        if (
+            "qwen" in model
+            and "coder" in model
+            and ("2.5" in model or "2-5" in model)
+            and "32b" in model
+        ):
+            self.edit_format = "diff"
+            self.editor_edit_format = "editor-diff"
+            self.use_repo_map = True
+            if model.startswith("ollama/") or model.startswith("ollama_chat/"):
+                self.extra_params = dict(num_ctx=8 * 1024)
+            return  # <--
 
         # use the defaults
         if self.edit_format == "diff":
             self.use_repo_map = True
+            return  # <--
 
     def __str__(self):
         return self.name
@@ -676,6 +993,26 @@ class Model(ModelSettings):
     def commit_message_models(self):
         return [self.weak_model, self]
 
+    def get_editor_model(self, provided_editor_model_name, editor_edit_format):
+        # If editor_model_name is provided, override the model settings
+        if provided_editor_model_name:
+            self.editor_model_name = provided_editor_model_name
+        if editor_edit_format:
+            self.editor_edit_format = editor_edit_format
+
+        if not self.editor_model_name or self.editor_model_name == self.name:
+            self.editor_model = self
+        else:
+            self.editor_model = Model(
+                self.editor_model_name,
+                editor_model=False,
+            )
+
+        if not self.editor_edit_format:
+            self.editor_edit_format = self.editor_model.edit_format
+
+        return self.editor_model
+
     def tokenizer(self, text):
         return litellm.encode(model=self.name, text=text)
 
@@ -786,6 +1123,9 @@ def register_models(model_settings_fnames):
         if not os.path.exists(model_settings_fname):
             continue
 
+        if not Path(model_settings_fname).read_text().strip():
+            continue
+
         try:
             with open(model_settings_fname, "r") as model_settings_file:
                 model_settings_list = yaml.safe_load(model_settings_file)
@@ -813,8 +1153,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:
@@ -836,11 +1182,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):
@@ -851,7 +1207,7 @@ def sanity_check_model(io, model):
         io.tool_warning(f"Warning: {model} expects these environment variables")
         for key in model.missing_keys:
             value = os.environ.get(key, "")
-            status = "✓ Set" if value else "✗ Not set"
+            status = "Set" if value else "Not set"
             io.tool_output(f"- {key}: {status}")
 
         if platform.system() == "Windows" or True:
@@ -876,9 +1232,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
 
 
@@ -890,7 +1243,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
@@ -931,20 +1287,37 @@ def print_matching_models(io, search):
         io.tool_output(f'No models match "{search}".')
 
 
+def get_model_settings_as_yaml():
+    import yaml
+
+    model_settings_list = []
+    for ms in MODEL_SETTINGS:
+        model_settings_dict = {
+            field.name: getattr(ms, field.name) for field in fields(ModelSettings)
+        }
+        model_settings_list.append(model_settings_dict)
+
+    return yaml.dump(model_settings_list, default_flow_style=False)
+
+
 def main():
-    if len(sys.argv) != 2:
-        print("Usage: python models.py <model_name>")
+    if len(sys.argv) < 2:
+        print("Usage: python models.py <model_name> or python models.py --yaml")
         sys.exit(1)
 
-    model_name = sys.argv[1]
-    matching_models = fuzzy_match_models(model_name)
-
-    if matching_models:
-        print(f"Matching models for '{model_name}':")
-        for model in matching_models:
-            print(model)
+    if sys.argv[1] == "--yaml":
+        yaml_string = get_model_settings_as_yaml()
+        print(yaml_string)
     else:
-        print(f"No matching models found for '{model_name}'.")
+        model_name = sys.argv[1]
+        matching_models = fuzzy_match_models(model_name)
+
+        if matching_models:
+            print(f"Matching models for '{model_name}':")
+            for model in matching_models:
+                print(model)
+        else:
+            print(f"No matching models found for '{model_name}'.")
 
 
 if __name__ == "__main__":

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/queries/tree-sitter-dart-tags.scm

@@ -0,0 +1,91 @@
+(class_definition
+  name: (identifier) @name.definition.class) @definition.class
+
+(method_signature
+  (function_signature)) @definition.method
+
+(type_alias
+  (type_identifier) @name.definition.type) @definition.type
+
+(method_signature
+  (getter_signature
+    name: (identifier) @name.definition.method)) @definition.method
+
+(method_signature
+  (setter_signature
+    name: (identifier) @name.definition.method)) @definition.method
+
+(method_signature
+  (function_signature
+  name: (identifier) @name.definition.method)) @definition.method
+
+(method_signature
+  (factory_constructor_signature
+    (identifier) @name.definition.method)) @definition.method
+
+(method_signature
+  (constructor_signature
+  name: (identifier) @name.definition.method)) @definition.method
+
+(method_signature
+  (operator_signature)) @definition.method
+
+(method_signature) @definition.method
+
+(mixin_declaration
+  (mixin)
+  (identifier) @name.definition.mixin) @definition.mixin
+
+(extension_declaration
+  name: (identifier) @name.definition.extension) @definition.extension
+
+(enum_declaration
+  name: (identifier) @name.definition.enum) @definition.enum
+
+(function_signature
+  name: (identifier) @name.definition.function) @definition.function
+
+(new_expression
+  (type_identifier) @name.reference.class) @reference.class
+
+(initialized_variable_definition
+  name: (identifier)
+  value: (identifier) @name.reference.class
+  value: (selector
+	"!"?
+	(argument_part
+	  (arguments
+	    (argument)*))?)?) @reference.class
+
+(assignment_expression
+  left: (assignable_expression
+		  (identifier)
+		  (unconditional_assignable_selector
+			"."
+			(identifier) @name.reference.call))) @reference.call
+
+(assignment_expression
+  left: (assignable_expression
+		  (identifier)
+		  (conditional_assignable_selector
+			"?."
+			(identifier) @name.reference.call))) @reference.call
+
+((identifier) @name
+ (selector
+    "!"?
+    (conditional_assignable_selector
+      "?." (identifier) @name.reference.call)?
+    (unconditional_assignable_selector
+      "."? (identifier) @name.reference.call)?
+    (argument_part
+      (arguments
+        (argument)*))?)*
+	(cascade_section
+	  (cascade_selector
+		(identifier)) @name.reference.call
+	  (argument_part
+		(arguments
+		  (argument)*))?)?) @reference.call
+
+

aider/repo.py

@@ -10,7 +10,15 @@ from aider.sendchat import simple_send_with_retries
 
 from .dump import dump  # noqa: F401
 
-ANY_GIT_ERROR = (git.exc.ODBError, git.exc.GitError, OSError, IndexError, BufferError, TypeError)
+ANY_GIT_ERROR = (
+    git.exc.ODBError,
+    git.exc.GitError,
+    OSError,
+    IndexError,
+    BufferError,
+    TypeError,
+    ValueError,
+)
 
 
 class GitRepo:
@@ -161,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):
@@ -185,7 +193,7 @@ class GitRepo:
             if max_tokens and num_tokens > max_tokens:
                 continue
             commit_message = simple_send_with_retries(
-                model.name, messages, extra_headers=model.extra_headers
+                model.name, messages, extra_params=model.extra_params
             )
             if commit_message:
                 break
@@ -323,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()
 
@@ -336,7 +353,14 @@ class GitRepo:
     def ignored_file_raw(self, fname):
         if self.subtree_only:
             fname_path = Path(self.normalize_path(fname))
-            cwd_path = Path.cwd().resolve().relative_to(Path(self.root).resolve())
+            try:
+                cwd_path = Path.cwd().resolve().relative_to(Path(self.root).resolve())
+            except ValueError:
+                # Issue #1524
+                # ValueError: 'C:\\dev\\squid-certbot' is not in the subpath of
+                # 'C:\\dev\\squid-certbot'
+                # Clearly, fname is not under cwd... so ignore it
+                return True
 
             if cwd_path not in fname_path.parents and fname_path != cwd_path:
                 return True

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()
 
@@ -398,7 +456,11 @@ class RepoMap:
         try:
             ranked = nx.pagerank(G, weight="weight", **pers_args)
         except ZeroDivisionError:
-            return []
+            # Issue #1536
+            try:
+                ranked = nx.pagerank(G, weight="weight")
+            except ZeroDivisionError:
+                return []
 
         # distribute the rank from each source node, across all of its out edges
         ranked_definitions = defaultdict(float)
@@ -415,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)
 
@@ -451,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/scrape.py

@@ -185,7 +185,9 @@ class Scraper:
 
         headers = {"User-Agent": f"Mozilla./5.0 ({aider_user_agent})"}
         try:
-            with httpx.Client(headers=headers, verify=self.verify_ssl) as client:
+            with httpx.Client(
+                headers=headers, verify=self.verify_ssl, follow_redirects=True
+            ) as client:
                 response = client.get(url)
                 response.raise_for_status()
                 return response.text, response.headers.get("content-type", "").split(";")[0]

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(
@@ -52,11 +22,8 @@ def send_completion(
     functions,
     stream,
     temperature=0,
-    extra_headers=None,
-    max_tokens=None,
+    extra_params=None,
 ):
-    from aider.llm import litellm
-
     kwargs = dict(
         model=model_name,
         messages=messages,
@@ -69,10 +36,9 @@ def send_completion(
         function = functions[0]
         kwargs["tools"] = [dict(type="function", function=function)]
         kwargs["tool_choice"] = {"type": "function", "function": {"name": function["name"]}}
-    if extra_headers is not None:
-        kwargs["extra_headers"] = extra_headers
-    if max_tokens is not None:
-        kwargs["max_tokens"] = max_tokens
+
+    if extra_params is not None:
+        kwargs.update(extra_params)
 
     key = json.dumps(kwargs, sort_keys=True).encode()
 
@@ -82,8 +48,6 @@ def send_completion(
     if not stream and CACHE is not None and key in CACHE:
         return hash_object, CACHE[key]
 
-    # del kwargs['stream']
-
     res = litellm.completion(**kwargs)
 
     if not stream and CACHE is not None:
@@ -92,19 +56,42 @@ def send_completion(
     return hash_object, res
 
 
-@lazy_litellm_retry_decorator
-def simple_send_with_retries(model_name, messages, extra_headers=None):
-    try:
-        kwargs = {
-            "model_name": model_name,
-            "messages": messages,
-            "functions": None,
-            "stream": False,
-        }
-        if extra_headers is not None:
-            kwargs["extra_headers"] = extra_headers
+def simple_send_with_retries(model_name, messages, extra_params=None):
+    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,9 @@ 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"
+release_notes = "https://aider.chat/HISTORY.html#release-notes"
+edit_formats = "https://aider.chat/docs/more/edit-formats.html"

aider/utils.py

@@ -216,6 +216,9 @@ def get_pip_install(args):
         "-m",
         "pip",
         "install",
+        "--upgrade",
+        "--upgrade-strategy",
+        "only-if-needed",
     ]
     cmd += args
     return cmd
@@ -272,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
@@ -289,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))
 
 
@@ -346,7 +353,7 @@ def check_pip_install_extra(io, module, prompt, pip_install_cmd, self_update=Fal
     success, output = run_install(cmd)
     if success:
         if not module:
-            return
+            return True
         try:
             __import__(module)
             return True

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?",
-        ["--upgrade", "git+https://github.com/paul-gauthier/aider.git"],
+        ["git+https://github.com/Aider-AI/aider.git"],
         self_update=True,
     )
 
@@ -50,7 +50,7 @@ def install_upgrade(io, latest_version=None):
         io,
         None,
         new_ver_text,
-        ["--upgrade", "aider-chat"],
+        ["aider-chat"],
         self_update=True,
     )
 

aider/voice.py

@@ -3,18 +3,25 @@ import os
 import queue
 import tempfile
 import time
+import warnings
+
+from prompt_toolkit.shortcuts import prompt
 
 from aider.llm import litellm
 
+from .dump import dump  # noqa: F401
+
+warnings.filterwarnings(
+    "ignore", message="Couldn't find ffmpeg or avconv - defaulting to ffmpeg, but may not work"
+)
+
+from pydub import AudioSegment  # noqa
+
 try:
     import soundfile as sf
 except (OSError, ModuleNotFoundError):
     sf = None
 
-from prompt_toolkit.shortcuts import prompt
-
-from .dump import dump  # noqa: F401
-
 
 class SoundDeviceError(Exception):
     pass
@@ -27,7 +34,7 @@ class Voice:
 
     threshold = 0.15
 
-    def __init__(self):
+    def __init__(self, audio_format="wav"):
         if sf is None:
             raise SoundDeviceError
         try:
@@ -37,6 +44,9 @@ class Voice:
             self.sd = sd
         except (OSError, ModuleNotFoundError):
             raise SoundDeviceError
+        if audio_format not in ["wav", "mp3", "webm"]:
+            raise ValueError(f"Unsupported audio format: {audio_format}")
+        self.audio_format = audio_format
 
     def callback(self, indata, frames, time, status):
         """This is called (from a separate thread) for each audio block."""
@@ -80,7 +90,7 @@ class Voice:
     def raw_record_and_transcribe(self, history, language):
         self.q = queue.Queue()
 
-        filename = tempfile.mktemp(suffix=".wav")
+        temp_wav = tempfile.mktemp(suffix=".wav")
 
         try:
             sample_rate = int(self.sd.query_devices(None, "input")["default_samplerate"])
@@ -99,10 +109,18 @@ class Voice:
         except self.sd.PortAudioError as err:
             raise SoundDeviceError(f"Error accessing audio input device: {err}")
 
-        with sf.SoundFile(filename, mode="x", samplerate=sample_rate, channels=1) as file:
+        with sf.SoundFile(temp_wav, mode="x", samplerate=sample_rate, channels=1) as file:
             while not self.q.empty():
                 file.write(self.q.get())
 
+        if self.audio_format != "wav":
+            filename = tempfile.mktemp(suffix=f".{self.audio_format}")
+            audio = AudioSegment.from_wav(temp_wav)
+            audio.export(filename, format=self.audio_format)
+            os.remove(temp_wav)
+        else:
+            filename = temp_wav
+
         with open(filename, "rb") as fh:
             try:
                 transcript = litellm.transcription(
@@ -112,6 +130,9 @@ class Voice:
                 print(f"Unable to transcribe {filename}: {err}")
                 return
 
+        if self.audio_format != "wav":
+            os.remove(filename)
+
         text = transcript.text
         return text
 

aider/website/HISTORY.md

@@ -1,20 +1,190 @@
 ---
 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)
+of the aider repo.
+
+## Release notes
+
 <!--[[[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
+
+### Aider v0.65.0
+
+- Added `--alias` config to define [custom model aliases](https://aider.chat/docs/config/model-aliases.html).
+- Added `--[no-]detect-urls` flag to disable detecting and offering to scrape URLs found in the chat.
+- Ollama models now default to an 8k context window.
+- Added [RepoMap support for Dart language](https://aider.chat/docs/languages.html) by @malkoG.
+- Ask 2.5% of users if they want to opt-in to [analytics](https://aider.chat/docs/more/analytics.html).
+- Skip suggesting files that share names with files already in chat.
+- `/editor` returns and prefill the file content into the prompt, so you can use `/editor` to compose messages that start with `/commands`, etc.
+- Enhanced error handling for analytics.
+- Improved handling of UnknownEditFormat exceptions with helpful documentation links.
+- Bumped dependencies to pick up grep-ast 0.4.0 for Dart language support.
+- Aider wrote 81% of the code in this release.
+
+### Aider v0.64.1
+
+- Disable streaming for o1 on OpenRouter.
+
+### Aider v0.64.0
+
+- Added [`/editor` command](https://aider.chat/docs/usage/commands.html) to open system editor for writing prompts, by @thehunmonkgroup.
+- Full support for `gpt-4o-2024-11-20`.
+- Stream o1 models by default.
+- `/run` and suggested shell commands are less mysterious and now confirm that they "Added XX lines of output to the chat."
+- Ask 1% of users if they want to opt-in to [analytics](https://aider.chat/docs/more/analytics.html).
+- Added support for [optional multiline input tags](https://aider.chat/docs/usage/commands.html#entering-multi-line-chat-messages) with matching closing tags.
+- Improved [model settings configuration](https://aider.chat/docs/config/adv-model-settings.html#global-extra-params) with support for global `extra_params` for `litellm.completion()`.
+- Architect mode now asks to add files suggested by the LLM.
+- Fixed bug in fuzzy model name matching.
+- Added Timeout exception to handle API provider timeouts.
+- Added `--show-release-notes` to control release notes display on first run of new version.
+- Save empty dict to cache file on model metadata download failure, to delay retry.
+- Improved error handling and code formatting.
+- Aider wrote 74% of the code in this release.
+
+###  Aider v0.63.2
+
+- 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)
+  - Use a strong reasoning model like o1-preview as your Architect.
+  - Use a cheaper, faster model like gpt-4o as your Editor.
+- New `--o1-preview` and `--o1-mini` shortcuts.
+- Support for new Gemini 002 models.
+- Better support for Qwen 2.5 models.
+- Many confirmation questions can be skipped for the rest of the session with "(D)on't ask again" response.
+- Autocomplete for `/read-only` supports the entire filesystem.
+- New settings for completion menu colors.
+- New `/copy` command to copy the last LLM response to the clipboard.
+- Renamed `/clipboard` to `/paste`.
+- Will now follow HTTP redirects when scraping urls.
+- New `--voice-format` switch to send voice audio as wav/mp3/webm, by @mbailey.
+- ModelSettings takes `extra_params` dict to specify any extras to pass to `litellm.completion()`.
+- Support for cursor shapes when in vim mode.
+- Numerous bug fixes.
+- Aider wrote 53% of the code in this release.
 
 ### Aider v0.57.1
 
@@ -680,7 +850,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

@@ -0,0 +1,492 @@
+- dirname: 2024-09-25-21-17-19--architect-sonnet-sonnet-diff
+  test_cases: 133
+  model: claude-3.5-sonnet
+  editor_model: claude-3.5-sonnet
+  editor_edit_format: diff
+  edit_format: architect
+  commit_hash: c18d6a8-dirty
+  pass_rate_1: 62.4
+  pass_rate_2: 80.5
+  percent_cases_well_formed: 100.0
+  error_outputs: 3
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 183
+  lazy_comments: 6
+  syntax_errors: 9
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model openrouter/anthropic/claude-3.5-sonnet
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 25.1
+  total_cost: 4.9502
+  
+- dirname: 2024-07-04-14-32-08--claude-3.5-sonnet-diff-continue
+  test_cases: 133
+  model: claude-3.5-sonnet
+  edit_format: diff
+  commit_hash: 35f21b5
+  pass_rate_1: 57.1
+  pass_rate_2: 77.4
+  percent_cases_well_formed: 99.2
+  error_outputs: 23
+  released: 2024-06-20
+  num_malformed_responses: 4
+  num_with_malformed_responses: 1
+  user_asks: 2
+  lazy_comments: 0
+  syntax_errors: 1
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --sonnet
+  date: 2024-07-04
+  versions: 0.42.1-dev
+  seconds_per_case: 17.6
+  total_cost: 3.6346
+    
+- dirname: 2024-09-25-21-25-01--architect-o1mini-4o-jr-diff
+  test_cases: 133
+  model: o1-mini
+  editor_model: gpt-4o
+  editor_edit_format: diff
+  edit_format: architect
+  commit_hash: 3f682ed-dirty, 25e833b
+  pass_rate_1: 51.1
+  pass_rate_2: 70.7
+  percent_cases_well_formed: 100.0
+  error_outputs: 12
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 214
+  lazy_comments: 6
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model o1-mini
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 23.7
+  total_cost: 9.3158
+
+- dirname: 2024-09-26-15-05-58--architect-o1mini-deep-jr-whole
+  test_cases: 133
+  model: o1-mini
+  edit_format: architect
+  commit_hash: 1676653-dirty
+  editor_model: deepseek
+  editor_edit_format: whole
+  pass_rate_1: 51.9
+  pass_rate_2: 71.4
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 199
+  lazy_comments: 11
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model o1-mini
+  date: 2024-09-26
+  versions: 0.57.2.dev
+  seconds_per_case: 48.2
+  total_cost: 5.6069
+                                                
+- dirname: 2024-09-25-21-33-40--architect-4o-4o-jr-diff
+  test_cases: 133
+  model: gpt-4o
+  editor_model: gpt-4o
+  editor_edit_format: diff
+  edit_format: architect
+  commit_hash: 9f3cd92
+  pass_rate_1: 56.4
+  pass_rate_2: 75.2
+  percent_cases_well_formed: 100.0
+  error_outputs: 13
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 207
+  lazy_comments: 8
+  syntax_errors: 1
+  indentation_errors: 1
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: aider --model gpt-4o
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 18.2
+  total_cost: 6.0918
+  
+- dirname: 2024-09-21-16-45-11--o1-preview-flex-sr-markers
+  test_cases: 133
+  model: o1-preview
+  edit_format: diff
+  commit_hash: 5493654-dirty
+  pass_rate_1: 57.9
+  pass_rate_2: 79.7
+  percent_cases_well_formed: 93.2
+  error_outputs: 11
+  num_malformed_responses: 11
+  num_with_malformed_responses: 9
+  user_asks: 3
+  lazy_comments: 0
+  syntax_errors: 10
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model o1-preview
+  date: 2024-09-21
+  versions: 0.56.1.dev
+  seconds_per_case: 80.9
+  total_cost: 63.9190
+  
+- dirname: 2024-09-25-21-39-05--architect-o1preview-4o-jr-diff
+  test_cases: 133
+  model: o1-preview
+  editor_model: gpt-4o
+  editor_edit_format: diff
+  edit_format: architect
+  commit_hash: 9f3cd92
+  pass_rate_1: 63.2
+  pass_rate_2: 80.5
+  percent_cases_well_formed: 100.0
+  error_outputs: 23
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 191
+  lazy_comments: 2
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 4
+  command: aider --model o1-preview
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 42.3
+  total_cost: 39.3766
+  
+- dirname: 2024-09-25-21-52-42--architect-o1preview-sonnet-jr-diff
+  test_cases: 133
+  model: o1-preview
+  editor_model: claude-3.5-sonnet
+  editor_edit_format: diff
+  edit_format: architect
+  commit_hash: 9f3cd92
+  editor_model: claude-3-5-sonnet
+  pass_rate_1: 60.9
+  pass_rate_2: 82.7
+  percent_cases_well_formed: 100.0
+  error_outputs: 1
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 180
+  lazy_comments: 3
+  syntax_errors: 9
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: aider --model o1-preview
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 44.9
+  total_cost: 37.6192
+  
+- dirname: 2024-09-21-16-40-56--o1-mini-flex-sr-markers
+  test_cases: 36
+  model: o1-mini
+  edit_format: diff
+  commit_hash: 5493654
+  pass_rate_1: 50.0
+  pass_rate_2: 61.1
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 3
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 1
+  exhausted_context_windows: 0
+  test_timeouts: 0
+  command: aider --model o1-mini
+  date: 2024-09-21
+  versions: 0.56.1.dev
+  seconds_per_case: 26.7
+  total_cost: 2.4226
+                                            
+- dirname: 2024-09-25-23-12-14--architect-o1mini-deep-jr-diff
+  test_cases: 133
+  model: o1-mini
+  edit_format: architect
+  commit_hash: 9f3cd92-dirty
+  editor_model: deepseek
+  editor_edit_format: diff
+  pass_rate_1: 48.9
+  pass_rate_2: 69.2
+  percent_cases_well_formed: 100.0
+  error_outputs: 1
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 202
+  lazy_comments: 12
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model o1-mini
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 52.2
+  total_cost: 5.7927
+  
+- dirname: 2024-09-25-23-18-16--architect-o1preview-deep-jr-diff
+  test_cases: 133
+  model: o1-preview
+  edit_format: architect
+  commit_hash: 9f3cd92-dirty
+  editor_model: deepseek
+  editor_edit_format: diff
+  pass_rate_1: 64.7
+  pass_rate_2: 80.5
+  percent_cases_well_formed: 100.0
+  error_outputs: 5
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 180
+  lazy_comments: 2
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model o1-preview
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 73.2
+  total_cost: 35.7887
+  
+- dirname: 2024-09-25-23-30-36--architect-o1preview-deep-jr-whole
+  test_cases: 133
+  model: o1-preview
+  edit_format: architect
+  commit_hash: 9f3cd92-dirty
+  editor_model: deepseek
+  editor_edit_format: whole
+  pass_rate_1: 63.9
+  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: 181
+  lazy_comments: 12
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model o1-preview
+  date: 2024-09-25
+  versions: 0.57.2.dev
+  seconds_per_case: 67.4
+  total_cost: 35.3152
+
+- dirname: 2024-09-26-15-15-17--architect-sonnet-deep-jr-whole
+  test_cases: 133
+  model: claude-3.5-sonnet
+  edit_format: architect
+  commit_hash: bc1559f-dirty
+  editor_model: deepseek
+  editor_edit_format: whole
+  pass_rate_1: 61.7
+  pass_rate_2: 78.9
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 184
+  lazy_comments: 5
+  syntax_errors: 9
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: aider --model openrouter/anthropic/claude-3.5-sonnet
+  date: 2024-09-26
+  versions: 0.57.2.dev
+  seconds_per_case: 37.2
+  total_cost: 2.1510
+
+- dirname: 2024-09-26-15-33-28--costs-gpt4o-diff
+  test_cases: 133
+  model: gpt-4o
+  edit_format: diff
+  commit_hash: 89aa385-dirty
+  pass_rate_1: 55.6
+  pass_rate_2: 71.4
+  percent_cases_well_formed: 97.7
+  error_outputs: 5
+  num_malformed_responses: 5
+  num_with_malformed_responses: 3
+  user_asks: 10
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 1
+  exhausted_context_windows: 0
+  test_timeouts: 0
+  command: aider --model gpt-4o
+  date: 2024-09-26
+  versions: 0.57.2.dev
+  seconds_per_case: 9.7
+  total_cost: 3.8088
+
+- dirname: 2024-09-26-15-41-08--architect-4o-deep-jr-whole
+  test_cases: 133
+  model: gpt-4o
+  edit_format: architect
+  commit_hash: 89aa385-dirty
+  editor_model: deepseek
+  editor_edit_format: whole
+  pass_rate_1: 60.9
+  pass_rate_2: 73.7
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 187
+  lazy_comments: 12
+  syntax_errors: 5
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model gpt-4o
+  date: 2024-09-26
+  versions: 0.57.2.dev
+  seconds_per_case: 38.0
+  total_cost: 2.4737
+
+- dirname: 2024-09-26-15-54-08--architect-4o-deep-jr-diff
+  test_cases: 133
+  model: gpt-4o
+  edit_format: architect
+  commit_hash: 89aa385-dirty
+  editor_model: deepseek
+  editor_edit_format: diff
+  pass_rate_1: 57.1
+  pass_rate_2: 74.4
+  percent_cases_well_formed: 100.0
+  error_outputs: 4
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 192
+  lazy_comments: 6
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model gpt-4o
+  date: 2024-09-26
+  versions: 0.57.2.dev
+  seconds_per_case: 44.0
+  total_cost: 2.5498
+
+- dirname: 2024-09-26-16-06-39--architect-sonnet-deep-jr-diff
+  test_cases: 133
+  model: claude-3.5-sonnet
+  edit_format: architect
+  commit_hash: 89aa385-dirty
+  editor_model: deepseek
+  editor_edit_format: diff
+  pass_rate_1: 61.7
+  pass_rate_2: 78.9
+  percent_cases_well_formed: 100.0
+  error_outputs: 2
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 184
+  lazy_comments: 2
+  syntax_errors: 9
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model openrouter/anthropic/claude-3.5-sonnet
+  date: 2024-09-26
+  versions: 0.57.2.dev
+  seconds_per_case: 43.2
+  total_cost: 2.1488
+
+- dirname: 2024-09-27-18-15-32--architect-4omini-4omini
+  test_cases: 133
+  model: gpt-4o-mini
+  edit_format: architect
+  commit_hash: 0bd8058-dirty
+  editor_model: gpt-4o-mini
+  editor_edit_format: whole
+  pass_rate_1: 43.6
+  pass_rate_2: 60.2
+  percent_cases_well_formed: 100.0
+  error_outputs: 0
+  num_malformed_responses: 0
+  num_with_malformed_responses: 0
+  user_asks: 208
+  lazy_comments: 2
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: aider --model gpt-4o-mini
+  date: 2024-09-27
+  versions: 0.57.2.dev
+  seconds_per_case: 21.0
+  total_cost: 0.1527
+
+- dirname: 2024-07-18-18-57-46--gpt-4o-mini-whole
+  test_cases: 133
+  model: gpt-4o-mini
+  edit_format: whole
+  commit_hash: d31eef3-dirty
+  pass_rate_1: 40.6
+  pass_rate_2: 55.6
+  released: 2024-07-18
+  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: 1
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model gpt-4o-mini
+  date: 2024-07-18
+  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

@@ -1801,8 +1801,8 @@
     Paul Gauthier (aider): 113
   start_tag: v0.44.0
   total_lines: 266
-- aider_percentage: 47.04
-  aider_total: 254
+- aider_percentage: 53.3
+  aider_total: 339
   end_date: '2024-07-29'
   end_tag: v0.46.0
   file_counts:
@@ -1853,6 +1853,9 @@
     aider/scrape.py:
       Paul Gauthier: 3
       Paul Gauthier (aider): 32
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 11
+      Paul Gauthier (aider): 85
     benchmark/Dockerfile:
       Your Name: 1
     tests/basic/test_coder.py:
@@ -1868,13 +1871,13 @@
       Paul Gauthier (aider): 73
   grand_total:
     Charles Joachim: 4
-    Paul Gauthier: 209
-    Paul Gauthier (aider): 204
+    Paul Gauthier: 220
+    Paul Gauthier (aider): 289
     Your Name: 73
     Your Name (aider): 50
   start_tag: v0.45.0
-  total_lines: 540
-- aider_percentage: 59.12
+  total_lines: 636
+- aider_percentage: 57.16
   aider_total: 415
   end_date: '2024-07-31'
   end_tag: v0.47.0
@@ -1920,6 +1923,8 @@
       Paul Gauthier (aider): 2
     aider/utils.py:
       Paul Gauthier: 7
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 24
     docker/Dockerfile:
       Paul Gauthier: 19
       Paul Gauthier (aider): 21
@@ -1944,10 +1949,10 @@
     tests/basic/test_repomap.py:
       Paul Gauthier: 1
   grand_total:
-    Paul Gauthier: 287
+    Paul Gauthier: 311
     Paul Gauthier (aider): 415
   start_tag: v0.46.0
-  total_lines: 702
+  total_lines: 726
 - aider_percentage: 44.44
   aider_total: 276
   end_date: '2024-08-06'
@@ -2011,8 +2016,8 @@
     paul-gauthier: 1
   start_tag: v0.47.0
   total_lines: 621
-- aider_percentage: 61.52
-  aider_total: 478
+- aider_percentage: 61.2
+  aider_total: 489
   end_date: '2024-08-10'
   end_tag: v0.49.0
   file_counts:
@@ -2055,6 +2060,9 @@
     aider/versioncheck.py:
       Paul Gauthier: 3
       Paul Gauthier (aider): 11
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 11
+      Paul Gauthier (aider): 11
     docker/Dockerfile:
       Paul Gauthier: 5
       Paul Gauthier (aider): 2
@@ -2075,10 +2083,10 @@
       Paul Gauthier: 1
       Paul Gauthier (aider): 49
   grand_total:
-    Paul Gauthier: 299
-    Paul Gauthier (aider): 478
+    Paul Gauthier: 310
+    Paul Gauthier (aider): 489
   start_tag: v0.48.0
-  total_lines: 777
+  total_lines: 799
 - aider_percentage: 66.05
   aider_total: 214
   end_date: '2024-08-13'
@@ -2135,8 +2143,8 @@
     Paul Gauthier (aider): 201
   start_tag: v0.49.0
   total_lines: 324
-- aider_percentage: 56.25
-  aider_total: 450
+- aider_percentage: 52.49
+  aider_total: 580
   end_date: '2024-08-20'
   end_tag: v0.51.0
   file_counts:
@@ -2170,6 +2178,14 @@
       Paul Gauthier: 3
     aider/utils.py:
       Paul Gauthier (aider): 6
+    aider/website/_includes/code-in-json-benchmark.js:
+      Paul Gauthier: 101
+      Paul Gauthier (aider): 64
+    aider/website/_includes/code-in-json-syntax.js:
+      Paul Gauthier: 73
+      Paul Gauthier (aider): 66
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
     benchmark/benchmark.py:
       Paul Gauthier: 7
     benchmark/over_time.py:
@@ -2188,11 +2204,11 @@
       Paul Gauthier: 15
       Paul Gauthier (aider): 104
   grand_total:
-    Paul Gauthier: 350
-    Paul Gauthier (aider): 450
+    Paul Gauthier: 525
+    Paul Gauthier (aider): 580
   start_tag: v0.50.0
-  total_lines: 800
-- aider_percentage: 68.19
+  total_lines: 1105
+- aider_percentage: 68.1
   aider_total: 521
   end_date: '2024-08-23'
   end_tag: v0.52.0
@@ -2231,6 +2247,8 @@
       Paul Gauthier (aider): 9
     aider/versioncheck.py:
       Paul Gauthier: 2
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
     benchmark/benchmark.py:
       Paul Gauthier: 1
     scripts/blame.py:
@@ -2250,13 +2268,13 @@
     tests/basic/test_wholefile.py:
       Paul Gauthier: 8
   grand_total:
-    Paul Gauthier: 242
+    Paul Gauthier: 243
     Paul Gauthier (aider): 521
     pcamp: 1
   start_tag: v0.51.0
-  total_lines: 764
-- aider_percentage: 58.61
-  aider_total: 405
+  total_lines: 765
+- aider_percentage: 61.4
+  aider_total: 455
   end_date: '2024-08-27'
   end_tag: v0.53.0
   file_counts:
@@ -2321,14 +2339,16 @@
     tests/basic/test_repomap.py:
       Paul Gauthier: 4
       Paul Gauthier (aider): 63
+    tests/fixtures/sample-code-base/sample.js:
+      Paul Gauthier (aider): 50
     tests/fixtures/sample-code-base/sample.py:
       Paul Gauthier (aider): 68
   grand_total:
     Paul Gauthier: 286
-    Paul Gauthier (aider): 405
+    Paul Gauthier (aider): 455
   start_tag: v0.52.0
-  total_lines: 691
-- aider_percentage: 63.95
+  total_lines: 741
+- aider_percentage: 63.75
   aider_total: 204
   end_date: '2024-08-28'
   end_tag: v0.54.0
@@ -2364,6 +2384,8 @@
     aider/versioncheck.py:
       Paul Gauthier: 1
       Paul Gauthier (aider): 13
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
     tests/basic/test_coder.py:
       Paul Gauthier: 36
       Paul Gauthier (aider): 27
@@ -2376,11 +2398,11 @@
       Paul Gauthier: 1
   grand_total:
     Antti Kaihola: 4
-    Paul Gauthier: 111
+    Paul Gauthier: 112
     Paul Gauthier (aider): 204
   start_tag: v0.53.0
-  total_lines: 319
-- aider_percentage: 52.9
+  total_lines: 320
+- aider_percentage: 52.87
   aider_total: 811
   end_date: '2024-09-04'
   end_tag: v0.55.0
@@ -2450,6 +2472,8 @@
     aider/voice.py:
       Paul Gauthier: 7
       Paul Gauthier (aider): 9
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
     scripts/versionbump.py:
       Paul Gauthier: 9
     tests/basic/test_coder.py:
@@ -2478,11 +2502,11 @@
   grand_total:
     Antti Kaihola: 12
     Nikolay Sedelnikov: 45
-    Paul Gauthier: 665
+    Paul Gauthier: 666
     Paul Gauthier (aider): 811
   start_tag: v0.54.0
-  total_lines: 1533
-- aider_percentage: 55.6
+  total_lines: 1534
+- aider_percentage: 55.4
   aider_total: 154
   end_date: '2024-09-09'
   end_tag: v0.56.0
@@ -2517,6 +2541,8 @@
     aider/report.py:
       Paul Gauthier: 2
       Paul Gauthier (aider): 20
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
     benchmark/benchmark.py:
       Paul Gauthier: 1
     tests/basic/test_linter.py:
@@ -2526,13 +2552,13 @@
       Paul Gauthier: 2
       Paul Gauthier (aider): 9
   grand_total:
-    Paul Gauthier: 108
+    Paul Gauthier: 109
     Paul Gauthier (aider): 154
     fry69: 15
   start_tag: v0.55.0
-  total_lines: 277
-- aider_percentage: 69.98
-  aider_total: 394
+  total_lines: 278
+- aider_percentage: 70.36
+  aider_total: 406
   end_date: '2024-09-21'
   end_tag: v0.57.0
   file_counts:
@@ -2575,6 +2601,10 @@
       Paul Gauthier: 3
     aider/utils.py:
       Paul Gauthier: 2
+    aider/website/docs/leaderboards/index.md:
+      Anjor Kanekar: 1
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 12
     benchmark/benchmark.py:
       Paul Gauthier: 4
     scripts/issues.py:
@@ -2592,11 +2622,550 @@
       Paul Gauthier: 18
       Paul Gauthier (aider): 20
   grand_total:
+    Anjor Kanekar: 1
     Christian Clauss: 2
     Jay Alammar: 1
     Jay Alammar (aider): 13
     Krazer: 33
-    Paul Gauthier: 133
-    Paul Gauthier (aider): 381
+    Paul Gauthier: 134
+    Paul Gauthier (aider): 393
   start_tag: v0.56.0
-  total_lines: 563
+  total_lines: 577
+- aider_percentage: 47.95
+  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
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 153
+    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: 529
+    Paul Gauthier (aider): 712
+    Stein Martin Hustad: 26
+    fry69: 197
+    rti: 1
+  start_tag: v0.57.0
+  total_lines: 1485
+- aider_percentage: 75.44
+  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
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 4
+    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: 56
+    Paul Gauthier (aider): 172
+  start_tag: v0.58.0
+  total_lines: 228
+- aider_percentage: 48.95
+  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
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
+    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: 94
+    Paul Gauthier (aider): 140
+    Sven Grunewaldt: 24
+    fry69: 18
+  start_tag: v0.59.0
+  total_lines: 286
+- 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: 82.42
+  aider_total: 75
+  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
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 4
+      Paul Gauthier (aider): 12
+  grand_total:
+    Paul Gauthier: 16
+    Paul Gauthier (aider): 75
+  start_tag: v0.61.0
+  total_lines: 91
+- aider_percentage: 55.08
+  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
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
+    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: 285
+    Paul Gauthier (aider): 385
+  start_tag: v0.62.0
+  total_lines: 699
+- aider_percentage: 73.15
+  aider_total: 880
+  end_date: '2024-11-21'
+  end_tag: v0.64.0
+  file_counts:
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/analytics.py:
+      Paul Gauthier: 20
+      Paul Gauthier (aider): 21
+    aider/args.py:
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 10
+    aider/coders/base_coder.py:
+      Paul Gauthier: 15
+      Paul Gauthier (aider): 3
+      caetanominuzzo: 1
+    aider/commands.py:
+      Chad Phillips: 4
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 19
+    aider/editor.py:
+      Chad Phillips: 133
+      Paul Gauthier (aider): 13
+    aider/exceptions.py:
+      Paul Gauthier: 5
+    aider/help_pats.py:
+      Paul Gauthier: 1
+    aider/io.py:
+      Chad Phillips: 9
+      Paul Gauthier (aider): 41
+      mw: 21
+    aider/main.py:
+      Paul Gauthier: 21
+      Paul Gauthier (aider): 41
+    aider/models.py:
+      Paul Gauthier: 41
+      Paul Gauthier (aider): 33
+    aider/repo.py:
+      Paul Gauthier (aider): 5
+    aider/urls.py:
+      Paul Gauthier: 1
+    aider/website/_includes/edit-leaderboard.js:
+      Paul Gauthier (aider): 97
+    aider/website/_includes/quant-chart.js:
+      Paul Gauthier: 3
+      Paul Gauthier (aider): 66
+    aider/website/_includes/refactor-leaderboard.js:
+      Paul Gauthier (aider): 90
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 10
+    aider/website/share/index.md:
+      Paul Gauthier (aider): 29
+    benchmark/over_time.py:
+      Paul Gauthier: 11
+      Paul Gauthier (aider): 162
+    scripts/blame.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 2
+    scripts/issues.py:
+      Paul Gauthier: 5
+      Paul Gauthier (aider): 12
+    scripts/versionbump.py:
+      Paul Gauthier: 7
+    tests/basic/test_analytics.py:
+      Paul Gauthier: 12
+      Paul Gauthier (aider): 30
+    tests/basic/test_commands.py:
+      Paul Gauthier (aider): 4
+    tests/basic/test_editor.py:
+      Paul Gauthier (aider): 129
+    tests/basic/test_main.py:
+      Paul Gauthier (aider): 8
+    tests/basic/test_models.py:
+      Paul Gauthier: 3
+      Paul Gauthier (aider): 55
+  grand_total:
+    Chad Phillips: 146
+    Paul Gauthier: 155
+    Paul Gauthier (aider): 880
+    caetanominuzzo: 1
+    mw: 21
+  start_tag: v0.63.0
+  total_lines: 1203
+- aider_percentage: 81.11
+  aider_total: 584
+  end_date: '2024-11-26'
+  end_tag: v0.65.0
+  file_counts:
+    aider/__init__.py:
+      Paul Gauthier: 1
+    aider/analytics.py:
+      Paul Gauthier: 2
+      Paul Gauthier (aider): 5
+    aider/args.py:
+      Paul Gauthier (aider): 12
+    aider/coders/base_coder.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 31
+    aider/commands.py:
+      Paul Gauthier: 2
+    aider/io.py:
+      Paul Gauthier: 3
+      Paul Gauthier (aider): 9
+    aider/main.py:
+      Paul Gauthier: 15
+      Paul Gauthier (aider): 19
+    aider/models.py:
+      Paul Gauthier: 9
+      Paul Gauthier (aider): 17
+    aider/queries/tree-sitter-dart-tags.scm:
+      malkoG: 91
+    aider/urls.py:
+      Paul Gauthier (aider): 1
+    aider/website/_includes/quant-chart.js:
+      Paul Gauthier (aider): 76
+    aider/website/docs/leaderboards/index.md:
+      Paul Gauthier: 1
+    benchmark/benchmark.py:
+      Paul Gauthier (aider): 10
+    benchmark/docker.sh:
+      Paul Gauthier (aider): 1
+    benchmark/over_time.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 157
+    scripts/update-docs.sh:
+      Paul Gauthier: 1
+    scripts/update-history.py:
+      Paul Gauthier: 8
+      Paul Gauthier (aider): 64
+    tests/basic/test_coder.py:
+      Paul Gauthier (aider): 81
+    tests/basic/test_editor.py:
+      Paul Gauthier (aider): 16
+    tests/basic/test_main.py:
+      Paul Gauthier: 1
+      Paul Gauthier (aider): 42
+    tests/basic/test_models.py:
+      Paul Gauthier (aider): 30
+    tests/basic/test_repomap.py:
+      Paul Gauthier (aider): 13
+  grand_total:
+    Paul Gauthier: 45
+    Paul Gauthier (aider): 584
+    malkoG: 91
+  start_tag: v0.64.0
+  total_lines: 720

aider/website/_data/quant.yml

@@ -0,0 +1,299 @@
+- dirname: 2024-11-09-11-09-15--Qwen2.5-Coder-32B-Instruct
+  test_cases: 133
+  model: "HuggingFace via GLHF: BF16"
+  released: 2024-11-12
+  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/hf:Qwen/Qwen2.5-Coder-32B-Instruct --openai-api-base https://glhf.chat/api/openai/v1
+  date: 2024-11-09
+  versions: 0.59.2.dev
+  seconds_per_case: 22.5
+  total_cost: 0.0000
+
+- dirname: 2024-11-22-18-56-13--ollama-qwen2.5-coder:32b-instruct-fp16
+  test_cases: 132
+  model: "Ollama: fp16"
+  edit_format: diff
+  commit_hash: f06452c-dirty, 6a0a97c-dirty, 4e9ae16-dirty, 5506d0f-dirty
+  pass_rate_1: 58.3
+  pass_rate_2: 71.4
+  percent_cases_well_formed: 90.2
+  error_outputs: 27
+  num_malformed_responses: 26
+  num_with_malformed_responses: 13
+  user_asks: 2
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 0
+  command: aider --model ollama/qwen2.5-coder:32b-instruct-fp16
+  date: 2024-11-22
+  versions: 0.64.2.dev
+  seconds_per_case: 119.6
+  total_cost: 0.0000
+  
+- dirname: 2024-11-22-14-53-26--hyperbolic-qwen25coder32binstruct
+  test_cases: 133
+  model: "Hyperbolic: BF16"
+  edit_format: diff
+  commit_hash: f9ef161, 17aef7b-dirty
+  pass_rate_1: 57.9
+  pass_rate_2: 69.2
+  percent_cases_well_formed: 91.7
+  error_outputs: 30
+  num_malformed_responses: 29
+  num_with_malformed_responses: 11
+  user_asks: 9
+  lazy_comments: 0
+  syntax_errors: 4
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 2
+  command: aider --model openai/Qwen/Qwen2.5-Coder-32B-Instruct --openai-api-base https://api.hyperbolic.xyz/v1/
+  date: 2024-11-22
+  versions: 0.64.2.dev
+  seconds_per_case: 33.2
+  total_cost: 0.0000
+  
+- dirname: 2024-11-22-17-53-35--qwen25-coder-32b-Instruct-4bit
+  test_cases: 133
+  model: "mlx-community: 4bit"
+  edit_format: diff
+  commit_hash: a16dcab-dirty
+  pass_rate_1: 60.2
+  pass_rate_2: 72.2
+  percent_cases_well_formed: 88.7
+  error_outputs: 31
+  num_malformed_responses: 30
+  num_with_malformed_responses: 15
+  user_asks: 6
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 1
+  test_timeouts: 0
+  command: aider --model openai/mlx-community/Qwen2.5-Coder-32B-Instruct-4bit
+  date: 2024-11-23
+  versions: 0.64.2.dev
+  seconds_per_case: 53.4
+  total_cost: 0.0000
+
+- dirname: 2024-11-23-15-07-20--qwen25-coder-32b-Instruct-8bit
+  test_cases: 133
+  model: "mlx-community: 8bit"
+  edit_format: diff
+  commit_hash: a16dcab-dirty
+  pass_rate_1: 59.4
+  pass_rate_2: 72.2
+  percent_cases_well_formed: 92.5
+  error_outputs: 20
+  num_malformed_responses: 15
+  num_with_malformed_responses: 10
+  user_asks: 7
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 5
+  test_timeouts: 2
+  command: aider --model openai/mlx-community/Qwen2.5-Coder-32B-Instruct-8bit
+  date: 2024-11-23
+  versions: 0.64.2.dev
+  seconds_per_case: 98.4
+  total_cost: 0.0000
+
+- dirname: 2024-11-24-22-18-18--or-all-or-fixed-blank-messages2
+  test_cases: 133
+  model: "OpenRouter: multiple"
+  edit_format: diff
+  commit_hash: 0c59d32
+  pass_rate_1: 57.1
+  pass_rate_2: 67.7
+  percent_cases_well_formed: 95.5
+  error_outputs: 56
+  num_malformed_responses: 10
+  num_with_malformed_responses: 6
+  user_asks: 14
+  lazy_comments: 0
+  syntax_errors: 6
+  indentation_errors: 0
+  exhausted_context_windows: 3
+  test_timeouts: 1
+  command: aider --model openrouter/qwen/qwen-2.5-coder-32b-instruct
+  date: 2024-11-24
+  versions: 0.64.2.dev
+  seconds_per_case: 21.2
+  total_cost: 0.1420
+  
+- dirname: 2024-11-23-21-08-53--ollama-qwen2.5-coder:32b-instruct-q4_K_M-8kctx
+  test_cases: 133
+  model: "Ollama: q4_K_M"
+  edit_format: diff
+  commit_hash: baa1335-dirty, e63df83-dirty, ff8c1aa-dirty
+  pass_rate_1: 54.9
+  pass_rate_2: 66.9
+  percent_cases_well_formed: 94.0
+  error_outputs: 21
+  num_malformed_responses: 21
+  num_with_malformed_responses: 8
+  user_asks: 5
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 3
+  command: aider --model ollama/qwen2.5-coder:32b-instruct-q4_K_M
+  date: 2024-11-23
+  versions: 0.64.2.dev
+  seconds_per_case: 35.7
+  total_cost: 0.0000
+
+- dirname: 2024-11-24-02-23-32--deepinfra-qwen-diff
+  test_cases: 133
+  model: "Deepinfra: BF16"
+  edit_format: diff
+  commit_hash: bb78e2f
+  pass_rate_1: 58.6
+  pass_rate_2: 72.2
+  percent_cases_well_formed: 94.7
+  error_outputs: 15
+  num_malformed_responses: 13
+  num_with_malformed_responses: 7
+  user_asks: 3
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 2
+  test_timeouts: 3
+  command: aider --model deepinfra/Qwen/Qwen2.5-Coder-32B-Instruct
+  date: 2024-11-24
+  versions: 0.64.2.dev
+  seconds_per_case: 17.5
+  total_cost: 0.0000
+
+- dirname: 2024-11-24-04-12-58--fireworks-qwen-diff
+  test_cases: 133
+  model: "Fireworks: unknown"
+  edit_format: diff
+  commit_hash: 757eac0
+  pass_rate_1: 57.9
+  pass_rate_2: 72.2
+  percent_cases_well_formed: 94.0
+  error_outputs: 23
+  num_malformed_responses: 19
+  num_with_malformed_responses: 8
+  user_asks: 8
+  lazy_comments: 0
+  syntax_errors: 6
+  indentation_errors: 0
+  exhausted_context_windows: 4
+  test_timeouts: 1
+  command: aider --model fireworks_ai/accounts/fireworks/models/qwen2p5-coder-32b-instruct
+  date: 2024-11-24
+  versions: 0.64.2.dev
+  seconds_per_case: 10.4
+  total_cost: 0.5759
+
+- dirname: 2024-11-24-02-04-59--ollama-qwen2.5-coder:32b-instruct-q2_K-8kctx
+  test_cases: 133
+  model: "Ollama: q2_K"
+  edit_format: diff
+  commit_hash: 757eac0, bb78e2f, 8d0ba40-dirty, 1d09e96
+  pass_rate_1: 48.9
+  pass_rate_2: 61.7
+  percent_cases_well_formed: 91.7
+  error_outputs: 32
+  num_malformed_responses: 32
+  num_with_malformed_responses: 11
+  user_asks: 8
+  lazy_comments: 0
+  syntax_errors: 0
+  indentation_errors: 0
+  exhausted_context_windows: 0
+  test_timeouts: 1
+  command: aider --model ollama/qwen2.5-coder:32b-instruct-q2_K
+  date: 2024-11-24
+  versions: 0.64.2.dev
+  seconds_per_case: 97.8
+  total_cost: 0.0000
+
+- dirname: 2024-11-24-14-56-49--qwen25-32b-or-fireworks
+  test_cases: 133
+  model: "Fireworks via OpenRouter: unknown"
+  edit_format: diff
+  commit_hash: c2f184f
+  pass_rate_1: 55.6
+  pass_rate_2: 67.7
+  percent_cases_well_formed: 94.0
+  error_outputs: 39
+  num_malformed_responses: 24
+  num_with_malformed_responses: 8
+  user_asks: 13
+  lazy_comments: 0
+  syntax_errors: 1
+  indentation_errors: 1
+  exhausted_context_windows: 7
+  test_timeouts: 4
+  command: aider --model openrouter/qwen/qwen-2.5-coder-32b-instruct
+  date: 2024-11-24
+  versions: 0.64.2.dev
+  seconds_per_case: 16.1
+  total_cost: 0.1391
+
+- dirname: 2024-11-24-22-03-19--or-hyperbolic-or-fixed-blank-messages2
+  test_cases: 133
+  model: "Hyperbolic via OpenRouter: BF16"
+  edit_format: diff
+  commit_hash: 0c59d32
+  pass_rate_1: 55.6
+  pass_rate_2: 68.4
+  percent_cases_well_formed: 89.5
+  error_outputs: 28
+  num_malformed_responses: 24
+  num_with_malformed_responses: 14
+  user_asks: 29
+  lazy_comments: 0
+  syntax_errors: 1
+  indentation_errors: 0
+  exhausted_context_windows: 4
+  test_timeouts: 1
+  command: aider --model openrouter/qwen/qwen-2.5-coder-32b-instruct
+  date: 2024-11-24
+  versions: 0.64.2.dev
+  seconds_per_case: 41.5
+  total_cost: 0.1402
+  
+- dirname: 2024-11-24-15-00-50--qwen25-32b-or-deepinfra
+  test_cases: 133
+  model: "Deepinfra via OpenRouter: BF16"
+  edit_format: diff
+  commit_hash: c2f184f
+  pass_rate_1: 57.1
+  pass_rate_2: 69.9
+  percent_cases_well_formed: 89.5
+  error_outputs: 35
+  num_malformed_responses: 31
+  num_with_malformed_responses: 14
+  user_asks: 11
+  lazy_comments: 0
+  syntax_errors: 1
+  indentation_errors: 1
+  exhausted_context_windows: 4
+  test_timeouts: 1
+  command: aider --model openrouter/qwen/qwen-2.5-coder-32b-instruct
+  date: 2024-11-24
+  versions: 0.64.2.dev
+  seconds_per_case: 28.5
+  total_cost: 0.1390

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/edit-leaderboard.js

@@ -0,0 +1,97 @@
+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: 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
+    }]
+  };
+
+  var allData = [];
+  {% for row in edit_sorted %}
+    allData.push({
+      model: '{{ row.model }}',
+      pass_rate_2: {{ row.pass_rate_2 }},
+      percent_cases_well_formed: {{ row.percent_cases_well_formed }}
+    });
+  {% endfor %}
+
+  function updateChart() {
+    var selectedRows = document.querySelectorAll('tr.selected');
+    var showAll = selectedRows.length === 0;
+
+    leaderboardData.labels = [];
+    leaderboardData.datasets[0].data = [];
+
+    allData.forEach(function(row, index) {
+      var rowElement = document.getElementById('edit-row-' + index);
+      if (showAll) {
+        rowElement.classList.remove('selected');
+      }
+      if (showAll || rowElement.classList.contains('selected')) {
+        leaderboardData.labels.push(row.model);
+        leaderboardData.datasets[0].data.push(row.pass_rate_2);
+      }
+    });
+
+    leaderboardChart.update();
+  }
+
+  var tableBody = document.querySelector('table tbody');
+  allData.forEach(function(row, index) {
+    var tr = tableBody.children[index];
+    tr.id = 'edit-row-' + index;
+    tr.style.cursor = 'pointer';
+    tr.onclick = function() {
+      this.classList.toggle('selected');
+      updateChart();
+    };
+  });
+
+  var leaderboardChart = new Chart(ctx, {
+    type: 'bar',
+    data: leaderboardData,
+    options: {
+      scales: {
+        y: {
+          beginAtZero: true
+        }
+      }
+    }
+  });
+
+  updateChart();
+  
+  // Add search functionality for edit table
+  document.getElementById('editSearchInput').addEventListener('keyup', function() {
+    var searchWords = this.value.toLowerCase().split(' ').filter(word => word.length > 0);
+    var tableBody = document.querySelector('table:first-of-type tbody');
+    var rows = tableBody.getElementsByTagName('tr');
+    
+    leaderboardData.labels = [];
+    leaderboardData.datasets[0].data = [];
+    
+    for (var i = 0; i < rows.length; i++) {
+      var rowText = rows[i].textContent;
+      if (searchWords.every(word => rowText.toLowerCase().includes(word))) {
+        rows[i].style.display = '';
+        leaderboardData.labels.push(allData[i].model);
+        leaderboardData.datasets[0].data.push(allData[i].pass_rate_2);
+      } else {
+        rows[i].style.display = 'none';
+      }
+    }
+    leaderboardChart.update();
+  });
+});

aider/website/_includes/get-started.md

@@ -2,7 +2,7 @@
 You can get started quickly like this:
 
 ```
-python -m pip install aider-chat
+python -m pip install -U aider-chat
 
 # Change directory into a git repo
 cd /to/your/git/repo

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

@@ -1,5 +1,15 @@
 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.
+    - Or, start with `{tag` (where "tag" is any sequence of letters/numbers) and end with `tag}`. This is useful when you need to include closing braces `}` in your message.
   - 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.
+  - Use the `/editor` command to open your editor to create the next chat message. See [editor configuration docs](/docs/config/editor.html) for more info.
+
+Example with a tag:
+```
+{python
+def hello():
+    print("Hello}")  # Note: contains a brace
+python}
+```

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/_includes/quant-chart.js

@@ -0,0 +1,95 @@
+document.addEventListener('DOMContentLoaded', function () {
+  var ctx = document.getElementById('quantChart').getContext('2d');
+  var allData = [];
+  {% for row in site.data.quant %}
+    allData.push({
+      model: '{{ row.model }}',
+      pass_rate_2: {{ row.pass_rate_2 }}
+    });
+  {% endfor %}
+
+  // Sort data by pass_rate_2 in descending order
+  allData.sort((a, b) => b.pass_rate_2 - a.pass_rate_2);
+
+  var chart;
+  
+  function updateChart(filterText) {
+    var filteredData = allData.filter(row => 
+      row.model.toLowerCase().includes(filterText.toLowerCase())
+    );
+    
+    var chartData = {
+      labels: filteredData.map(row => row.model),
+      datasets: [{
+        label: 'Percent completed correctly',
+        data: filteredData.map(row => row.pass_rate_2),
+        backgroundColor: 'rgba(54, 162, 235, 0.2)',
+        borderColor: 'rgba(54, 162, 235, 1)',
+        borderWidth: 1
+      }]
+    };
+
+    if (chart) {
+      chart.data = chartData;
+      chart.update();
+    } else {
+      chart = new Chart(ctx, {
+        type: 'bar',
+        data: chartData,
+        options: {
+          plugins: {
+            legend: {
+              display: false
+            },
+            title: {
+              display: true,
+              text: 'Aider code editing benchmark',
+              font: {
+                size: 16
+              }
+            }
+          },
+          scales: {
+            y: {
+              beginAtZero: true,
+              title: {
+                display: true,
+                text: 'Percent completed correctly',
+                font: {
+                  size: 14
+                }
+              },
+              ticks: {
+                font: {
+                  size: 16
+                }
+              }
+            },
+            x: {
+              ticks: {
+                font: {
+                  size: 16
+                }
+              },
+              title: {
+                display: true,
+                text: 'Provider: quantization',
+                font: {
+                  size: 14
+                }
+              }
+            }
+          }
+        }
+      });
+    }
+  }
+
+  // Initial chart render
+  updateChart('');
+
+  // Connect search input to chart filtering
+  document.getElementById('quantSearchInput').addEventListener('keyup', function() {
+    updateChart(this.value);
+  });
+});

aider/website/_includes/refactor-leaderboard.js

@@ -0,0 +1,90 @@
+document.addEventListener('DOMContentLoaded', function () {
+  var ctx = document.getElementById('refacChart').getContext('2d');
+  var leaderboardData = {
+    labels: [],
+    datasets: [{
+      label: 'Percent completed correctly',
+      data: [],
+      backgroundColor: 'rgba(54, 162, 235, 0.2)',
+      borderColor: 'rgba(54, 162, 235, 1)',
+      borderWidth: 1
+    }]
+  };
+
+  var allData = [];
+  {% for row in refac_sorted %}
+    allData.push({
+      model: '{{ row.model }}',
+      pass_rate_1: {{ row.pass_rate_1 }},
+      percent_cases_well_formed: {{ row.percent_cases_well_formed }}
+    });
+  {% endfor %}
+
+  function updateChart() {
+    var selectedRows = document.querySelectorAll('tr.selected');
+    var showAll = selectedRows.length === 0;
+
+    leaderboardData.labels = [];
+    leaderboardData.datasets[0].data = [];
+
+    allData.forEach(function(row, index) {
+      var rowElement = document.getElementById('refac-row-' + index);
+      if (showAll) {
+        rowElement.classList.remove('selected');
+      }
+      if (showAll || rowElement.classList.contains('selected')) {
+        leaderboardData.labels.push(row.model);
+        leaderboardData.datasets[0].data.push(row.pass_rate_1);
+      }
+    });
+
+    leaderboardChart.update();
+  }
+
+  var tableBody = document.querySelectorAll('table tbody')[1];
+  allData.forEach(function(row, index) {
+    var tr = tableBody.children[index];
+    tr.id = 'refac-row-' + index;
+    tr.style.cursor = 'pointer';
+    tr.onclick = function() {
+      this.classList.toggle('selected');
+      updateChart();
+    };
+  });
+
+  var leaderboardChart = new Chart(ctx, {
+    type: 'bar',
+    data: leaderboardData,
+    options: {
+      scales: {
+        y: {
+          beginAtZero: true
+        }
+      }
+    }
+  });
+
+  updateChart();
+
+  // Add search functionality for refactoring table
+  document.getElementById('refacSearchInput').addEventListener('keyup', function() {
+    var searchWords = this.value.toLowerCase().split(' ').filter(word => word.length > 0);
+    var tableBody = document.querySelectorAll('table tbody')[1];
+    var rows = tableBody.getElementsByTagName('tr');
+    
+    leaderboardData.labels = [];
+    leaderboardData.datasets[0].data = [];
+    
+    for (var i = 0; i < rows.length; i++) {
+      var rowText = rows[i].textContent;
+      if (searchWords.every(word => rowText.toLowerCase().includes(word))) {
+        rows[i].style.display = '';
+        leaderboardData.labels.push(allData[i].model);
+        leaderboardData.datasets[0].data.push(allData[i].pass_rate_1);
+      } else {
+        rows[i].style.display = 'none';
+      }
+    }
+    leaderboardChart.update();
+  });
+});

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.
@@ -209,7 +209,7 @@ that aider originally used.
 Switching from ctags to tree-sitter provides a bunch of benefits:
 
 - The map is richer, showing full function call signatures and other details straight from the source files.
-- Thanks to `py-tree-sitter-languages`, we get full support for many programming languages via a python package that's automatically installed as part of the normal `python -m pip install aider-chat`.
+- Thanks to `py-tree-sitter-languages`, we get full support for many programming languages via a python package that's automatically installed as part of the normal `python -m pip install -U aider-chat`.
 - We remove the requirement for users to manually install `universal-ctags` via some external tool or package manager (brew, apt, choco, etc).
 - Tree-sitter integration is a key enabler for future work and capabilities for aider.
 
@@ -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

@@ -23,14 +23,14 @@ making it the best available model for pair programming with AI.
 To use Claude 3 Opus with aider:
 
 ```
-python -m pip install aider-chat
+python -m pip install -U aider-chat
 export ANTHROPIC_API_KEY=sk-...
 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-02-browser.md

@@ -46,7 +46,7 @@ It also supports [connecting to almost any LLM](https://aider.chat/docs/llms.htm
 Use the `--browser` switch to launch the browser version of aider:
 
 ```
-python -m pip install aider-chat
+python -m pip install -U aider-chat
 
 export OPENAI_API_KEY=<key> # Mac/Linux
 setx   OPENAI_API_KEY <key> # Windows, restart shell after setx

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
@@ -116,7 +116,7 @@ for more details, but
 you can get started quickly with aider and Sonnet like this:
 
 ```
-$ python -m pip install aider-chat
+$ python -m pip install -U aider-chat
 
 $ export ANTHROPIC_API_KEY=<key> # Mac/Linux
 $ setx   ANTHROPIC_API_KEY <key> # Windows, restart shell after setx

aider/website/_posts/2024-07-25-new-models.md

@@ -30,7 +30,7 @@ included for scale.
 You can code with all of these models using aider like this:
 
 ```
-$ python -m pip install aider-chat
+$ python -m pip install -U aider-chat
 
 # Change directory into a git repo to work on
 $ cd /to/your/git/repo

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

@@ -0,0 +1,418 @@
+---
+title: Separating code reasoning and editing
+excerpt: An Architect model describes how to solve the coding problem, and an Editor model translates that into file edits. This Architect/Editor approach produces SOTA benchmark results.
+highlight_image: /assets/architect.jpg
+draft: false
+nav_exclude: true
+---
+{% if page.date %}
+<p class="post-date">{{ page.date | date: "%B %d, %Y" }}</p>
+{% endif %}
+
+# Separating code reasoning and editing
+
+Aider now has experimental support for using two models to complete each coding task:
+
+- An Architect model is asked to describe how to solve the coding problem.
+- An Editor model is given the Architect's solution and asked to produce specific code editing instructions to apply those changes to existing source files.
+
+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).
+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>
+  .shaded td {
+    background-color: #f2f2f2;
+    border-top: 1px solid #ccc;
+  }
+  .table-container {
+    max-width: 100%;
+    overflow-x: auto;
+  }
+  .responsive-table {
+    border-collapse: separate;
+    border-spacing: 0;
+    width: 100%;
+    font-size: 16px;
+    border: 1px solid #ddd;
+  }
+  .responsive-table th, .responsive-table td {
+    padding: 8px;
+    text-align: left;
+    border-bottom: 1px solid #ddd;
+    word-break: break-word;
+  }
+  .responsive-table th {
+    background-color: #e2e2e2;
+  }
+  .responsive-table th:first-child,
+  .responsive-table td:first-child {
+    border-left: 1px solid #ddd;
+  }
+  .responsive-table th:last-child,
+  .responsive-table td:last-child {
+    border-right: 1px solid #ddd;
+  }
+  
+  @media screen and (max-width: 600px) {
+    .responsive-table {
+      font-size: 12px;
+    }
+    .responsive-table th, .responsive-table td {
+      padding: 4px;
+    }
+  }
+</style>
+
+<style>
+  #passRateChart {
+    max-width: 100%;
+    height: auto !important;
+  }
+</style>
+<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/chartjs-plugin-annotation@1.0.2"></script>
+{% assign sorted_data = site.data.architect | sort: "pass_rate_2" | reverse %}
+<canvas id="passRateChart" width="400" height="250"></canvas>
+<script>
+  document.addEventListener("DOMContentLoaded", function() {
+    var ctx = document.getElementById('passRateChart').getContext('2d');
+    
+    // Function to determine aspect ratio and base font size based on screen width
+    function getChartSettings() {
+      if (window.innerWidth < 600) {
+        return { aspectRatio: 1, baseFontSize: 8 }; // Slightly taller for small screens
+      } else if (window.innerWidth < 800) {
+        return { aspectRatio: 1.2, baseFontSize: 10 }; // Slightly taller for small screens
+      } else {
+        return { aspectRatio: 1.4, baseFontSize: 12 }; // Slightly taller for larger screens
+      }
+    }
+
+    var chartSettings = getChartSettings();
+    var baseFontSize = chartSettings.baseFontSize;
+
+    var labels = [];
+    var data = [];
+    var colorMapping = {
+      "claude-3.5-sonnet": "rgba(75, 192, 192, 0.2)",
+      "gpt-4o": "rgba(255, 99, 132, 0.2)",
+      "o1-preview": "rgba(54, 162, 235, 0.2)",
+      "o1-mini": "rgba(255, 206, 86, 0.2)",
+      "gpt-4o-mini": "rgba(153, 102, 255, 0.2)"
+    };
+    var borderColorMapping = {
+      "claude-3.5-sonnet": "rgba(75, 192, 192, 1)",
+      "gpt-4o": "rgba(255, 99, 132, 1)",
+      "o1-preview": "rgba(54, 162, 235, 1)",
+      "o1-mini": "rgba(255, 206, 86, 1)",
+      "gpt-4o-mini": "rgba(153, 102, 255, 1)"
+    };
+    var backgroundColors = [];
+    var borderColors = [];
+    var patterns = {};
+    for (var key in colorMapping) {
+      patterns[key] = ctx.createPattern(createStripePattern(colorMapping[key]), 'repeat');
+    }
+    {% assign grouped_data = sorted_data | group_by: "model" %}
+    {% for group in grouped_data %}
+      {% for item in group.items %}
+        if ("{{ item.editor_model }}" == "") {
+          labels.push("Baseline");
+        } else {       
+          labels.push("{{ item.editor_model }}/{{ item.editor_edit_format | default: item.edit_format }}");
+        }
+        data.push({{ item.pass_rate_2 }});
+        if ("{{ item.editor_model }}" == "") {
+          backgroundColors.push(patterns["{{ item.model }}"]);
+        } else {
+          backgroundColors.push(colorMapping["{{ item.model }}"]);
+        }
+        borderColors.push(borderColorMapping["{{ item.model }}"]);
+      {% endfor %}
+    {% endfor %}
+    labels.reverse();
+    data.reverse();
+    backgroundColors.reverse();
+    borderColors.reverse();
+    var chart = new Chart(ctx, {
+      type: 'bar',
+      data: {
+        labels: labels,
+        datasets: [{
+          label: 'Pass Rate',
+          data: data,
+          backgroundColor: backgroundColors,
+          borderColor: borderColors,
+          borderWidth: 1
+        }]
+      },
+      options: {
+        responsive: true,
+        maintainAspectRatio: true,
+        aspectRatio: chartSettings.aspectRatio,
+        scales: {
+          y: { 
+            beginAtZero: true,
+            title: {
+              display: true,
+              text: 'Pass Rate (%)',
+              font: {
+                size: baseFontSize + 6
+              }
+            },
+            ticks: {
+              font: {
+                size: baseFontSize
+              }
+            }
+          },
+          x: {
+            title: {
+              display: true,
+              text: 'Editor model and edit format',
+              font: {
+                size: baseFontSize + 6
+              }
+            },
+            ticks: {
+              font: {
+                size: baseFontSize + 4
+              },
+              maxRotation: 90, // Allow full rotation if needed
+              minRotation: 45  // Start rotating at 45 degrees to fit more labels
+            }
+          }
+        },
+        plugins: {
+          annotation: {
+            annotations: {
+              line1: {
+                type: 'line',
+                yMin: 79.7,
+                yMax: 79.7,
+                borderColor: 'rgba(255, 99, 132, 0.8)',
+                borderWidth: 2,
+                borderDash: [6, 6],
+                label: {
+                  content: 'Previous SOTA',
+                  enabled: true,
+                  position: 'start',
+                  xAdjust: 10,
+                  font: {
+                    size: baseFontSize
+                  }
+                }
+              }
+            }
+          },
+          legend: {
+            display: true,
+            title: {
+              display: true,
+              text: 'Architect model',
+              font: {
+                size: baseFontSize + 2,
+                weight: 'bold'
+              }
+            },
+            labels: {
+              font: {
+                size: baseFontSize + 4
+              },
+              generateLabels: function(chart) {
+                var colorMapping = {
+                  "o1-preview": "rgba(54, 162, 235, 0.2)",
+                  "claude-3.5-sonnet": "rgba(75, 192, 192, 0.2)",
+                  "gpt-4o": "rgba(255, 99, 132, 0.2)",
+                  "o1-mini": "rgba(255, 206, 86, 0.2)",
+                  "gpt-4o-mini": "rgba(153, 102, 255, 0.2)"
+                };
+                return Object.keys(colorMapping).reverse().map(function(key) {
+                  return {
+                    text: key,
+                    fillStyle: colorMapping[key],
+                    strokeStyle: colorMapping[key].replace('0.2', '1'),
+                    lineWidth: 1
+                  };
+                });
+              }
+            }
+          }
+        }
+      }
+    });
+
+    // Update aspect ratio and font sizes on window resize
+    window.addEventListener('resize', function() {
+      var newSettings = getChartSettings();
+      chart.options.aspectRatio = newSettings.aspectRatio;
+      baseFontSize = newSettings.baseFontSize;
+      
+      // Update font sizes
+      chart.options.scales.y.title.font.size = baseFontSize + 6;
+      chart.options.scales.y.ticks.font.size = baseFontSize;
+      chart.options.scales.x.title.font.size = baseFontSize + 6;
+      chart.options.scales.x.ticks.font.size = baseFontSize + 4;
+      chart.options.plugins.annotation.annotations.line1.label.font.size = baseFontSize;
+      chart.options.plugins.legend.title.font.size = baseFontSize + 4;
+      chart.options.plugins.legend.labels.font.size = baseFontSize + 4;
+      
+      chart.update();
+    });
+  });
+
+  function createStripePattern(baseColor) {
+    var canvas = document.createElement('canvas');
+    canvas.width = 10;
+    canvas.height = 10;
+    var ctx = canvas.getContext('2d');
+
+    ctx.fillStyle = baseColor;
+    ctx.fillRect(0, 0, canvas.width, canvas.height);
+    ctx.strokeStyle = 'rgba(0, 0, 0, 0.1)';
+    ctx.lineWidth = 2;
+    ctx.beginPath();
+    ctx.moveTo(0, 0);
+    ctx.lineTo(10, 10);
+    ctx.stroke();
+
+    return canvas;
+  }
+</script>
+
+## Motivation
+
+This approach was motivated by the release of OpenAI's o1 models.
+They are strong at reasoning, but often fail to output properly formatted
+code editing instructions.
+It helps to instead let them describe the solution
+however they prefer and then pass that output to a more traditional LLM.
+This second Editor LLM can then interpret the solution description and
+produce the code editing instructions needed to update
+the existing source code.
+
+This approach has recently become attractive for aider due to 
+rapid improvements in the speed and costs of frontier models.
+In particular, chaining older LLMs would have been quite slow and
+incompatible with aider's goal of providing an interactive,
+pair programming AI coding experience.
+
+## Code reasoning and code editing
+
+Normally aider asks the model to solve a coding problem in one prompt,
+asking the LLM to explain the solution and return 
+a well formatted series of file edits.
+All of [aider's editing formats](/docs/more/edit-formats.html)
+require the LLM to return source code edits in a specific text
+format, so that aider can process the edits and apply them to the local source files.
+
+Because this all happens in a single prompt/response round trip to the LLM,
+the model has to split its attention between 
+solving the coding problem and conforming to the edit format.
+
+The Architect/Editor approach splits this into two inference steps, possibly
+using two different LLMs:
+
+1. Solve the coding problem (Architect).
+2. Turn the proposed solution into a series of well formed code edits (Editor).
+
+The Architect/Editor approach allows the Architect to focus on solving the coding problem
+and *describe the solution however comes naturally to it*.
+Similarly, the Editor can focus all of its attention on properly formatting the edits
+without needing to reason much about how to solve the coding problem.
+
+We can assign the Architect and Editor roles to LLMs which are well suited to their needs.
+Strong reasoning model like o1-preview make excellent Architects, while
+the Editor role can be assigned to an appropriate model based on cost, speed
+and code editing skill.
+
+## Results
+
+The graph above and the table below show the
+[aider's code editing benchmark](/docs/benchmarks.html#the-benchmark)
+score for various combinations of Architect and Editor models.
+
+
+Some noteworthy observations:
+
+- 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. 
+Sonnet, GPT-4o and GPT-4o-mini all scored higher when used as an Architect/Editor pair.
+- Deepseek is surprisingly effective as an Editor model. It seems remarkably capable at turning proposed coding solutions into new, updated versions of the source files. Using the efficient "diff" editing format, Deepseek helps all the Architect models except for Sonnet.
+
+## Try it!
+
+The development version of aider 
+has built in defaults to support Architect/Editor coding with
+o1-preview, o1-mini, GPT-4o and Claude 3.5 Sonnet.
+Run aider with `--architect` or get started quickly like this:
+
+```
+pip install -U aider-chat
+
+# Change directory into a git repo
+cd /to/your/git/repo
+
+# Work with Claude 3.5 Sonnet as the Architect and Editor
+export ANTHROPIC_API_KEY=your-key-goes-here
+aider --sonnet --architect
+
+# Work with OpenAI models, using gpt-4o as the Editor
+export OPENAI_API_KEY=your-key-goes-here
+aider --4o --architect
+aider --o1-mini --architect
+aider --o1-preview --architect
+```
+
+## More info
+
+Aider has a number of "chat modes", and "architect" is available as a new chat mode.
+The `--architect` switch is a shortcut for `--chat-mode architect`.
+For more details, see documentation on 
+[aider's chat modes](/docs/usage/modes.html).
+
+
+## Full results
+
+Below are the benchmark results using various models as the Architect, paired with
+various models as the Editor.
+Each section includes a "baseline" result,
+where the model works
+by itself in aider's normal "code" editing mode
+(not as part of an Architect/Editor configuration).
+This "solo" baseline represents the performance previously available when using
+this model with aider.
+
+<div class="table-container">
+  <table class="responsive-table">
+    <thead>
+      <tr>
+        <th>Architect</th>
+        <th>Editor</th>
+        <th>Edit Format</th>
+        <th>Pass Rate</th>
+      </tr>
+    </thead>
+    <tbody>
+      {% for group in grouped_data %}
+        {% assign group_class = forloop.index | modulo: 2 | plus: 1 %}
+        {% for item in group.items %}
+          <tr class="{% if group_class == 1 %}shaded{% endif %}">
+            <td>{{ item.model }}</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>
+        {% endfor %}
+      {% endfor %}
+    </tbody>
+  </table>
+</div>

aider/website/_posts/2024-11-21-quantization.md

@@ -0,0 +1,169 @@
+---
+title: Details matter with open source models
+excerpt: Open source LLMs are becoming very powerful, but pay attention to how you (or your provider) are serving the model. It can affect code editing skill.
+highlight_image: /assets/quantization.jpg
+draft: false
+nav_exclude: true
+---
+{% if page.date %}
+<p class="post-date">{{ page.date | date: "%B %d, %Y" }}</p>
+{% endif %}
+
+# Details matter with open source models
+{: .no_toc }
+
+Open source models like Qwen 2.5 32B Instruct are performing very well on
+aider's code editing benchmark, rivaling closed source frontier models.
+
+But pay attention to how your model is being served and quantized, 
+as it can impact code editing skill.
+Open source models are often available at a variety of quantizations,
+and can be served with different token limits.
+These details matter when working with code.
+
+The graph and table below compares different versions of the Qwen 2.5 Coder 32B Instruct model,
+served both locally and from a variety of cloud providers.
+
+- The [HuggingFace BF16 weights](https://huggingface.co/Qwen/Qwen2.5-Coder-32B-Instruct) served via [glhf.chat](https://glhf.chat).
+- [4bit and 8bit quants for mlx](https://t.co/cwX3DYX35D).
+- The results from [OpenRouter's mix of providers](https://openrouter.ai/qwen/qwen-2.5-coder-32b-instruct/providers) which serve the model with different levels of quantization.
+- Results from individual providers served via OpenRouter and directly to their own APIs.
+- Ollama locally serving different quantizations from the [Ollama model library](https://ollama.com/library/qwen2.5-coder:32b-instruct-q4_K_M).
+
+The best versions of the model rival GPT-4o, while the worst performer
+is more like the older GPT-4 Turbo.
+Suboptimal choices in quantization and token limits can
+easily produce far worse results.
+
+This benchmarking effort highlighted a number of pitfalls and details which
+can have a significant impact on the model's ability to correctly edit code:
+
+- Quantization -- Open source models are often available at dozens of different quantizations.
+- Context window -- Cloud providers can decide how large a context window to accept,
+and they often choose differently. Ollama defaults to a tiny 2k context window,
+and silently discards data that exceeds it.
+- Output token limits -- Open source models are often served with wildly
+differing output token limits. This has a direct impact on how much code the
+model can write or edit in a response.
+- Buggy cloud providers -- Between Qwen and DeepSeep, there were
+multiple cloud providers with broken or buggy API endpoints that seemed
+to be returning result different from expected based on the advertised
+quantization and context sizes.
+
+
+### Sections
+{: .no_toc }
+
+- TOC
+{:toc}
+
+## Benchmark results
+
+<canvas id="quantChart" width="800" height="600" style="margin: 20px 0"></canvas>
+<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+<script>
+{% include quant-chart.js %}
+</script>
+
+<input type="text" id="quantSearchInput" placeholder="Search..." style="width: 100%; max-width: 800px; margin: 10px auto; padding: 8px; display: block; border: 1px solid #ddd; border-radius: 4px;">
+
+<table style="width: 100%; max-width: 800px; margin: auto; border-collapse: collapse; box-shadow: 0 2px 4px rgba(0,0,0,0.1); font-size: 14px;">
+  <thead style="background-color: #f2f2f2;">
+    <tr>
+      <th style="padding: 8px; text-align: left;">Model</th>
+      <th style="padding: 8px; text-align: center;">Percent completed correctly</th>
+      <th style="padding: 8px; text-align: center;">Percent using correct edit format</th>
+      <th style="padding: 8px; text-align: left;">Command</th>
+      <th style="padding: 8px; text-align: center;">Edit format</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% assign quant_sorted = site.data.quant | sort: 'pass_rate_2' | reverse %}
+    {% for row in quant_sorted %}
+      <tr style="border-bottom: 1px solid #ddd;">
+        <td style="padding: 8px;">{{ row.model }}</td>
+        <td style="padding: 8px; text-align: center;">{{ row.pass_rate_2 }}%</td>
+        <td style="padding: 8px; text-align: center;">{{ row.percent_cases_well_formed }}%</td>
+        <td style="padding: 8px;"><code>{{ row.command }}</code></td>
+        <td style="padding: 8px; text-align: center;">{{ row.edit_format }}</td>
+      </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+<style>
+  tr.selected {
+    color: #0056b3;
+  }
+  table {
+    table-layout: fixed;
+  }
+  td, th {
+    word-wrap: break-word;
+    overflow-wrap: break-word;
+  }
+  td:nth-child(3), td:nth-child(4) {
+    font-size: 12px;
+  }
+</style>
+
+<script>
+document.getElementById('quantSearchInput').addEventListener('keyup', function() {
+    var input = this.value.toLowerCase();
+    var rows = document.querySelectorAll('tbody tr');
+    
+    rows.forEach(function(row) {
+        var text = row.textContent.toLowerCase();
+        if(text.includes(input)) {
+            row.style.display = '';
+            row.classList.add('selected');
+        } else {
+            row.style.display = 'none';
+            row.classList.remove('selected');
+        }
+    });
+});
+</script>
+
+## Setting Ollama's context window size
+
+[Ollama uses a 2k context window by default](https://github.com/ollama/ollama/blob/main/docs/faq.md#how-can-i-specify-the-context-window-size),
+which is very small for working with aider.
+Unlike most other LLM servers, Ollama does not throw an error if you submit
+a request that exceeds the context window.
+Instead, it just silently truncates the request by discarding the "oldest" messages
+in the chat to make it fit within the context window.
+
+All of the Ollama results above were collected with at least an 8k context window, which
+is large enough to attempt all the coding problems in the benchmark.
+Aider sets Ollama's context window to 8k by default.
+
+You can change the Ollama server's context window with a 
+[`.aider.model.settings.yml` file](https://aider.chat/docs/config/adv-model-settings.html#model-settings)
+like this:
+
+```
+- name: ollama/qwen2.5-coder:32b-instruct-fp16
+  extra_params:
+    num_ctx: 8192
+```
+
+## Choosing providers with OpenRouter
+
+OpenRouter allows you to ignore specific providers in your
+[preferences](https://openrouter.ai/settings/preferences).
+This can be used to limit your OpenRouter requests to be
+served by only your preferred providers.
+
+## Notes
+
+This article went through many revisions as I received feedback from
+numerous members of the community.
+Here are some of the noteworthy learnings and changes:
+
+- The first version of this article included incorrect Ollama models.
+- Earlier Ollama results used the too small default 2k context window,
+artificially harming the benchmark results.
+- The benchmark results appear to have uncovered a problem in the way
+OpenRouter was communicating with Hyperbolic.
+They fixed the issue 11/24/24, shortly after it was pointed out.

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
 
@@ -50,6 +53,12 @@
 ## Use deepseek/deepseek-coder model for the main chat
 #deepseek: false
 
+## Use o1-mini model for the main chat
+#o1-mini: false
+
+## Use o1-preview model for the main chat
+#o1-preview: false
+
 #################
 # Model Settings:
 
@@ -77,23 +86,43 @@
 ## Specify a file with context window and costs for unknown models
 #model-metadata-file: .aider.model.metadata.json
 
+## Add a model alias (can be used multiple times)
+#alias: xxx
+## Specify multiple values like this:
+#alias:
+#  - xxx
+#  - yyy
+#  - zzz
+
 ## Verify the SSL cert when connecting to models (default: True)
 #verify-ssl: true
 
 ## Specify what edit format the LLM should use (default depends on model)
 #edit-format: xxx
 
+## Use architect edit format for the main chat
+#architect: false
+
 ## Specify the model to use for commit messages and chat history summarization (default depends on --model)
 #weak-model: xxx
 
+## Specify the model to use for editor tasks (default depends on --model)
+#editor-model: xxx
+
+## Specify the edit format for the editor model (default: depends on editor model)
+#editor-edit-format: xxx
+
 ## Only work with models that have meta-data available (default: True)
 #show-model-warnings: true
 
-## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
-#map-tokens: xxx
+## 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
 
-## Control how often the repo map is refreshed (default: auto)
-#map-refresh: auto
+## Specify the .env file to load (default: .env in git root)
+#env-file: .env
+
+#################
+# Cache Settings:
 
 ## Enable caching of prompts (default: False)
 #cache-prompts: false
@@ -101,15 +130,18 @@
 ## Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)
 #cache-keepalive-pings: false
 
+###################
+# Repomap Settings:
+
+## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
+#map-tokens: xxx
+
+## Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto)
+#map-refresh: auto
+
 ## Multiplier for map tokens when no files are specified (default: 2)
 #map-multiplier-no-files: true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
-#max-chat-history-tokens: xxx
-
-## Specify the .env file to load (default: .env in git root)
-#env-file: .env
-
 ################
 # History Files:
 
@@ -155,6 +187,18 @@
 ## Set the color for assistant output (default: #0088ff)
 #assistant-output-color: #0088ff
 
+## Set the color for the completion menu (default: terminal's default text color)
+#completion-menu-color: xxx
+
+## Set the background color for the completion menu (default: terminal's default background color)
+#completion-menu-bg-color: xxx
+
+## Set the color for the current item in the completion menu (default: terminal's default background color)
+#completion-menu-current-color: xxx
+
+## Set the background color for the current item in the completion menu (default: terminal's default text color)
+#completion-menu-current-bg-color: xxx
+
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
 #code-theme: default
 
@@ -203,6 +247,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:
 
@@ -212,7 +259,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
@@ -226,25 +276,40 @@
 ## Run tests and fix problems found
 #test: false
 
+############
+# Analytics:
+
+## Enable/disable analytics for current session (default: random)
+#analytics: xxx
+
+## 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
 
-## Specify the language for voice using ISO 639-1 code (default: auto)
-#voice-language: en
-
 ## Specify the language to use in the chat (default: None, uses system settings)
 #chat-language: xxx
 
@@ -257,6 +322,9 @@
 ## Check for new aider versions on launch
 #check-update: true
 
+## Show release notes on first run of new version (default: None, ask user)
+#show-release-notes: xxx
+
 ## Install the latest version from the main branch
 #install-main-branch: false
 
@@ -266,8 +334,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
@@ -287,14 +358,35 @@
 ## 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
+
+## Enable/disable detection and offering to add URLs to chat (default: True)
+#detect-urls: true
+
+## Specify which editor to use for the /editor command
+#editor: xxx
+
+#################
+# Voice Settings:
+
+## Audio format for voice recording (default: wav). webm and mp3 require ffmpeg
+#voice-format: wav
+
+## Specify the language for voice using ISO 639-1 code (default: auto)
+#voice-language: en

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=
 
@@ -54,6 +57,12 @@
 ## Use deepseek/deepseek-coder model for the main chat
 #AIDER_DEEPSEEK=
 
+## Use o1-mini model for the main chat
+#AIDER_O1_MINI=
+
+## Use o1-preview model for the main chat
+#AIDER_O1_PREVIEW=
+
 #################
 # Model Settings:
 
@@ -81,23 +90,38 @@
 ## Specify a file with context window and costs for unknown models
 #AIDER_MODEL_METADATA_FILE=.aider.model.metadata.json
 
+## Add a model alias (can be used multiple times)
+#AIDER_ALIAS=
+
 ## Verify the SSL cert when connecting to models (default: True)
 #AIDER_VERIFY_SSL=true
 
 ## Specify what edit format the LLM should use (default depends on model)
 #AIDER_EDIT_FORMAT=
 
+## Use architect edit format for the main chat
+#AIDER_ARCHITECT=
+
 ## Specify the model to use for commit messages and chat history summarization (default depends on --model)
 #AIDER_WEAK_MODEL=
 
+## Specify the model to use for editor tasks (default depends on --model)
+#AIDER_EDITOR_MODEL=
+
+## Specify the edit format for the editor model (default: depends on editor model)
+#AIDER_EDITOR_EDIT_FORMAT=
+
 ## Only work with models that have meta-data available (default: True)
 #AIDER_SHOW_MODEL_WARNINGS=true
 
-## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
-#AIDER_MAP_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=
 
-## Control how often the repo map is refreshed (default: auto)
-#AIDER_MAP_REFRESH=auto
+## Specify the .env file to load (default: .env in git root)
+#AIDER_ENV_FILE=.env
+
+#################
+# Cache Settings:
 
 ## Enable caching of prompts (default: False)
 #AIDER_CACHE_PROMPTS=false
@@ -105,15 +129,18 @@
 ## Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)
 #AIDER_CACHE_KEEPALIVE_PINGS=false
 
+###################
+# Repomap Settings:
+
+## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
+#AIDER_MAP_TOKENS=
+
+## Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto)
+#AIDER_MAP_REFRESH=auto
+
 ## Multiplier for map tokens when no files are specified (default: 2)
 #AIDER_MAP_MULTIPLIER_NO_FILES=true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
-#AIDER_MAX_CHAT_HISTORY_TOKENS=
-
-## Specify the .env file to load (default: .env in git root)
-#AIDER_ENV_FILE=.env
-
 ################
 # History Files:
 
@@ -159,6 +186,18 @@
 ## Set the color for assistant output (default: #0088ff)
 #AIDER_ASSISTANT_OUTPUT_COLOR=#0088ff
 
+## Set the color for the completion menu (default: terminal's default text color)
+#AIDER_COMPLETION_MENU_COLOR=
+
+## Set the background color for the completion menu (default: terminal's default background color)
+#AIDER_COMPLETION_MENU_BG_COLOR=
+
+## Set the color for the current item in the completion menu (default: terminal's default background color)
+#AIDER_COMPLETION_MENU_CURRENT_COLOR=
+
+## Set the background color for the current item in the completion menu (default: terminal's default text color)
+#AIDER_COMPLETION_MENU_CURRENT_BG_COLOR=
+
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
 #AIDER_CODE_THEME=default
 
@@ -207,6 +246,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:
 
@@ -228,6 +270,18 @@
 ## Run tests and fix problems found
 #AIDER_TEST=false
 
+############
+# Analytics:
+
+## Enable/disable analytics for current session (default: random)
+#AIDER_ANALYTICS=
+
+## Specify a file to log analytics events
+#AIDER_ANALYTICS_LOG=
+
+## Permanently disable analytics
+#AIDER_ANALYTICS_DISABLE=false
+
 #################
 # Other Settings:
 
@@ -240,9 +294,6 @@
 ## Use VI editing mode in the terminal (default: False)
 #AIDER_VIM=false
 
-## Specify the language for voice using ISO 639-1 code (default: auto)
-#AIDER_VOICE_LANGUAGE=en
-
 ## Specify the language to use in the chat (default: None, uses system settings)
 #AIDER_CHAT_LANGUAGE=
 
@@ -252,6 +303,9 @@
 ## Check for new aider versions on launch
 #AIDER_CHECK_UPDATE=true
 
+## Show release notes on first run of new version (default: None, ask user)
+#AIDER_SHOW_RELEASE_NOTES=
+
 ## Install the latest version from the main branch
 #AIDER_INSTALL_MAIN_BRANCH=false
 
@@ -261,8 +315,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
@@ -282,11 +339,32 @@
 ## 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
+
+## Enable/disable detection and offering to add URLs to chat (default: True)
+#AIDER_DETECT_URLS=true
+
+## Specify which editor to use for the /editor command
+#AIDER_EDITOR=
+
+#################
+# Voice Settings:
+
+## Audio format for voice recording (default: wav). webm and mp3 require ffmpeg
+#AIDER_VOICE_FORMAT=wav
+
+## Specify the language for voice using ISO 639-1 code (default: auto)
+#AIDER_VOICE_LANGUAGE=en

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

@@ -55,7 +55,7 @@ about prompting GPT for complex tasks like coding. It's beneficial to
 minimize the "cognitive overhead" of formatting the response, allowing
 GPT to concentrate on the coding task at hand.
 
-As a thought experiment, imagine a slack conversation with a junior developer where
+As a thought experiment, imagine a slack conversation with a editor developer where
 you ask them to write the code to add some new feature to your app.
 They're going to type the response back to you by hand in the chat.
 Should they type out the
@@ -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/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
 
@@ -98,6 +109,12 @@ cog.outl("```")
 ## Use deepseek/deepseek-coder model for the main chat
 #deepseek: false
 
+## Use o1-mini model for the main chat
+#o1-mini: false
+
+## Use o1-preview model for the main chat
+#o1-preview: false
+
 #################
 # Model Settings:
 
@@ -125,23 +142,43 @@ cog.outl("```")
 ## Specify a file with context window and costs for unknown models
 #model-metadata-file: .aider.model.metadata.json
 
+## Add a model alias (can be used multiple times)
+#alias: xxx
+## Specify multiple values like this:
+#alias:
+#  - xxx
+#  - yyy
+#  - zzz
+
 ## Verify the SSL cert when connecting to models (default: True)
 #verify-ssl: true
 
 ## Specify what edit format the LLM should use (default depends on model)
 #edit-format: xxx
 
+## Use architect edit format for the main chat
+#architect: false
+
 ## Specify the model to use for commit messages and chat history summarization (default depends on --model)
 #weak-model: xxx
 
+## Specify the model to use for editor tasks (default depends on --model)
+#editor-model: xxx
+
+## Specify the edit format for the editor model (default: depends on editor model)
+#editor-edit-format: xxx
+
 ## Only work with models that have meta-data available (default: True)
 #show-model-warnings: true
 
-## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
-#map-tokens: xxx
+## 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
 
-## Control how often the repo map is refreshed (default: auto)
-#map-refresh: auto
+## Specify the .env file to load (default: .env in git root)
+#env-file: .env
+
+#################
+# Cache Settings:
 
 ## Enable caching of prompts (default: False)
 #cache-prompts: false
@@ -149,15 +186,18 @@ cog.outl("```")
 ## Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)
 #cache-keepalive-pings: false
 
+###################
+# Repomap Settings:
+
+## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
+#map-tokens: xxx
+
+## Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto)
+#map-refresh: auto
+
 ## Multiplier for map tokens when no files are specified (default: 2)
 #map-multiplier-no-files: true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
-#max-chat-history-tokens: xxx
-
-## Specify the .env file to load (default: .env in git root)
-#env-file: .env
-
 ################
 # History Files:
 
@@ -203,6 +243,18 @@ cog.outl("```")
 ## Set the color for assistant output (default: #0088ff)
 #assistant-output-color: #0088ff
 
+## Set the color for the completion menu (default: terminal's default text color)
+#completion-menu-color: xxx
+
+## Set the background color for the completion menu (default: terminal's default background color)
+#completion-menu-bg-color: xxx
+
+## Set the color for the current item in the completion menu (default: terminal's default background color)
+#completion-menu-current-color: xxx
+
+## Set the background color for the current item in the completion menu (default: terminal's default text color)
+#completion-menu-current-bg-color: xxx
+
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
 #code-theme: default
 
@@ -251,6 +303,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:
 
@@ -260,7 +315,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
@@ -274,25 +332,40 @@ cog.outl("```")
 ## Run tests and fix problems found
 #test: false
 
+############
+# Analytics:
+
+## Enable/disable analytics for current session (default: random)
+#analytics: xxx
+
+## 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
 
-## Specify the language for voice using ISO 639-1 code (default: auto)
-#voice-language: en
-
 ## Specify the language to use in the chat (default: None, uses system settings)
 #chat-language: xxx
 
@@ -305,6 +378,9 @@ cog.outl("```")
 ## Check for new aider versions on launch
 #check-update: true
 
+## Show release notes on first run of new version (default: None, ask user)
+#show-release-notes: xxx
+
 ## Install the latest version from the main branch
 #install-main-branch: false
 
@@ -314,8 +390,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
@@ -335,16 +414,37 @@ 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
+
+## Enable/disable detection and offering to add URLs to chat (default: True)
+#detect-urls: true
+
+## Specify which editor to use for the /editor command
+#editor: xxx
+
+#################
+# Voice Settings:
+
+## Audio format for voice recording (default: wav). webm and mp3 require ffmpeg
+#voice-format: wav
+
+## Specify the language for voice using ISO 639-1 code (default: auto)
+#voice-language: en
 ```
 <!--[[[end]]]-->

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=
 
@@ -96,6 +99,12 @@ cog.outl("```")
 ## Use deepseek/deepseek-coder model for the main chat
 #AIDER_DEEPSEEK=
 
+## Use o1-mini model for the main chat
+#AIDER_O1_MINI=
+
+## Use o1-preview model for the main chat
+#AIDER_O1_PREVIEW=
+
 #################
 # Model Settings:
 
@@ -123,23 +132,38 @@ cog.outl("```")
 ## Specify a file with context window and costs for unknown models
 #AIDER_MODEL_METADATA_FILE=.aider.model.metadata.json
 
+## Add a model alias (can be used multiple times)
+#AIDER_ALIAS=
+
 ## Verify the SSL cert when connecting to models (default: True)
 #AIDER_VERIFY_SSL=true
 
 ## Specify what edit format the LLM should use (default depends on model)
 #AIDER_EDIT_FORMAT=
 
+## Use architect edit format for the main chat
+#AIDER_ARCHITECT=
+
 ## Specify the model to use for commit messages and chat history summarization (default depends on --model)
 #AIDER_WEAK_MODEL=
 
+## Specify the model to use for editor tasks (default depends on --model)
+#AIDER_EDITOR_MODEL=
+
+## Specify the edit format for the editor model (default: depends on editor model)
+#AIDER_EDITOR_EDIT_FORMAT=
+
 ## Only work with models that have meta-data available (default: True)
 #AIDER_SHOW_MODEL_WARNINGS=true
 
-## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
-#AIDER_MAP_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=
 
-## Control how often the repo map is refreshed (default: auto)
-#AIDER_MAP_REFRESH=auto
+## Specify the .env file to load (default: .env in git root)
+#AIDER_ENV_FILE=.env
+
+#################
+# Cache Settings:
 
 ## Enable caching of prompts (default: False)
 #AIDER_CACHE_PROMPTS=false
@@ -147,15 +171,18 @@ cog.outl("```")
 ## Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)
 #AIDER_CACHE_KEEPALIVE_PINGS=false
 
+###################
+# Repomap Settings:
+
+## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
+#AIDER_MAP_TOKENS=
+
+## Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto)
+#AIDER_MAP_REFRESH=auto
+
 ## Multiplier for map tokens when no files are specified (default: 2)
 #AIDER_MAP_MULTIPLIER_NO_FILES=true
 
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
-#AIDER_MAX_CHAT_HISTORY_TOKENS=
-
-## Specify the .env file to load (default: .env in git root)
-#AIDER_ENV_FILE=.env
-
 ################
 # History Files:
 
@@ -201,6 +228,18 @@ cog.outl("```")
 ## Set the color for assistant output (default: #0088ff)
 #AIDER_ASSISTANT_OUTPUT_COLOR=#0088ff
 
+## Set the color for the completion menu (default: terminal's default text color)
+#AIDER_COMPLETION_MENU_COLOR=
+
+## Set the background color for the completion menu (default: terminal's default background color)
+#AIDER_COMPLETION_MENU_BG_COLOR=
+
+## Set the color for the current item in the completion menu (default: terminal's default background color)
+#AIDER_COMPLETION_MENU_CURRENT_COLOR=
+
+## Set the background color for the current item in the completion menu (default: terminal's default text color)
+#AIDER_COMPLETION_MENU_CURRENT_BG_COLOR=
+
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
 #AIDER_CODE_THEME=default
 
@@ -249,6 +288,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:
 
@@ -270,6 +312,18 @@ cog.outl("```")
 ## Run tests and fix problems found
 #AIDER_TEST=false
 
+############
+# Analytics:
+
+## Enable/disable analytics for current session (default: random)
+#AIDER_ANALYTICS=
+
+## Specify a file to log analytics events
+#AIDER_ANALYTICS_LOG=
+
+## Permanently disable analytics
+#AIDER_ANALYTICS_DISABLE=false
+
 #################
 # Other Settings:
 
@@ -282,9 +336,6 @@ cog.outl("```")
 ## Use VI editing mode in the terminal (default: False)
 #AIDER_VIM=false
 
-## Specify the language for voice using ISO 639-1 code (default: auto)
-#AIDER_VOICE_LANGUAGE=en
-
 ## Specify the language to use in the chat (default: None, uses system settings)
 #AIDER_CHAT_LANGUAGE=
 
@@ -294,6 +345,9 @@ cog.outl("```")
 ## Check for new aider versions on launch
 #AIDER_CHECK_UPDATE=true
 
+## Show release notes on first run of new version (default: None, ask user)
+#AIDER_SHOW_RELEASE_NOTES=
+
 ## Install the latest version from the main branch
 #AIDER_INSTALL_MAIN_BRANCH=false
 
@@ -303,8 +357,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
@@ -324,14 +381,35 @@ 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
+
+## Enable/disable detection and offering to add URLs to chat (default: True)
+#AIDER_DETECT_URLS=true
+
+## Specify which editor to use for the /editor command
+#AIDER_EDITOR=
+
+#################
+# Voice Settings:
+
+## Audio format for voice recording (default: wav). webm and mp3 require ffmpeg
+#AIDER_VOICE_FORMAT=wav
+
+## Specify the language for voice using ISO 639-1 code (default: auto)
+#AIDER_VOICE_LANGUAGE=en
 ```
 <!--[[[end]]]-->
 

aider/website/docs/config/editor.md

@@ -0,0 +1,127 @@
+---
+parent: Configuration
+nav_order: 15
+description: How to configure a custom editor for aider's /editor command
+---
+
+# Editor configuration
+
+Aider allows you to configure your preferred text editor for use with the `/editor` command. The editor must be capable of running in "blocking mode", meaning the command line will wait until you close the editor before proceeding.
+
+## Using `--editor`
+
+You can specify the text editor with the `--editor` switch or using
+`editor:` in aider's
+[yaml config file](https://aider.chat/docs/config/aider_conf.html).
+
+## Environment variables
+
+Aider checks the following environment variables in order to determine which editor to use:
+
+1. `AIDER_EDITOR`
+2. `VISUAL`
+3. `EDITOR`
+
+## Default behavior
+
+If no editor is configured, aider will use these platform-specific defaults:
+
+- Windows: `notepad`
+- macOS: `vim`
+- Linux/Unix: `vi`
+
+## Using a custom editor
+
+You can set your preferred editor in your shell's configuration file (e.g., `.bashrc`, `.zshrc`):
+
+```bash
+export AIDER_EDITOR=vim
+```
+
+## Popular Editors by Platform
+
+### macOS
+
+1. **vim**
+   ```bash
+   export AIDER_EDITOR=vim
+   ```
+
+2. **Emacs**
+   ```bash
+   export AIDER_EDITOR=emacs
+   ```
+
+3. **VSCode**
+   ```bash
+   export AIDER_EDITOR="code --wait"
+   ```
+
+4. **Sublime Text**
+   ```bash
+   export AIDER_EDITOR="subl --wait"
+   ```
+
+5. **BBEdit**
+   ```bash
+   export AIDER_EDITOR="bbedit --wait"
+   ```
+
+### Linux
+
+1. **vim**
+   ```bash
+   export AIDER_EDITOR=vim
+   ```
+
+2. **Emacs**
+   ```bash
+   export AIDER_EDITOR=emacs
+   ```
+
+3. **nano**
+   ```bash
+   export AIDER_EDITOR=nano
+   ```
+
+4. **VSCode**
+   ```bash
+   export AIDER_EDITOR="code --wait"
+   ```
+
+5. **Sublime Text**
+   ```bash
+   export AIDER_EDITOR="subl --wait"
+   ```
+
+### Windows
+
+1. **Notepad**
+   ```bat
+   set AIDER_EDITOR=notepad
+   ```
+
+2. **VSCode**
+   ```bat
+   set AIDER_EDITOR="code --wait"
+   ```
+
+3. **Notepad++**
+   ```bat
+   set AIDER_EDITOR="notepad++ -multiInst -notabbar -nosession -noPlugin -waitForClose"
+   ```
+
+## Editor command arguments
+
+Some editors require specific command-line arguments to operate in blocking mode. The `--wait` flag (or equivalent) is commonly used to make the editor block until the file is closed.
+
+## Troubleshooting
+
+If you encounter issues with your editor not blocking (returning to the prompt immediately), verify that:
+
+1. Your editor supports blocking mode
+2. You've included the necessary command-line arguments for blocking mode
+3. The editor command is properly quoted if it contains spaces or special characters, e.g.:
+   ```bash
+   export AIDER_EDITOR="code --wait"
+   ```

aider/website/docs/config/model-aliases.md

@@ -0,0 +1,72 @@
+---
+parent: Configuration
+nav_order: 1000
+description: Assign convenient short names to models.
+---
+
+# Model Aliases
+
+Model aliases allow you to create shorthand names for models you frequently use. This is particularly useful for models with long names or when you want to standardize model usage across your team.
+
+## Command Line Usage
+
+You can define aliases when launching aider using the `--alias` option:
+
+```bash
+aider --alias "fast:gpt-3.5-turbo" --alias "smart:gpt-4"
+```
+
+Multiple aliases can be defined by using the `--alias` option multiple times. Each alias definition should be in the format `alias:model-name`.
+
+## Configuration File
+
+You can also define aliases in your [`.aider.conf.yml` file](https://aider.chat/docs/config/aider_conf.html):
+
+```yaml
+alias:
+  - "fast:gpt-3.5-turbo"
+  - "smart:gpt-4"
+  - "hacker:claude-3-sonnet-20240229"
+```
+
+## Using Aliases
+
+Once defined, you can use the alias instead of the full model name:
+
+```bash
+aider --model fast  # Uses gpt-3.5-turbo
+aider --model smart  # Uses gpt-4
+```
+
+## Built-in Aliases
+
+Aider includes some built-in aliases for convenience:
+
+<!--[[[cog
+import cog
+from aider.models import MODEL_ALIASES
+
+for alias, model in sorted(MODEL_ALIASES.items()):
+    cog.outl(f"- `{alias}`: {model}")
+]]]-->
+- `3`: gpt-3.5-turbo
+- `35-turbo`: gpt-3.5-turbo
+- `35turbo`: gpt-3.5-turbo
+- `4`: gpt-4-0613
+- `4-turbo`: gpt-4-1106-preview
+- `4o`: gpt-4o-2024-08-06
+- `deepseek`: deepseek/deepseek-coder
+- `haiku`: claude-3-5-haiku-20241022
+- `opus`: claude-3-opus-20240229
+- `sonnet`: claude-3-5-sonnet-20241022
+<!--[[[end]]]-->
+
+## Priority
+
+If the same alias is defined in multiple places, the priority is:
+
+1. Command line aliases (highest priority)
+2. Configuration file aliases
+3. Built-in aliases (lowest priority)
+
+This allows you to override built-in aliases with your own preferences.

aider/website/docs/config/options.md

@@ -26,26 +26,30 @@ cog.out(get_md_help())
 ]]]-->
 ```
 usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model]
-             [--opus] [--sonnet] [--4] [--4o] [--mini] [--4-turbo]
-             [--35turbo] [--deepseek] [--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]
-             [--weak-model]
+             [--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]
+             [--alias] [--verify-ssl | --no-verify-ssl]
+             [--edit-format] [--architect] [--weak-model]
+             [--editor-model] [--editor-edit-format]
              [--show-model-warnings | --no-show-model-warnings]
-             [--map-tokens] [--map-refresh]
-             [--cache-prompts | --no-cache-prompts]
-             [--cache-keepalive-pings] [--map-multiplier-no-files]
              [--max-chat-history-tokens] [--env-file]
+             [--cache-prompts | --no-cache-prompts]
+             [--cache-keepalive-pings] [--map-tokens]
+             [--map-refresh] [--map-multiplier-no-files]
              [--input-history-file] [--chat-history-file]
              [--restore-chat-history | --no-restore-chat-history]
              [--llm-history-file] [--dark-mode] [--light-mode]
              [--pretty | --no-pretty] [--stream | --no-stream]
              [--user-input-color] [--tool-output-color]
              [--tool-error-color] [--tool-warning-color]
-             [--assistant-output-color] [--code-theme]
+             [--assistant-output-color] [--completion-menu-color]
+             [--completion-menu-bg-color]
+             [--completion-menu-current-color]
+             [--completion-menu-current-bg-color] [--code-theme]
              [--show-diffs] [--git | --no-git]
              [--gitignore | --no-gitignore] [--aiderignore]
              [--subtree-only] [--auto-commits | --no-auto-commits]
@@ -55,15 +59,23 @@ 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] [--voice-language]
+             [--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]
+             [--show-release-notes | --no-show-release-notes]
+             [--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]
+             [--fancy-input | --no-fancy-input]
+             [--detect-urls | --no-detect-urls] [--editor]
+             [--voice-format] [--voice-language]
 
 ```
 
@@ -94,9 +106,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`  
@@ -129,6 +145,14 @@ Aliases:
 Use deepseek/deepseek-coder model for the main chat  
 Environment variable: `AIDER_DEEPSEEK`  
 
+### `--o1-mini`
+Use o1-mini model for the main chat  
+Environment variable: `AIDER_O1_MINI`  
+
+### `--o1-preview`
+Use o1-preview model for the main chat  
+Environment variable: `AIDER_O1_PREVIEW`  
+
 ## Model Settings:
 
 ### `--list-models MODEL`
@@ -168,6 +192,10 @@ Specify a file with context window and costs for unknown models
 Default: .aider.model.metadata.json  
 Environment variable: `AIDER_MODEL_METADATA_FILE`  
 
+### `--alias ALIAS:MODEL`
+Add a model alias (can be used multiple times)  
+Environment variable: `AIDER_ALIAS`  
+
 ### `--verify-ssl`
 Verify the SSL cert when connecting to models (default: True)  
 Default: True  
@@ -183,10 +211,22 @@ Aliases:
   - `--edit-format EDIT_FORMAT`
   - `--chat-mode EDIT_FORMAT`
 
+### `--architect`
+Use architect edit format for the main chat  
+Environment variable: `AIDER_ARCHITECT`  
+
 ### `--weak-model WEAK_MODEL`
 Specify the model to use for commit messages and chat history summarization (default depends on --model)  
 Environment variable: `AIDER_WEAK_MODEL`  
 
+### `--editor-model EDITOR_MODEL`
+Specify the model to use for editor tasks (default depends on --model)  
+Environment variable: `AIDER_EDITOR_MODEL`  
+
+### `--editor-edit-format EDITOR_EDIT_FORMAT`
+Specify the edit format for the editor model (default: depends on editor model)  
+Environment variable: `AIDER_EDITOR_EDIT_FORMAT`  
+
 ### `--show-model-warnings`
 Only work with models that have meta-data available (default: True)  
 Default: True  
@@ -195,14 +235,16 @@ Aliases:
   - `--show-model-warnings`
   - `--no-show-model-warnings`
 
-### `--map-tokens VALUE`
-Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)  
-Environment variable: `AIDER_MAP_TOKENS`  
+### `--max-chat-history-tokens VALUE`
+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`  
 
-### `--map-refresh VALUE`
-Control how often the repo map is refreshed (default: auto)  
-Default: auto  
-Environment variable: `AIDER_MAP_REFRESH`  
+### `--env-file ENV_FILE`
+Specify the .env file to load (default: .env in git root)  
+Default: .env  
+Environment variable: `AIDER_ENV_FILE`  
+
+## Cache Settings:
 
 ### `--cache-prompts`
 Enable caching of prompts (default: False)  
@@ -217,20 +259,22 @@ Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)
 Default: 0  
 Environment variable: `AIDER_CACHE_KEEPALIVE_PINGS`  
 
+## Repomap Settings:
+
+### `--map-tokens VALUE`
+Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)  
+Environment variable: `AIDER_MAP_TOKENS`  
+
+### `--map-refresh VALUE`
+Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto)  
+Default: auto  
+Environment variable: `AIDER_MAP_REFRESH`  
+
 ### `--map-multiplier-no-files VALUE`
 Multiplier for map tokens when no files are specified (default: 2)  
 Default: 2  
 Environment variable: `AIDER_MAP_MULTIPLIER_NO_FILES`  
 
-### `--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.  
-Environment variable: `AIDER_MAX_CHAT_HISTORY_TOKENS`  
-
-### `--env-file ENV_FILE`
-Specify the .env file to load (default: .env in git root)  
-Default: .env  
-Environment variable: `AIDER_ENV_FILE`  
-
 ## History Files:
 
 ### `--input-history-file INPUT_HISTORY_FILE`
@@ -307,6 +351,22 @@ Set the color for assistant output (default: #0088ff)
 Default: #0088ff  
 Environment variable: `AIDER_ASSISTANT_OUTPUT_COLOR`  
 
+### `--completion-menu-color COLOR`
+Set the color for the completion menu (default: terminal's default text color)  
+Environment variable: `AIDER_COMPLETION_MENU_COLOR`  
+
+### `--completion-menu-bg-color COLOR`
+Set the background color for the completion menu (default: terminal's default background color)  
+Environment variable: `AIDER_COMPLETION_MENU_BG_COLOR`  
+
+### `--completion-menu-current-color COLOR`
+Set the color for the current item in the completion menu (default: terminal's default background color)  
+Environment variable: `AIDER_COMPLETION_MENU_CURRENT_COLOR`  
+
+### `--completion-menu-current-bg-color COLOR`
+Set the background color for the current item in the completion menu (default: terminal's default text color)  
+Environment variable: `AIDER_COMPLETION_MENU_CURRENT_BG_COLOR`  
+
 ### `--code-theme VALUE`
 Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)  
 Default: default  
@@ -410,6 +470,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`
@@ -448,6 +513,24 @@ Run tests and fix problems found
 Default: False  
 Environment variable: `AIDER_TEST`  
 
+## Analytics:
+
+### `--analytics`
+Enable/disable analytics for current session (default: random)  
+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`
@@ -463,11 +546,6 @@ Use VI editing mode in the terminal (default: False)
 Default: False  
 Environment variable: `AIDER_VIM`  
 
-### `--voice-language VOICE_LANGUAGE`
-Specify the language for voice using ISO 639-1 code (default: auto)  
-Default: en  
-Environment variable: `AIDER_VOICE_LANGUAGE`  
-
 ### `--chat-language CHAT_LANGUAGE`
 Specify the language to use in the chat (default: None, uses system settings)  
 Environment variable: `AIDER_CHAT_LANGUAGE`  
@@ -488,6 +566,13 @@ Aliases:
   - `--check-update`
   - `--no-check-update`
 
+### `--show-release-notes`
+Show release notes on first run of new version (default: None, ask user)  
+Environment variable: `AIDER_SHOW_RELEASE_NOTES`  
+Aliases:
+  - `--show-release-notes`
+  - `--no-show-release-notes`
+
 ### `--install-main-branch`
 Install the latest version from the main branch  
 Default: False  
@@ -505,9 +590,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  
@@ -547,6 +637,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  
@@ -559,12 +653,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)  
@@ -573,4 +669,36 @@ Environment variable: `AIDER_SUGGEST_SHELL_COMMANDS`
 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`
+
+### `--detect-urls`
+Enable/disable detection and offering to add URLs to chat (default: True)  
+Default: True  
+Environment variable: `AIDER_DETECT_URLS`  
+Aliases:
+  - `--detect-urls`
+  - `--no-detect-urls`
+
+### `--editor VALUE`
+Specify which editor to use for the /editor command  
+Environment variable: `AIDER_EDITOR`  
+
+## Voice Settings:
+
+### `--voice-format VOICE_FORMAT`
+Audio format for voice recording (default: wav). webm and mp3 require ffmpeg  
+Default: wav  
+Environment variable: `AIDER_VOICE_FORMAT`  
+
+### `--voice-language VOICE_LANGUAGE`
+Specify the language for voice using ISO 639-1 code (default: auto)  
+Default: en  
+Environment variable: `AIDER_VOICE_LANGUAGE`  
 <!--[[[end]]]-->

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:
@@ -60,6 +60,23 @@ directory you start in.
 You can also create a `.aiderignore` file to tell aider
 to ignore parts of the repo that aren't relevant to your task.
 This file conforms to `.gitignore` syntax and conventions.
+For example, to focus only on specific directories in a monorepo,
+you could create a `.aiderignore` file with:
+
+```
+# Ignore everything
+/*
+
+# Allow specific directories and their contents
+!foo/
+!bar/
+!baz/
+
+# Allow nested files under these directories
+!foo/**
+!bar/**
+!baz/**
+```
 
 You can use `--aiderignore <filename>` to name a specific file
 to use for ignore patterns.
@@ -92,6 +109,40 @@ the functionality you want to use in repo B.
 Then when you're using aider in repo B, you can 
 `/read` in that script.
 
+## How do I turn on the repository map?
+
+Depending on the LLM you are using, aider may launch with the repo map disabled by default:
+
+```
+Repo-map: disabled
+```
+
+This is because weaker models get easily overwhelmed and confused by the content of the
+repo map. They sometimes mistakenly try to edit the code in the repo map.
+The repo map is usually disabled for a good reason.
+
+If you would like to force it on, you can run aider with `--map-tokens 1024`.
+
+## How do I include the git history in the context?
+
+When starting a fresh aider session, you can include recent git history in the chat context. This can be useful for providing the LLM with information about recent changes. To do this:
+
+1. Use the `/run` command with `git diff` to show recent changes:
+   ```
+   /run git diff HEAD~1
+   ```
+   This will include the diff of the last commit in the chat history.
+
+2. To include diffs from multiple commits, increase the number after the tilde:
+   ```
+   /run git diff HEAD~3
+   ```
+   This will show changes from the last three commits.
+
+Remember, the chat history already includes recent changes made during the current session, so this tip is most useful when starting a new aider session and you want to provide context about recent work.
+
+{: .tip }
+The `/git` command will not work for this purpose, as its output is not included in the chat. 
 
 ## How can I run aider locally from source code?
 
@@ -99,7 +150,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
@@ -116,7 +167,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
@@ -157,18 +207,55 @@ 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
+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.
 
 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:
 
-https://aider.chat/share/?mdurl=
+   ```
+   https://aider.chat/share/?mdurl=
+   ```
 
 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.
@@ -31,7 +35,7 @@ To work with Anthropic's models like Claude 3.5 Sonnet you need a paid
 
 ```
 # Install aider
-python -m pip install aider-chat
+python -m pip install -U --upgrade-strategy only-if-needed aider-chat
 
 # To work with GPT-4o:
 $ aider --4o --openai-api-key sk-xxx...
@@ -44,7 +48,7 @@ $ aider --sonnet --anthropic-api-key sk-xxx...
 
 ```
 # Install aider
-python -m pip install aider-chat
+python -m pip install -U --upgrade-strategy only-if-needed aider-chat
 
 # To work with GPT-4o:
 $ aider --4o --openai-api-key sk-xxx...

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
@@ -62,6 +62,7 @@ cog.out(get_supported_languages_md())
 | cpp                  | .cc                  |    ✓     |   ✓    |
 | cpp                  | .cpp                 |    ✓     |   ✓    |
 | css                  | .css                 |          |   ✓    |
+| dart                 | .dart                |    ✓     |   ✓    |
 | dockerfile           | .dockerfile          |          |   ✓    |
 | dot                  | .dot                 |          |   ✓    |
 | elisp                | .el                  |    ✓     |   ✓    |

aider/website/docs/leaderboards/index.md

@@ -31,6 +31,8 @@ This measures the LLM's coding ability, and whether it can
 write new code that integrates into existing code.
 The model also has to successfully apply all its changes to the source file without human intervention.
 
+<input type="text" id="editSearchInput" placeholder="Search..." style="width: 100%; max-width: 800px; margin: 10px auto; padding: 8px; display: block; border: 1px solid #ddd; border-radius: 4px;">
+
 <table style="width: 100%; max-width: 800px; margin: auto; border-collapse: collapse; box-shadow: 0 2px 4px rgba(0,0,0,0.1); font-size: 14px;">
   <thead style="background-color: #f2f2f2;">
     <tr>
@@ -55,14 +57,11 @@ The model also has to successfully apply all its changes to the source file with
   </tbody>
 </table>
 
+<canvas id="editChart" width="800" height="450" style="margin-top: 20px"></canvas>
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-{% include leaderboard_graph.html 
-  chart_id="editChart" 
-  data=edit_sorted 
-  row_prefix="edit-row" 
-  pass_rate_key="pass_rate_2"
-%}
+<script>
+{% include edit-leaderboard.js %}
+</script>
 <style>
   tr.selected {
     color: #0056b3;
@@ -81,12 +80,14 @@ 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.
 Therefore, results are available for fewer models.
 
+<input type="text" id="refacSearchInput" placeholder="Search..." style="width: 100%; max-width: 800px; margin: 10px auto; padding: 8px; display: block; border: 1px solid #ddd; border-radius: 4px;">
+
 <table style="width: 100%; max-width: 800px; margin: auto; border-collapse: collapse; box-shadow: 0 2px 4px rgba(0,0,0,0.1); font-size: 14px;">
   <thead style="background-color: #f2f2f2;">
     <tr>
@@ -111,12 +112,11 @@ Therefore, results are available for fewer models.
   </tbody>
 </table>
 
-{% include leaderboard_graph.html 
-  chart_id="refacChart" 
-  data=refac_sorted 
-  row_prefix="refac-row" 
-  pass_rate_key="pass_rate_1"
-%}
+<canvas id="refacChart" width="800" height="450" style="margin-top: 20px"></canvas>
+<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
+<script>
+{% include refactor-leaderboard.js %}
+</script>
 
 
 ## LLM code editing skill by model release date
@@ -151,10 +151,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">
@@ -181,6 +181,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 21, 2024.
+November 24, 2024.
 <!--[[[end]]]-->
 </p>