aider-ce 0.88.0__py3-none-any.whl → 0.88.2__py3-none-any.whl

aider/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.88.0.dev"
+__version__ = "0.88.2.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.88.0'
-__version_tuple__ = version_tuple = (0, 88, 0)
+__version__ = version = '0.88.2'
+__version_tuple__ = version_tuple = (0, 88, 2)
 
 __commit_id__ = commit_id = None

aider/coders/architect_coder.py

@@ -14,7 +14,7 @@ class ArchitectCoder(AskCoder):
         if not content or not content.strip():
             return
 
-        if not self.auto_accept_architect and not self.io.confirm_ask("Edit the files?"):
+        if not self.auto_accept_architect and not await self.io.confirm_ask("Edit the files?"):
             return
 
         kwargs = dict()

aider/coders/base_coder.py

@@ -616,9 +616,6 @@ class Coder:
                 except Exception as e:
                     self.io.tool_warning(f"Could not remove todo list file {todo_file_path}: {e}")
 
-        # Instantiate MCP tools
-        if self.mcp_servers:
-            pass
         # validate the functions jsonschema
         if self.functions:
             from jsonschema import Draft7Validator
@@ -1248,7 +1245,7 @@ class Coder:
             else:
                 message = self.reflected_message
 
-    def check_and_open_urls(self, exc, friendly_msg=None):
+    async 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)
 
@@ -1264,7 +1261,7 @@ class Coder:
         urls = list(set(url_pattern.findall(text)))
         for url in urls:
             url = url.rstrip(".',\"}")  # Added } to the characters to strip
-            self.io.offer_url(url)
+            await self.io.offer_url(url)
         return urls
 
     async def check_for_urls(self, inp: str) -> List[str]:
@@ -1755,7 +1752,7 @@ class Coder:
 
         return chunks
 
-    def check_tokens(self, messages):
+    async def check_tokens(self, messages):
         """Check if the messages will fit within the model's token limits."""
         input_tokens = self.main_model.token_count(messages)
         max_input_tokens = self.main_model.info.get("max_input_tokens") or 0
@@ -1774,7 +1771,7 @@ class Coder:
                 " the context limit is exceeded."
             )
 
-            if not self.io.confirm_ask("Try to proceed anyway?"):
+            if not await self.io.confirm_ask("Try to proceed anyway?"):
                 return False
         return True
 
@@ -1792,7 +1789,7 @@ class Coder:
         chunks = self.format_messages()
         messages = chunks.all_messages()
 
-        if not self.check_tokens(messages):
+        if not await self.check_tokens(messages):
             return
         self.warm_cache(chunks)
 
@@ -1841,7 +1838,7 @@ class Coder:
 
                     if not should_retry:
                         self.mdstream = None
-                        self.check_and_open_urls(err, ex_info.description)
+                        await self.check_and_open_urls(err, ex_info.description)
                         break
 
                     err_msg = str(err)
@@ -1906,7 +1903,7 @@ class Coder:
                     ),
                 ]
 
-            self.show_exhausted_error()
+            await self.show_exhausted_error()
             self.num_exhausted_context_windows += 1
             return
 
@@ -2352,7 +2349,8 @@ class Coder:
                 )
                 return (server.name, server_tools)
             except Exception as e:
-                self.io.tool_warning(f"Error initializing MCP server {server.name}:\n{e}")
+                if server.name != "unnamed-server":
+                    self.io.tool_warning(f"Error initializing MCP server {server.name}:\n{e}")
                 return None
 
         async def get_all_server_tools():
@@ -2402,7 +2400,7 @@ class Coder:
     async def reply_completed(self):
         pass
 
-    def show_exhausted_error(self):
+    async def show_exhausted_error(self):
         output_tokens = 0
         if self.partial_response_content:
             output_tokens = self.main_model.token_count(self.partial_response_content)
@@ -2453,7 +2451,7 @@ class Coder:
 
         res = "".join([line + "\n" for line in res])
         self.io.tool_error(res)
-        self.io.offer_url(urls.token_limits)
+        await self.io.offer_url(urls.token_limits)
 
     def lint_edited(self, fnames):
         res = ""
@@ -2604,7 +2602,7 @@ class Coder:
             )
             self.chat_completion_call_hashes.append(hash_object.hexdigest())
 
-            if self.stream:
+            if not isinstance(completion, ModelResponse):
                 async for chunk in self.show_send_output_stream(completion):
                     yield chunk
             else:
@@ -2640,6 +2638,10 @@ class Coder:
         if self.verbose:
             print(completion)
 
+        if not isinstance(completion, ModelResponse):
+            self.io.tool_error(str(completion))
+            return
+
         if not completion.choices:
             self.io.tool_error(str(completion))
             return
@@ -3092,7 +3094,7 @@ class Coder:
             return
 
         if not Path(full_path).exists():
-            if not self.io.confirm_ask("Create new file?", subject=path):
+            if not await self.io.confirm_ask("Create new file?", subject=path):
                 self.io.tool_output(f"Skipping edits to {path}")
                 return
 

aider/exceptions.py

@@ -28,6 +28,7 @@ EXCEPTIONS = [
         "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("ErrorEventError", True, None),
     ExInfo("ImageFetchError", True, "The API cannot fetch an image"),
     ExInfo("InternalServerError", True, "The API provider's servers are down or overloaded."),
     ExInfo("InvalidRequestError", True, None),

aider/io.py

@@ -1301,7 +1301,7 @@ class InputOutput:
         else:
             show_resp = Text(message or "(empty response)")
 
-        self.stream_print(show_resp)
+        self.console.print(show_resp)
 
     def render_markdown(self, text):
         output = StringIO()

aider/main.py

@@ -412,7 +412,7 @@ def register_litellm_models(git_root, model_metadata_fname, io, verbose=False):
         return 1
 
 
-def sanity_check_repo(repo, io):
+async def sanity_check_repo(repo, io):
     if not repo:
         return True
 
@@ -443,7 +443,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.offer_url(urls.git_index_version, "Open documentation url for more info?")
+        await 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?")
@@ -783,7 +783,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     io.tool_output(cmd_line, log_only=True)
 
     is_first_run = is_first_run_of_new_version(io, verbose=args.verbose)
-    check_and_load_imports(io, is_first_run, verbose=args.verbose)
+    await check_and_load_imports(io, is_first_run, verbose=args.verbose)
 
     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)
@@ -844,7 +844,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             io.tool_error(
                 f"Unable to proceed without an OpenRouter API key for model '{args.model}'."
             )
-            io.offer_url(urls.models_and_keys, "Open documentation URL for more info?")
+            await io.offer_url(urls.models_and_keys, "Open documentation URL for more info?")
             analytics.event(
                 "exit",
                 reason="OpenRouter key missing for specified model and OAuth failed/declined",
@@ -926,7 +926,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             io.tool_output("You can skip this check with --no-show-model-warnings")
 
             try:
-                io.offer_url(urls.model_warnings, "Open documentation url for more info?")
+                await io.offer_url(urls.model_warnings, "Open documentation url for more info?")
                 io.tool_output()
             except KeyboardInterrupt:
                 analytics.event("exit", reason="Keyboard interrupt during model warnings")
@@ -954,7 +954,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             pass
 
     if not args.skip_sanity_check_repo:
-        if not sanity_check_repo(repo, io):
+        if not await sanity_check_repo(repo, io):
             analytics.event("exit", reason="Repository sanity check failed")
             return 1
 
@@ -1059,7 +1059,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         )
     except UnknownEditFormat as err:
         io.tool_error(str(err))
-        io.offer_url(urls.edit_formats, "Open documentation about edit formats?")
+        await io.offer_url(urls.edit_formats, "Open documentation about edit formats?")
         analytics.event("exit", reason="Unknown edit format")
         return 1
     except ValueError as err:
@@ -1152,7 +1152,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         webbrowser.open(urls.release_notes)
     elif args.show_release_notes is None and is_first_run:
         io.tool_output()
-        io.offer_url(
+        await io.offer_url(
             urls.release_notes,
             "Would you like to see what's new in this version?",
             allow_never=False,
@@ -1276,7 +1276,7 @@ def is_first_run_of_new_version(io, verbose=False):
         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):
+async def check_and_load_imports(io, is_first_run, verbose=False):
     try:
         if is_first_run:
             if verbose:
@@ -1288,7 +1288,7 @@ def check_and_load_imports(io, is_first_run, verbose=False):
             except Exception as err:
                 io.tool_error(str(err))
                 io.tool_output("Error loading required imports. Did you install aider properly?")
-                io.offer_url(urls.install_properly, "Open documentation url for more info?")
+                await io.offer_url(urls.install_properly, "Open documentation url for more info?")
                 sys.exit(1)
 
             if verbose:

aider/mcp/__init__.py

@@ -154,4 +154,21 @@ def load_mcp_servers(mcp_servers, mcp_servers_file, io, verbose=False, mcp_trans
     if mcp_servers_file:
         servers = _parse_mcp_servers_from_file(mcp_servers_file, io, verbose, mcp_transport)
 
+    if not servers:
+        # A default MCP server is actually now necessary for the overall agentic loop
+        # and a dummy server does suffice for the job
+        # because I am not smart enough to figure out why
+        # on coder switch, the agent actually initializes the prompt area twice
+        # once immediately after input for the old coder
+        # and immediately again for the new target coder
+        # which causes a race condition where we are awaiting a coroutine
+        # that can no longer yield control (somehow?)
+        # but somehow having to run through the MCP server checks
+        # allows control to be yielded again somehow
+        # and I cannot figure out just how that is happening
+        # and maybe it is actually prompt_toolkit's fault
+        # but this hack works swimmingly because ???
+        # so sure! why not
+        servers = [McpServer(json.loads('{"aider_default": {}}'))]
+
     return servers

aider/onboarding.py

@@ -146,7 +146,7 @@ async def select_default_model(args, io, analytics):
     if model:
         return model
 
-    io.offer_url(urls.models_and_keys, "Open documentation URL for more info?")
+    await io.offer_url(urls.models_and_keys, "Open documentation URL for more info?")
 
 
 # Helper function to find an available port

{aider_ce-0.88.0.dist-info → aider_ce-0.88.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-ce
-Version: 0.88.0
+Version: 0.88.2
 Summary: Aider is AI pair programming in your terminal
 Project-URL: Homepage, https://github.com/dwash96/aider-ce
 Classifier: Development Status :: 4 - Beta

{aider_ce-0.88.0.dist-info → aider_ce-0.88.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
-aider/__init__.py,sha256=NmXewK2gTETvxH0iuvdebVsJvhmghhUsf0r9KMfTOTU,496
+aider/__init__.py,sha256=lR9OBHkDJxBD9W4uVZzRD0QzU75uFDkVWRF4kJyJh4k,496
 aider/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
-aider/_version.py,sha256=IkSkv_g3X5B_24rJ_LnZDKJLwXs1B65RUO3nU59LY60,706
+aider/_version.py,sha256=2xGyxCb49iWFz4jJKwCSryLonWCKFULLHVc5ZqHj6h8,706
 aider/analytics.py,sha256=c5ujaCcMc3yG-9rz_0oSsqBwmVQRxJnui6iE_yDyY_M,7507
 aider/args.py,sha256=lC64t3gp-SJ1Sv51LDHpTAsiU2ZwiFWerYf3iu9mtWY,32742
 aider/args_formatter.py,sha256=CBRnzHyZk-fFCK0ekAzb6C4PPJOU-VTpWIIsJe3qUhk,6369
@@ -11,19 +11,19 @@ aider/deprecated.py,sha256=SNeAWR7ih87F5AyFpC4pxRoJAaw8measBW583w0EUT8,4277
 aider/diffs.py,sha256=y6_rxIKe3FPCIsVy_RRkHdofguYOhYBr2Oytr5AqjHI,3028
 aider/dump.py,sha256=-naWnGTc0-lAe_93WxBTpunPRfzNlUK7Q5zgXOprHfA,653
 aider/editor.py,sha256=_WAipJYEOx-q69mPp_hHAQ2yfeoZklBYjS0rTLxCHEA,4364
-aider/exceptions.py,sha256=W9Qw83348Xl0KwSMc1jYNZ-o8Ok65rBAuB1Mz9P6fUk,3914
+aider/exceptions.py,sha256=RfGohVQ5Z6dw_hxqRukabsEtSaZOd_uFxiFT_arpvKc,3957
 aider/format_settings.py,sha256=wHW4bLTKwqUKDGX4onxirC4cNgeJ-lHPuS1H04_R444,1041
 aider/gui.py,sha256=JnHvli1JTCGHAgsOZ8HkAWOKAFxmngbyviZIJeYvjsw,17573
 aider/help.py,sha256=wExA1E9vuJccKBH1VvKmH-zJqFi-vhNc0n3CD3Y-8fI,4432
 aider/help_pats.py,sha256=syn7pSVJdcf8uMKTxnZUZBQu-r8JMAi-rrC-k2er1Fk,376
 aider/history.py,sha256=083Gm7KxNo1PXMFHYiChigxCbRzmLkfNlesODdCC-eY,6067
-aider/io.py,sha256=ZvkXA_GKQMK1MeCiduyRCw7OES4lbYrRTAv2ZtshhPM,56858
+aider/io.py,sha256=_CS6DxB-HmpaqVUedyAq-CZzp-KdHHs2zwpF53pcaCY,56859
 aider/linter.py,sha256=t5jwWZ1dvIzRtig1kTSjzl6u1LRfw0e19qwNIen2jAg,7998
 aider/llm.py,sha256=dtT0mavXP1SyR0Zu_ysZXKdbs3y53q2PevvDKBUrs6s,1505
-aider/main.py,sha256=Kju9MTXQehErlw8X1uk32tJ3xp1tVrv-PjURgxE94Zs,46271
+aider/main.py,sha256=2Pk5nJhUf-aoa2cbs6VPQA0lfneRYgw-dCbkFO8r8WY,46331
 aider/mdstream.py,sha256=fS9iQUQmIJPEMo7o1psPGE2yYj31MI3m3msdN-jEzUw,7594
 aider/models.py,sha256=yflYZ64oza4QH04vIPI2n7rcsdSw2Np4BRwRKlb3STQ,45455
-aider/onboarding.py,sha256=-Ac-bk2Unqygg1Ze0X-6gZRVS-_v4rPQgzPaHvHboHQ,16129
+aider/onboarding.py,sha256=pMWl--NOH_hb4w1wVxLmv8W0akcrilo1Pxf9XUSqBXs,16135
 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
@@ -42,11 +42,11 @@ aider/waiting.py,sha256=QbDnh1U6oJPqkUrRM3DC8iA5-djbKRW5iJh6Q3VOnrI,944
 aider/watch.py,sha256=znCZhHCBlcMm-4SRJP-B0mWfsl5q26DAd-zlk2zykQ8,10641
 aider/watch_prompts.py,sha256=JHmXPZUKm1b1og22QolboU-Xie6bJWhmlbKBi2StkdI,556
 aider/coders/__init__.py,sha256=iB0SkjLra5cb5byPx-bzrmlH6Ud7GnpdOG3pWMhysLs,1102
-aider/coders/architect_coder.py,sha256=725D5ze2nWCEQeUrYpQjYTwnLPVITpSSvRi-243HYIQ,1640
+aider/coders/architect_coder.py,sha256=O5KIf__Ka0bgtCUhYWUmAb08aCS6Nq-CdVWWa-VNKv0,1646
 aider/coders/architect_prompts.py,sha256=R0_KxZjo-km_yNaeDAquDP9qfp3IdWgrdMirCWe0RIE,1658
 aider/coders/ask_coder.py,sha256=Omk4Ih8-prefkMZ_jnRS3faoW5CQUakHOvZ-s7piM3U,210
 aider/coders/ask_prompts.py,sha256=W6HwDUfzfOLt9q8sl6rw7fN7b5ND90FkxCZrtrWl5vY,1171
-aider/coders/base_coder.py,sha256=S8p4V09m4UGlCNxoACnzQ1yWSsAWYFNPXr7rWRmGG4M,128033
+aider/coders/base_coder.py,sha256=I2IwjL2mzcBJhnaMHhAZn0tQZ6DPi8sw-EsjRofJk9c,128223
 aider/coders/base_prompts.py,sha256=O3bBjhf0hgvtKbQ9QyOMnRy8LrmfLyT9dVAcXxHS_3k,3659
 aider/coders/chat_chunks.py,sha256=8HPet6cmQdgWvaA_tGpinO4ASMst53uTcSEtNVTYDXE,1981
 aider/coders/context_coder.py,sha256=_RSzu6ptHo2lkTN7-e9TpcZKzqbQF2eNX5MkyswGm3s,1577
@@ -82,7 +82,7 @@ aider/coders/wholefile_coder.py,sha256=uPoNNeSia1wrl4oiPjwnYrtVej7hXa2OepGsJC9t1
 aider/coders/wholefile_func_coder.py,sha256=pyQHy-VP1gFb4-4EHmYLxRkCP0Ss4nlA4-aQdBVAPQU,4261
 aider/coders/wholefile_func_prompts.py,sha256=M5-d6qRYUeRTelK5w2mQYkVfFV_caPc-qGfNHlmbmJs,868
 aider/coders/wholefile_prompts.py,sha256=9un0j4lH0mKh39wZaRA1Md9gQBQ_kdAzexbeEmqf8wo,2015
-aider/mcp/__init__.py,sha256=MXjxSCDxcxOGTpVEi67HgMk_OHH11Ba_FxLJk09JkqQ,5821
+aider/mcp/__init__.py,sha256=vYNfOKLMhDHXQyayTCFkZI1g53pBHDcTNOUziyKc_Jo,6747
 aider/mcp/server.py,sha256=sGlmgDMZ8LBgUikSq0I1y48OoTIhHMc4_Y1ST-amK1Q,5253
 aider/queries/tree-sitter-language-pack/README.md,sha256=ivZSEuWqYfUVLZl2AZZGRlm0bQsaG-VTBKBwACyM07k,291
 aider/queries/tree-sitter-language-pack/arduino-tags.scm,sha256=HbgdothT9Jjk56COXTtUkVAdZ14rZNnqzLbWVLeRs5U,177
@@ -261,9 +261,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.88.0.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-aider_ce-0.88.0.dist-info/METADATA,sha256=N0ya4CMSgXwTRr6CfC83eQ_3gGCurnOhgsMdEwI_aKk,20820
-aider_ce-0.88.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aider_ce-0.88.0.dist-info/entry_points.txt,sha256=OxI0JxfyJrc24nTmsdvpaWUx8Flz2huOij_-ifp-48w,69
-aider_ce-0.88.0.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
-aider_ce-0.88.0.dist-info/RECORD,,
+aider_ce-0.88.2.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+aider_ce-0.88.2.dist-info/METADATA,sha256=24StMPdhLaWO45fN1UXg5gC-nJjB7mEuPzaaVlBxULE,20820
+aider_ce-0.88.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aider_ce-0.88.2.dist-info/entry_points.txt,sha256=qUBEUd84DYNEHFSgZbgsjgsrAABxqwOj-Dwut9pHZx0,45
+aider_ce-0.88.2.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
+aider_ce-0.88.2.dist-info/RECORD,,

{aider_ce-0.88.0.dist-info → aider_ce-0.88.2.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
-aider = aider.main:main
 aider-ce = aider.main:main