From 1bbfa72b91882ddf670ba15e518c10239a287c4f Mon Sep 17 00:00:00 2001 From: coredevorg <73153008+coredevorg@users.noreply.github.com> Date: Tue, 22 Apr 2025 15:36:03 +0200 Subject: [PATCH 01/22] feature: repomap cache directory configuration setting --- aider/args.py | 12 +++++++++++- aider/coders/base_coder.py | 6 +++++- aider/main.py | 1 + aider/repomap.py | 17 +++++++++++------ 4 files changed, 28 insertions(+), 8 deletions(-) diff --git a/aider/args.py b/aider/args.py index 43e03702efc..05eba76bd5e 100644 --- a/aider/args.py +++ b/aider/args.py @@ -262,6 +262,16 @@ def get_parser(default_config_files, git_root): default=2, help="Multiplier for map tokens when no files are specified (default: 2)", ) + group.add_argument( + "--map-cache-dir", + metavar="MAP_CACHE_DIR", + dest="map_cache_dir", + default=".", + help=( + "Directory for the repository map cache .aider.tags.cache.v3" + " (default: current directory)" + ), + ) ########## group = parser.add_argument_group("History Files") @@ -559,7 +569,7 @@ def get_parser(default_config_files, git_root): help="Run tests, fix problems found and then exit", default=False, ) - + ########## group = parser.add_argument_group("Analytics") group.add_argument( diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py index b824e928693..af5fb269d0e 100755 --- a/aider/coders/base_coder.py +++ b/aider/coders/base_coder.py @@ -338,7 +338,11 @@ def __init__( file_watcher=None, auto_copy_context=False, auto_accept_architect=True, + map_cache_dir='.', ): + # initialize from args.map_cache_dir + self.map_cache_dir = map_cache_dir + # Fill in a dummy Analytics if needed, but it is never .enable()'d self.analytics = analytics if analytics is not None else Analytics() @@ -497,7 +501,7 @@ def __init__( if use_repo_map and self.repo and has_map_prompt: self.repo_map = RepoMap( map_tokens, - self.root, + self.map_cache_dir, self.main_model, io, self.gpt_prompts.repo_content_prefix, diff --git a/aider/main.py b/aider/main.py index 2156ddc9ae5..231454af042 100644 --- a/aider/main.py +++ b/aider/main.py @@ -998,6 +998,7 @@ def get_io(pretty): auto_copy_context=args.copy_paste, auto_accept_architect=args.auto_accept_architect, add_gitignore_files=args.add_gitignore_files, + map_cache_dir=args.map_cache_dir, ) except UnknownEditFormat as err: io.tool_error(str(err)) diff --git a/aider/repomap.py b/aider/repomap.py index 5c40c469b6a..e58f62c6066 100644 --- a/aider/repomap.py +++ b/aider/repomap.py @@ -46,7 +46,7 @@ class RepoMap: def __init__( self, map_tokens=1024, - root=None, + map_cache_dir='.', main_model=None, io=None, repo_content_prefix=None, @@ -59,9 +59,8 @@ def __init__( self.verbose = verbose self.refresh = refresh - if not root: - root = os.getcwd() - self.root = root + self.map_cache_dir = map_cache_dir + self.root = os.getcwd() self.load_tags_cache() self.cache_threshold = 0.95 @@ -84,6 +83,12 @@ def __init__( self.io.tool_output( f"RepoMap initialized with map_mul_no_files: {self.map_mul_no_files}" ) + self.io.tool_output( + f"RepoMap initialized with map_cache_dir: {self.map_cache_dir}" + ) + self.io.tool_output( + f"RepoMap assumes repo root is: {self.root}" + ) def token_count(self, text): len_text = len(text) @@ -182,7 +187,7 @@ def tags_cache_error(self, original_error=None): if isinstance(getattr(self, "TAGS_CACHE", None), dict): return - path = Path(self.root) / self.TAGS_CACHE_DIR + path = Path(self.map_cache_dir) / self.TAGS_CACHE_DIR # Try to recreate the cache try: @@ -214,7 +219,7 @@ def tags_cache_error(self, original_error=None): self.TAGS_CACHE = dict() def load_tags_cache(self): - path = Path(self.root) / self.TAGS_CACHE_DIR + path = Path(self.map_cache_dir) / self.TAGS_CACHE_DIR try: self.TAGS_CACHE = Cache(path) except SQLITE_ERRORS as e: From ac40a4c5cb66564eb4daab704292964d73580436 Mon Sep 17 00:00:00 2001 From: oct4pie <65843843+Oct4Pie@users.noreply.github.com> Date: Tue, 5 Aug 2025 23:33:06 -0700 Subject: [PATCH 02/22] add test results for gpt-oss-120b (high) to polyglot leaderboard --- aider/website/_data/polyglot_leaderboard.yml | 30 +++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/aider/website/_data/polyglot_leaderboard.yml b/aider/website/_data/polyglot_leaderboard.yml index 77570329f0c..18de7704e0b 100644 --- a/aider/website/_data/polyglot_leaderboard.yml +++ b/aider/website/_data/polyglot_leaderboard.yml @@ -1682,4 +1682,32 @@ date: 2025-07-17 versions: 0.85.3.dev seconds_per_case: 67.6 - total_cost: 1.2357 \ No newline at end of file + total_cost: 1.2357 + +- dirname: 2025-08-06-04-54-48--gpt-oss-120b-high-polyglot + test_cases: 225 + model: openrouter/openai/gpt-oss-120b + edit_format: diff + commit_hash: 1af0e59 + pass_rate_1: 13.8 + pass_rate_2: 41.8 + pass_num_1: 31 + pass_num_2: 94 + percent_cases_well_formed: 79.1 + error_outputs: 95 + num_malformed_responses: 77 + num_with_malformed_responses: 47 + user_asks: 142 + lazy_comments: 0 + syntax_errors: 0 + indentation_errors: 0 + exhausted_context_windows: 0 + prompt_tokens: 3123768 + completion_tokens: 856495 + test_timeouts: 4 + total_tests: 225 + command: aider --model openrouter/openai/gpt-oss-120b + date: 2025-08-06 + versions: 0.85.3.dev + seconds_per_case: 35.5 + total_cost: 0.7406 From 9fda5c93cc93e39ea4fbdc41ebaa9394f6938633 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Mon, 11 Aug 2025 09:45:20 -0700 Subject: [PATCH 03/22] chore: Update polyglot leaderboard model name and command --- aider/website/_data/polyglot_leaderboard.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/aider/website/_data/polyglot_leaderboard.yml b/aider/website/_data/polyglot_leaderboard.yml index 18de7704e0b..9088607dbb6 100644 --- a/aider/website/_data/polyglot_leaderboard.yml +++ b/aider/website/_data/polyglot_leaderboard.yml @@ -1686,7 +1686,7 @@ - dirname: 2025-08-06-04-54-48--gpt-oss-120b-high-polyglot test_cases: 225 - model: openrouter/openai/gpt-oss-120b + model: gpt-oss-120b (high) edit_format: diff commit_hash: 1af0e59 pass_rate_1: 13.8 @@ -1706,7 +1706,7 @@ completion_tokens: 856495 test_timeouts: 4 total_tests: 225 - command: aider --model openrouter/openai/gpt-oss-120b + command: aider --model openrouter/openai/gpt-oss-120b --reasoning-effort high date: 2025-08-06 versions: 0.85.3.dev seconds_per_case: 35.5 From 0a88f7ce340e9c3424433f9ae6d5803e60908a92 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Mon, 11 Aug 2025 12:14:42 -0700 Subject: [PATCH 04/22] feat: Add EthicalAds script and ad placement Co-authored-by: aider (gpt-5) --- aider/website/_includes/head_custom.html | 7 +++++++ aider/website/_includes/nav_footer_custom.html | 3 +++ 2 files changed, 10 insertions(+) diff --git a/aider/website/_includes/head_custom.html b/aider/website/_includes/head_custom.html index 20f888728d7..c89d8abf647 100644 --- a/aider/website/_includes/head_custom.html +++ b/aider/website/_includes/head_custom.html @@ -32,12 +32,19 @@ .side-bar { background: linear-gradient(135deg, #ffffff 0%, rgba(20, 176, 20, 0.01) 25%, rgba(20, 176, 20, 0.04) 40%, rgba(220, 230, 255, 0.4) 60%, rgba(205, 218, 255, 0.4) 80%, #F5F6FA 100%); } + + /* Ad container spacing */ + .ea-ad { + margin: 1rem 0; + } + +