aider-ce 0.87.11.dev0__py3-none-any.whl → 0.87.13__py3-none-any.whl

aider/__init__.py

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

aider/_version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.87.11.dev0'
-__version_tuple__ = version_tuple = (0, 87, 11, 'dev0')
+__version__ = version = '0.87.13'
+__version_tuple__ = version_tuple = (0, 87, 13)
 
 __commit_id__ = commit_id = None

aider/args.py

@@ -780,13 +780,13 @@ def get_parser(default_config_files, git_root):
         "--file",
         action="append",
         metavar="FILE",
-        help="specify a file to edit (can be used multiple times)",
+        help="specify a file to edit (can be used multiple times, glob patterns supported)",
     ).complete = shtab.FILE
     group.add_argument(
         "--read",
         action="append",
         metavar="FILE",
-        help="specify a read-only file (can be used multiple times)",
+        help="specify a read-only file (can be used multiple times, glob patterns supported)",
     ).complete = shtab.FILE
     group.add_argument(
         "--vim",

aider/coders/editblock_prompts.py

@@ -15,8 +15,6 @@ If the request is ambiguous, ask questions.
 Consider potential edge cases.
 Think about how to verify your changes are correct.
 
-Always reply to the user in {language}.
-
 Once you understand the request and have a plan, you MUST:
 
 1. Decide if you need to propose *SEARCH/REPLACE* edits to any files that haven't been added to the chat. You can create new files without asking!

aider/coders/patch_prompts.py

@@ -15,8 +15,6 @@ 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 {language}.
-
 Once you understand the request you MUST:
 
 1. Decide if you need to propose edits to any files that haven't been added to the chat. You can create new files without asking!

aider/coders/udiff_prompts.py

@@ -15,8 +15,6 @@ Think about how to verify your changes are correct.
 Take requests for changes to the supplied code.
 If the request is ambiguous, ask questions.
 
-Always reply to the user in {language}.
-
 Once you have a plan, for each file that needs to be changed, write out the changes similar to a unified diff like `diff -U0` would produce.
 """
 

aider/coders/wholefile_prompts.py

@@ -8,11 +8,6 @@ class WholeFilePrompts(CoderPrompts):
 Think step-by-step. Plan your changes carefully. Explain your plan first.
 Take requests for changes to the supplied code.
 If the request is ambiguous, ask questions.
-Consider potential edge cases.
-Think about how to verify your changes are correct.
-
-Always reply to the user in {language}.
-
 {final_reminders}
 Once you understand the request and have a plan, you MUST:
 1. Determine if any code changes are needed.

aider/main.py

@@ -1,3 +1,4 @@
+import glob
 import json
 import os
 import re
@@ -449,6 +450,25 @@ def sanity_check_repo(repo, io):
     return False
 
 
+def expand_glob_patterns(patterns, root="."):
+    """Expand glob patterns in a list of file paths."""
+    expanded_files = []
+    for pattern in patterns:
+        # Check if the pattern contains glob characters
+        if any(c in pattern for c in "*?[]"):
+            # Use glob to expand the pattern
+            matches = glob.glob(pattern, recursive=True)
+            if matches:
+                expanded_files.extend(matches)
+            else:
+                # If no matches, keep the original pattern
+                expanded_files.append(pattern)
+        else:
+            # Not a glob pattern, keep as is
+            expanded_files.append(pattern)
+    return expanded_files
+
+
 def main(argv=None, input=None, output=None, force_git_root=None, return_coder=False):
     report_uncaught_exceptions()
 
@@ -677,10 +697,16 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         for fname in loaded_dotenvs:
             io.tool_output(f"Loaded {fname}")
 
+    # Expand glob patterns in files and file arguments
     all_files = args.files + (args.file or [])
+    all_files = expand_glob_patterns(all_files)
     fnames = [str(Path(fn).resolve()) for fn in all_files]
+
+    # Expand glob patterns in read arguments
+    read_patterns = args.read or []
+    read_expanded = expand_glob_patterns(read_patterns)
     read_only_fnames = []
-    for fn in args.read or []:
+    for fn in read_expanded:
         path = Path(fn).expanduser().resolve()
         if path.is_dir():
             read_only_fnames.extend(str(f) for f in path.rglob("*") if f.is_file())

aider/repomap.py

@@ -612,6 +612,7 @@ class RepoMap:
                 personalization[rel_fname] = current_pers  # Assign the final calculated value
 
             tags = list(self.get_tags(fname, rel_fname))
+
             if tags is None:
                 continue
 
@@ -643,7 +644,7 @@ class RepoMap:
             if ident in references:
                 continue
             for definer in defines[ident]:
-                G.add_edge(definer, definer, weight=0.1, ident=ident)
+                G.add_edge(definer, definer, weight=0.01, ident=ident)
 
         for ident in idents:
             if progress:
@@ -658,12 +659,32 @@ class RepoMap:
             is_camel = any(c.isupper() for c in ident) and any(c.islower() for c in ident)
             if ident in mentioned_idents:
                 mul *= 10
-            if (is_snake or is_kebab or is_camel) and len(ident) >= 8:
+
+            # Prioritize function-like identifiers
+            if (
+                (is_snake or is_kebab or is_camel)
+                and len(ident) >= 8
+                and "test" not in ident.lower()
+            ):
                 mul *= 10
-            if ident.startswith("_"):
-                mul *= 0.1
+
+            # Downplay repetitive definitions in case of common boiler plate
+            # Scale down logarithmically given the increasing number of references in a codebase
+            # Ideally, this will help downweight boiler plate in frameworks, interfaces, and abstract classes
             if len(defines[ident]) > 5:
-                mul *= 0.1
+                mul *= math.log((5 / (len(defines[ident]) ** 2)) + 1)
+
+            # Calculate multiplier: log(number of unique file references * total references ^ 2)
+            # Used to balance the number of times an identifier appears with its number of refs per file
+            # Penetration in code base is important
+            # So is the frequency
+            # And the logarithm keeps them from scaling out of bounds forever
+            # Combined with the above downweighting
+            # There should be a push/pull that balances repetitiveness of identifier defs
+            # With absolute number of references throughout a codebase
+            unique_file_refs = len(set(references[ident]))
+            total_refs = len(references[ident])
+            ext_mul = math.log(unique_file_refs * total_refs**2 + 1)
 
             for referencer, num_refs in Counter(references[ident]).items():
                 for definer in definers:
@@ -671,7 +692,13 @@ class RepoMap:
                     # if referencer == definer:
                     #    continue
 
-                    use_mul = mul
+                    # Only add edge if file extensions match
+                    referencer_ext = Path(referencer).suffix
+                    definer_ext = Path(definer).suffix
+                    if referencer_ext != definer_ext:
+                        continue
+
+                    use_mul = mul * ext_mul
                     if referencer in chat_rel_fnames:
                         use_mul *= 50
 

{aider_ce-0.87.11.dev0.dist-info → aider_ce-0.87.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-ce
-Version: 0.87.11.dev0
+Version: 0.87.13
 Summary: Aider is AI pair programming in your terminal
 Project-URL: Homepage, https://github.com/dwash96/aider-ce
 Classifier: Development Status :: 4 - Beta
@@ -78,6 +78,34 @@ Provides-Extra: playwright
 Requires-Dist: playwright; extra == "playwright"
 Dynamic: license-file
 
+## Project Roadmap/Goals
+
+The current priorities are to improve core capabilities and user experience of the Aider project
+
+1. **Base Asynchronicity (aider-ce coroutine-experiment branch)**
+  * [x] Refactor codebase to have the main loop run asynchronously
+  * [x] Update test harness to work with new asynchronous methods
+
+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)  
+  * [ ] [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)
+  * [ ] Develop AST-based search capabilities
+  * [ ] Enhance file search with ripgrep integration
+  * [ ] Implement RAG (Retrieval-Augmented Generation) for better code retrieval
+  * [ ] Build an explicit workflow and local tooling for internal discovery mechanisms
+
+4. **Context Delivery** - [Discussion](https://github.com/dwash96/aider-ce/issues/47)
+  * [ ] Use workflow for internal discovery to better target file snippets needed for specific tasks
+  * [ ] Add support for partial files and code snippets in model completion messages   
+
+5. **TUI Experience** - [Discussion](https://github.com/dwash96/aider-ce/issues/48)
+  * [ ] Add a full TUI (probably using textual) to have a visual interface competitive with the other coding agent terminal programs
+  * [ ] Re-integrate pretty output formatting
+  * [ ] Implement a response area, a prompt area with current auto completion capabilities, and a helper area for management utility commands
+
 ## Fork Additions
 
 This project aims to be compatible with upstream Aider, but with priority commits merged in and with some opportunistic bug fixes and optimizations
@@ -112,6 +140,7 @@ This project aims to be compatible with upstream Aider, but with priority commit
 * [Remove Confirm Responses from History](https://github.com/Aider-AI/aider/pull/3958)
 * [Benchmark Results By Language](https://github.com/dwash96/aider-ce/pull/27)
 * [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)
 
 ### Other Notes
 * [MCP Configuration](https://github.com/dwash96/aider-ce/blob/main/aider/website/docs/config/mcp.md)

{aider_ce-0.87.11.dev0.dist-info → aider_ce-0.87.13.dist-info}/RECORD

@@ -1,8 +1,8 @@
-aider/__init__.py,sha256=2c2lIaVnFyCMrCFC_P4eUQrvHqN-Q5fy6euNDJ41kjA,497
+aider/__init__.py,sha256=JImLym1wv6gAAMhoWAQIr3gMJop9sC7pLmAPzE-TGpc,497
 aider/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
-aider/_version.py,sha256=Tm_2aSIT6-9mTVrkXHKyB-YIrPxTEHeQQV0Ac63NGhc,721
+aider/_version.py,sha256=Auv4ljHrmM0qPOhxSVayLoeyohpSIr7sJFSt90kyCPI,708
 aider/analytics.py,sha256=c5ujaCcMc3yG-9rz_0oSsqBwmVQRxJnui6iE_yDyY_M,7507
-aider/args.py,sha256=yjfHJm-eKBEXJ7MlqoGQEjkFhBlCvGtwp44AajAtROs,32491
+aider/args.py,sha256=iQQHrpraUzBVDuSTc0SKvBY3tZpRX5LzgsUWQ4eGJMc,32541
 aider/args_formatter.py,sha256=CBRnzHyZk-fFCK0ekAzb6C4PPJOU-VTpWIIsJe3qUhk,6369
 aider/change_tracker.py,sha256=djUlUuewhwRAlC0x6jIUZNpn6_PK1YyiNTMYvlvDeTE,4884
 aider/commands.py,sha256=TfOJyqjNQ78eTghzQFHiIpuJ2fIfNw2vbmF1nkQmZ5k,80010
@@ -20,7 +20,7 @@ aider/history.py,sha256=r3OP3kVxl6-PZmXEI9oK1mVAM-hYCbUqacISz4e_khY,5957
 aider/io.py,sha256=gecsU8k3TOywKynspE_6GvcHNnopbRvIMa5xWBSTpv4,47538
 aider/linter.py,sha256=t5jwWZ1dvIzRtig1kTSjzl6u1LRfw0e19qwNIen2jAg,7998
 aider/llm.py,sha256=fGCemP1X9MBwrDfsTKGJ_1sx-yKz3DyoOvxZYOkvGak,1103
-aider/main.py,sha256=LyHwjkxz3_7tH_jerneLpDVzMY7svkkLW2NGXmfEzY8,45034
+aider/main.py,sha256=srOVl0ewp64P3t7FccGEvSzNXz7qA5IhOOIUEKCiT1s,45969
 aider/mdstream.py,sha256=fS9iQUQmIJPEMo7o1psPGE2yYj31MI3m3msdN-jEzUw,7594
 aider/models.py,sha256=mZnDnk6HLNyZULd1IZ93uTK_IUyQToYvzj9U8InD7kM,44819
 aider/onboarding.py,sha256=XdCPsi6idsRvV0TsnaBOk0QoH-g3KgctafSMxoxvx6k,16105
@@ -28,7 +28,7 @@ aider/openrouter.py,sha256=FAdv7L8xgILXgmC_b1gnuYJStmpaPyiZMp-7nSdInlQ,4642
 aider/prompts.py,sha256=Qv-JS8BzGjusEPmR3-qmjjvN3S9mb7W4KpWiGui-Jk0,1954
 aider/reasoning_tags.py,sha256=VOg5wM7JSrMo47OyS1FFuLrr2cp2KyutEC4_zsUsCbY,2288
 aider/repo.py,sha256=ZLq0E6gwm7KabzYASib-7bqv-E55JZOWCpXfC3IZJeE,22922
-aider/repomap.py,sha256=zWGDo3wqp9DEX2VvDDA7GzcTs5v3Tg5Oa7X6IRKWe-A,33638
+aider/repomap.py,sha256=KA-ucbHNiLqHQ-iaCyPX5otJdugqexRUY0bwyaLPBlE,35082
 aider/report.py,sha256=WobVDEK6YxB0GpHrF5twTfUYH5dsNWFIHFsB9lds7E8,5899
 aider/run_cmd.py,sha256=9-NpSL4hlqIndf_EN1jnmWfjX7vIPbDgKgGPGRAr2Rw,4223
 aider/scrape.py,sha256=RyKlO3cN2QvfovaLQFJNx8j1Zaz6Qx2wqWhYO9H2Yug,8334
@@ -56,7 +56,7 @@ aider/coders/editblock_fenced_coder.py,sha256=ZaU43k4w4jH1oQAKq-LJ3OpLSyLvT2t9ap
 aider/coders/editblock_fenced_prompts.py,sha256=2YyHKt9RaN1KpCiW9n8kGBp8oRxP1nU7KLdguM2cCbU,4415
 aider/coders/editblock_func_coder.py,sha256=hVSjSz6Vz_vqmQqt2eheUAYtYMY7OV1S9BLiPTquUZs,5317
 aider/coders/editblock_func_prompts.py,sha256=t5NLHkggCxZPLOAwo35fml0hYtIDn-nmIU7nRpBBlnQ,886
-aider/coders/editblock_prompts.py,sha256=VAp3QYC4TpPGluOMHSF_2Jwrki6GyO7K3jxJVt-aaOE,5938
+aider/coders/editblock_prompts.py,sha256=9ItTxPlr4QsAMd0JB893x6VE4zR_4XB6fmCyNiPWH7c,5897
 aider/coders/editor_diff_fenced_coder.py,sha256=xrv0bCCBXwdmy1CpWmqi1frlSYsnpA0TQv29M7hgT94,338
 aider/coders/editor_diff_fenced_prompts.py,sha256=2ph1ftiriMEOVo1Z63oaIKofzwb0pC48GWKQ3zlzM6k,272
 aider/coders/editor_editblock_coder.py,sha256=6CDjf4_S6FiGipPNXc9_D6Sz9aIZPlW2w4fgJPq_6Pg,307
@@ -69,19 +69,19 @@ aider/coders/navigator_coder.py,sha256=U7aWgZwzH4O852WSp-stdujvJNjPdEMKMZjEziXRD
 aider/coders/navigator_legacy_prompts.py,sha256=ZxI-bc_JtnJXiu2JF65PrF60rckzDFntwTrhy8Rm0g8,17861
 aider/coders/navigator_prompts.py,sha256=dsqW0HWy4LGKpgJdTtLIJz4QaD8XdJOr5R2jpLYC3xo,34863
 aider/coders/patch_coder.py,sha256=f6-7VilMaMeYcZFQgIVWFycePo6IfZ6r9DQT5DpShBE,30288
-aider/coders/patch_prompts.py,sha256=_fG1WlkrCkc3bTu-yEZhwhikjz8xUF52-1nVsjrAs7w,6053
+aider/coders/patch_prompts.py,sha256=dSOs7FPnglFJIKIu7FlMB1gL21N4z-Zwv6sMucQCXUU,6012
 aider/coders/search_replace.py,sha256=5Qzib7g4bt82sI2yyCf7hpl599wkobxZgVGnrCCgEkc,19813
 aider/coders/shell.py,sha256=jSKol5ICraol7pAHmZu-58nhJjI13_vHieuxqNspFiY,1801
 aider/coders/single_wholefile_func_coder.py,sha256=m3ufhuz8843P9HlSm7RoLONQ1AK8pRrv-W4oyG2U45s,2967
 aider/coders/single_wholefile_func_prompts.py,sha256=ipzROzYhWZolmbHSxw5W-11Q2iNpyWnWAp41OsCdrIo,867
 aider/coders/udiff_coder.py,sha256=xtOVArLjWNqgnz2nvQ1isk-UNo3icWa8Rjd05quCJZI,11041
-aider/coders/udiff_prompts.py,sha256=KCI0OiL28ern2X5yIjQ3MMyl8dvmwrxXfEI8nMzvlrI,3466
+aider/coders/udiff_prompts.py,sha256=2IwzHuLkE0sPEbQub0fnzjgrdJ5hRrH_1qS1RHK8Jgs,3425
 aider/coders/udiff_simple.py,sha256=UjovEM-j51gLRZOpEL_dFxVTPs0CMwTJJNfUIaMKiE8,452
 aider/coders/udiff_simple_prompts.py,sha256=t6k8nFDQaKjdxXKwMiSNSe1BL6kAaUrgaTIPPOEr4_M,888
 aider/coders/wholefile_coder.py,sha256=uPoNNeSia1wrl4oiPjwnYrtVej7hXa2OepGsJC9t1S8,5131
 aider/coders/wholefile_func_coder.py,sha256=RKHzPNNdSuwogJ5rJEvCzmSoaxKx8zlPbCOtWvXv98I,4249
 aider/coders/wholefile_func_prompts.py,sha256=M5-d6qRYUeRTelK5w2mQYkVfFV_caPc-qGfNHlmbmJs,868
-aider/coders/wholefile_prompts.py,sha256=_311WMDUWMRqQTkrOShB3sau8zyAGW06FL94vl1beYE,2140
+aider/coders/wholefile_prompts.py,sha256=9un0j4lH0mKh39wZaRA1Md9gQBQ_kdAzexbeEmqf8wo,2015
 aider/mcp/__init__.py,sha256=KCT2FvT5dMVd9UmfA5GPZa8u-s4vCmHLABIskeN8hlQ,3489
 aider/mcp/server.py,sha256=_y9DgkKqF7SkF0q-m5Rf-yRtUkllWNXMvRbLMm8zDR8,4203
 aider/queries/tree-sitter-language-pack/README.md,sha256=ivZSEuWqYfUVLZl2AZZGRlm0bQsaG-VTBKBwACyM07k,291
@@ -258,9 +258,9 @@ aider/website/docs/usage/tutorials.md,sha256=ZKBztbUtucHOiv9h8gvWiWTP6MTSsFyz4mA
 aider/website/docs/usage/voice.md,sha256=BtX7pHRgHRWUmrNbS4JssC-SO8RrJ_OetBCtIYpO0pU,3452
 aider/website/docs/usage/watch.md,sha256=OVF14lGtv1vhSXRE8PpxQ3YW-uXSifarUbmLBjmLRyA,7940
 aider/website/share/index.md,sha256=P51aDw9AT8AVbsU7v6g1tWuMjly7y_plM_ZI1ScaT8Y,3172
-aider_ce-0.87.11.dev0.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-aider_ce-0.87.11.dev0.dist-info/METADATA,sha256=40kjI2l1lUPRzx7OUFTW9lN32ie3BbZxBA71AIjdL4s,18429
-aider_ce-0.87.11.dev0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aider_ce-0.87.11.dev0.dist-info/entry_points.txt,sha256=OxI0JxfyJrc24nTmsdvpaWUx8Flz2huOij_-ifp-48w,69
-aider_ce-0.87.11.dev0.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
-aider_ce-0.87.11.dev0.dist-info/RECORD,,
+aider_ce-0.87.13.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+aider_ce-0.87.13.dist-info/METADATA,sha256=G9pEOuSrPj87WEz4MLuhzRu0h03zCEG8iB9Kzc3dz78,20297
+aider_ce-0.87.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aider_ce-0.87.13.dist-info/entry_points.txt,sha256=OxI0JxfyJrc24nTmsdvpaWUx8Flz2huOij_-ifp-48w,69
+aider_ce-0.87.13.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
+aider_ce-0.87.13.dist-info/RECORD,,