diff --git a/README.md b/README.md
index 9c3e4df8f91..3e37fb6f672 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ The current priorities are to improve core capabilities and user experience of t
2. **Repo Map Accuracy** - [Discussion](https://github.com/dwash96/aider-ce/issues/45)
* [x] [Bias page ranking toward active/editable files in repo map parsing](https://github.com/Aider-AI/aider/issues/2405)
- * [ ] [Include AST information in repo map for richer context](https://github.com/Aider-AI/aider/issues/2688)
+ * [ ] [Include import information in repo map for richer context](https://github.com/Aider-AI/aider/issues/2688)
* [ ] [Handle non-unique symbols that break down in large codebases](https://github.com/Aider-AI/aider/issues/2341)
3. **Context Discovery** - [Discussion](https://github.com/dwash96/aider-ce/issues/46)
@@ -35,9 +35,35 @@ The current priorities are to improve core capabilities and user experience of t
* [ ] Add a plugin-like system for allowing agent mode to use user-defined tools in simple python files
* [ ] Add a dynamic tool discovery tool to allow the system to have only the tools it needs in context
-## Fork Additions
+### Documentation and Other Notes
+* [Agent Mode](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/config/agent-mode.md)
+* [MCP Configuration](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/config/mcp.md)
+* [Session Management](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/sessions.md)
+* [Aider Original Documentation (still mostly applies)](https://aider.chat/)
+* [Discord Community](https://discord.gg/McwdCRuqkJ)
+
+### Installation Instructions
+This project can be installed using several methods:
+
+### Package Installation
+```bash
+pip install aider-ce
+```
+
+or
+
+```bash
+uv pip install aider-ce
+```
+
+The package exports an `aider-ce` command that accepts all of Aider's configuration options
-This project aims to be compatible with upstream Aider, but with priority commits merged in and with some opportunistic bug fixes and optimizations
+### Tool Installation
+```bash
+uv tool install --python python3.12 aider-ce
+```
+
+Use the tool installation so aider doesn't interfere with your development environment
### Merged PRs
@@ -72,219 +98,9 @@ This project aims to be compatible with upstream Aider, but with priority commit
* [Allow Benchmarks to Use Repo Map For Better Accuracy](https://github.com/dwash96/aider-ce/pull/25)
* [Read File Globbing](https://github.com/Aider-AI/aider/pull/3395)
-### Documentation and Other Notes
-* [Agent Mode](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/config/agent-mode.md)
-* [MCP Configuration](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/config/mcp.md)
-* [Session Management](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/sessions.md)
-
-
-### Installation Instructions
-This project can be installed using several methods:
-
-### Package Installation
-```bash
-pip install aider-ce
-```
-
-or
-
-```bash
-uv pip install aider-ce
-```
-
-The package exports an `aider-ce` command that accepts all of Aider's configuration options
-
-### Tool Installation
-```bash
-uv tool install --python python3.12 aider-ce
-```
-
-Use the tool installation so aider doesn't interfere with your development environment
-
### All Contributors (Both Aider Main and Aider-CE)
-
-
-
-
-
-
-AI Pair Programming in Your Terminal
-
-
-
-
-Aider lets you pair program with LLMs to start a new project or build on your existing codebase.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-## Features
-
-### [Cloud and local LLMs](https://aider.chat/docs/llms.html)
-
-
-Aider works best with Claude 3.7 Sonnet, DeepSeek R1 & Chat V3, OpenAI o1, o3-mini & GPT-4o, but can connect to almost any LLM, including local models.
-
-
-
-### [Maps your codebase](https://aider.chat/docs/repomap.html)
-
-
-Aider makes a map of your entire codebase, which helps it work well in larger projects.
-
-
-
-### [100+ code languages](https://aider.chat/docs/languages.html)
-
-
-Aider works with most popular programming languages: python, javascript, rust, ruby, go, cpp, php, html, css, and dozens more.
-
-
-
-### [Git integration](https://aider.chat/docs/git.html)
-
-
-Aider automatically commits changes with sensible commit messages. Use familiar git tools to easily diff, manage and undo AI changes.
-
-
-
-### [Use in your IDE](https://aider.chat/docs/usage/watch.html)
-
-
-Use aider from within your favorite IDE or editor. Ask for changes by adding comments to your code and aider will get to work.
-
-
-
-### [Images & web pages](https://aider.chat/docs/usage/images-urls.html)
-
-
-Add images and web pages to the chat to provide visual context, screenshots, reference docs, etc.
-
-
-
-### [Voice-to-code](https://aider.chat/docs/usage/voice.html)
-
-
-Speak with aider about your code! Request new features, test cases or bug fixes using your voice and let aider implement the changes.
-
-
-
-### [Linting & testing](https://aider.chat/docs/usage/lint-test.html)
-
-
-Automatically lint and test your code every time aider makes changes. Aider can fix problems detected by your linters and test suites.
-
-
-
-### [Copy/paste to web chat](https://aider.chat/docs/usage/copypaste.html)
-
-
-Work with any LLM via its web chat interface. Aider streamlines copy/pasting code context and edits back and forth with a browser.
-
-## Getting Started
-
-```bash
-python -m pip install aider-install
-aider-install
-
-# Change directory into your codebase
-cd /to/your/project
-
-# DeepSeek
-aider --model deepseek --api-key deepseek=
-
-# Claude 3.7 Sonnet
-aider --model sonnet --api-key anthropic=
-
-# o3-mini
-aider --model o3-mini --api-key openai=
-```
-
-See the [installation instructions](https://aider.chat/docs/install.html) and [usage documentation](https://aider.chat/docs/usage.html) for more details.
-
-## More Information
-
-### Documentation
-- [Installation Guide](https://aider.chat/docs/install.html)
-- [Usage Guide](https://aider.chat/docs/usage.html)
-- [Tutorial Videos](https://aider.chat/docs/usage/tutorials.html)
-- [Connecting to LLMs](https://aider.chat/docs/llms.html)
-- [Configuration Options](https://aider.chat/docs/config.html)
-- [Troubleshooting](https://aider.chat/docs/troubleshooting.html)
-- [FAQ](https://aider.chat/docs/faq.html)
-
-### Community & Resources
-- [LLM Leaderboards](https://aider.chat/docs/leaderboards/)
-- [GitHub Repository](https://github.com/Aider-AI/aider)
-- [Discord Community](https://discord.gg/Y7X7bhMQFV)
-- [Release notes](https://aider.chat/HISTORY.html)
-- [Blog](https://aider.chat/blog/)
-
-## Kind Words From Users
-
-- *"My life has changed... Aider... It's going to rock your world."* — [Eric S. Raymond on X](https://x.com/esrtweet/status/1910809356381413593)
-- *"The best free open source AI coding assistant."* — [IndyDevDan on YouTube](https://youtu.be/YALpX8oOn78)
-- *"The best AI coding assistant so far."* — [Matthew Berman on YouTube](https://www.youtube.com/watch?v=df8afeb1FY8)
-- *"Aider ... has easily quadrupled my coding productivity."* — [SOLAR_FIELDS on Hacker News](https://news.ycombinator.com/item?id=36212100)
-- *"It's a cool workflow... Aider's ergonomics are perfect for me."* — [qup on Hacker News](https://news.ycombinator.com/item?id=38185326)
-- *"It's really like having your senior developer live right in your Git repo - truly amazing!"* — [rappster on GitHub](https://github.com/Aider-AI/aider/issues/124)
-- *"What an amazing tool. It's incredible."* — [valyagolev on GitHub](https://github.com/Aider-AI/aider/issues/6#issue-1722897858)
-- *"Aider is such an astounding thing!"* — [cgrothaus on GitHub](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 on X](https://twitter.com/d_feldman/status/1662295077387923456)
-- *"THANK YOU for Aider! It really feels like a glimpse into the future of coding."* — [derwiki on Hacker News](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 on Discord](https://discord.com/channels/1131200896827654144/1174002618058678323/1174084556257775656)
-- *"This project is stellar."* — [funkytaco on GitHub](https://github.com/Aider-AI/aider/issues/112#issuecomment-1637429008)
-- *"Amazing project, definitely the best AI coding assistant I've used."* — [joshuavial on GitHub](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 on Discord](https://discord.com/channels/1131200896827654144/1133421607499595858/1229689636012691468)
-- *"I have been recovering from ... surgeries ... aider ... has allowed me to continue productivity."* — [codeninja on Reddit](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 on Discord](https://discord.com/channels/1131200896827654144/1131200896827654149/1135913253483069470)
-- *"Aider... blows everything else out of the water hands down, there's no competition whatsoever."* — [SystemSculpt on Discord](https://discord.com/channels/1131200896827654144/1131200896827654149/1178736602797846548)
-- *"Aider is amazing, coupled with Sonnet 3.5 it's quite mind blowing."* — [Josh Dingus on Discord](https://discord.com/channels/1131200896827654144/1133060684540813372/1262374225298198548)
-- *"Hands down, this is the best AI coding assistant tool so far."* — [IndyDevDan on YouTube](https://www.youtube.com/watch?v=MPYFPvxfGZs)
-- *"[Aider] changed my daily coding workflows. It's mind-blowing how ...(it)... can change your life."* — [maledorak on Discord](https://discord.com/channels/1131200896827654144/1131200896827654149/1258453375620747264)
-- *"Best agent for actual dev work in existing codebases."* — [Nick Dobos on X](https://twitter.com/NickADobos/status/1690408967963652097?s=20)
-- *"One of my favorite pieces of software. Blazing trails on new paradigms!"* — [Chris Wall on X](https://x.com/chris65536/status/1905053299251798432)
-- *"Aider has been revolutionary for me and my work."* — [Starry Hope on X](https://x.com/starryhopeblog/status/1904985812137132056)
-- *"Try aider! One of the best ways to vibe code."* — [Chris Wall on X](https://x.com/Chris65536/status/1905053418961391929)
-- *"Freaking love Aider."* — [hztar on Hacker News](https://news.ycombinator.com/item?id=44035015)
-- *"Aider is hands down the best. And it's free and opensource."* — [AriyaSavakaLurker on Reddit](https://www.reddit.com/r/ChatGPTCoding/comments/1ik16y6/whats_your_take_on_aider/mbip39n/)
-- *"Aider is also my best friend."* — [jzn21 on Reddit](https://www.reddit.com/r/ChatGPTCoding/comments/1heuvuo/aider_vs_cline_vs_windsurf_vs_cursor/m27dcnb/)
-- *"Try Aider, it's worth it."* — [jorgejhms on Reddit](https://www.reddit.com/r/ChatGPTCoding/comments/1heuvuo/aider_vs_cline_vs_windsurf_vs_cursor/m27cp99/)
-- *"I like aider :)"* — [Chenwei Cui on X](https://x.com/ccui42/status/1904965344999145698)
-- *"Aider is the precision tool of LLM code gen... Minimal, thoughtful and capable of surgical changes ... while keeping the developer in control."* — [Reilly Sweetland on X](https://x.com/rsweetland/status/1904963807237259586)
-- *"Cannot believe aider vibe coded a 650 LOC feature across service and cli today in 1 shot."* - [autopoietist on Discord](https://discord.com/channels/1131200896827654144/1131200896827654149/1355675042259796101)
-- *"Oh no the secret is out! Yes, Aider is the best coding tool around. I highly, highly recommend it to anyone."* — [Joshua D Vander Hook on X](https://x.com/jodavaho/status/1911154899057795218)
-- *"thanks to aider, i have started and finished three personal projects within the last two days"* — [joseph stalzyn on X](https://x.com/anitaheeder/status/1908338609645904160)
-- *"Been using aider as my daily driver for over a year ... I absolutely love the tool, like beyond words."* — [koleok on Discord](https://discord.com/channels/1131200896827654144/1273248471394291754/1356727448372252783)
-- *"Aider ... is the tool to benchmark against."* — [BeetleB on Hacker News](https://news.ycombinator.com/item?id=43930201)
-- *"aider is really cool"* — [kache on X](https://x.com/yacineMTB/status/1911224442430124387)
-
diff --git a/aider/__init__.py b/aider/__init__.py
index 2486d09481e..6c97ffd850c 100644
--- a/aider/__init__.py
+++ b/aider/__init__.py
@@ -1,6 +1,6 @@
from packaging import version
-__version__ = "0.88.18.dev"
+__version__ = "0.88.19.dev"
safe_version = __version__
try:
diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 48159af9dd1..7b1c5c5c81f 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -872,7 +872,7 @@ def get_ident_filename_matches(self, idents):
return matches
def get_repo_map(self, force_refresh=False):
- if not self.repo_map:
+ if not self.repo_map or not self.repo:
return
self.io.update_spinner("Updating repo map")
diff --git a/aider/website/_config.yml b/aider/website/_config.yml
index c6e12f11ee1..7832ffdf4f7 100644
--- a/aider/website/_config.yml
+++ b/aider/website/_config.yml
@@ -32,7 +32,7 @@ aux_links:
"GitHub":
- "https://github.com/Aider-AI/aider"
"Discord":
- - "https://discord.gg/Y7X7bhMQFV"
+ - "https://discord.gg/McwdCRuqkJ"
"Blog":
- "/blog/"
@@ -40,7 +40,7 @@ nav_external_links:
- title: "GitHub"
url: "https://github.com/Aider-AI/aider"
- title: "Discord"
- url: "https://discord.gg/Y7X7bhMQFV"
+ url: "https://discord.gg/McwdCRuqkJ"
repository: Aider-AI/aider
diff --git a/aider/website/_includes/help.md b/aider/website/_includes/help.md
index f28a4827365..bb9d5eb3d06 100644
--- a/aider/website/_includes/help.md
+++ b/aider/website/_includes/help.md
@@ -2,7 +2,7 @@ If you need more help, please check our
[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/Y7X7bhMQFV)
+[Discord](https://discord.gg/McwdCRuqkJ)
to chat with us.
When reporting problems, it is very helpful if you can provide:
diff --git a/aider/website/_includes/nav_footer_custom.html b/aider/website/_includes/nav_footer_custom.html
index bc2b06268f7..e8c1147538a 100644
--- a/aider/website/_includes/nav_footer_custom.html
+++ b/aider/website/_includes/nav_footer_custom.html
@@ -3,5 +3,5 @@
Aider is on
GitHub
and
- Discord.
+ Discord.
diff --git a/aider/website/index.html b/aider/website/index.html
index 54c64d83a56..69def1b5cb7 100644
--- a/aider/website/index.html
+++ b/aider/website/index.html
@@ -27,7 +27,7 @@
Features
Getting Started
Documentation
- Discord
+ Discord
GitHub
@@ -646,7 +646,7 @@ Community & Resources
@@ -660,7 +660,7 @@ Community & Resources