aider-ce 0.88.1__py3-none-any.whl → 0.88.3__py3-none-any.whl

aider/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.88.1.dev"
+__version__ = "0.88.3.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.1'
-__version_tuple__ = version_tuple = (0, 88, 1)
+__version__ = version = '0.88.3'
+__version_tuple__ = version_tuple = (0, 88, 3)
 
 __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
@@ -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)
 
@@ -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():
@@ -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/io.py

@@ -418,13 +418,14 @@ class InputOutput:
             self.pretty = False
             fancy_input = False
 
+        # Spinner state
+        self.spinner_running = False
+        self.spinner_text = ""
+        self.spinner_frame_index = 0
+        self.spinner_last_frame_index = 0
+        self.unicode_palette = "░█"
+
         if fancy_input:
-            # Spinner state
-            self.spinner_running = False
-            self.spinner_text = ""
-            self.spinner_frame_index = 0
-            self.spinner_last_frame_index = 0
-            self.unicode_palette = "░█"
             # If unicode is supported, use the rich 'dots2' spinner, otherwise an ascii fallback
             if self._spinner_supports_unicode():
                 self.spinner_frames = SPINNERS["dots2"]["frames"]
@@ -1301,7 +1302,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/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_ce-0.88.1.dist-info → aider_ce-0.88.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aider-ce
-Version: 0.88.1
+Version: 0.88.3
 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.1.dist-info → aider_ce-0.88.3.dist-info}/RECORD

@@ -1,6 +1,6 @@
-aider/__init__.py,sha256=uLgefX9T20Pa_79q2BxTxhGYgUgMd0bxHBr1BMDVUvM,496
+aider/__init__.py,sha256=wrKtj8dqyfjwH3Rlw7e1W9GVgUnjsG9nsUMYHBwb3Vo,496
 aider/__main__.py,sha256=Vdhw8YA1K3wPMlbJQYL5WqvRzAKVeZ16mZQFO9VRmCo,62
-aider/_version.py,sha256=RTS3LOu5_z44owvzPaBz4n8oN6zJiBEfSJVG7R6sc08,706
+aider/_version.py,sha256=enEulHZ1Bg_kUgfLWzNgkcmguOKMpRSnje8Z-0F49F4,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
@@ -17,7 +17,7 @@ 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=flltMLvPUnG7sDpfQC_XWICjXxhIy2EJGtdygSr0cvA,56836
 aider/linter.py,sha256=t5jwWZ1dvIzRtig1kTSjzl6u1LRfw0e19qwNIen2jAg,7998
 aider/llm.py,sha256=dtT0mavXP1SyR0Zu_ysZXKdbs3y53q2PevvDKBUrs6s,1505
 aider/main.py,sha256=2Pk5nJhUf-aoa2cbs6VPQA0lfneRYgw-dCbkFO8r8WY,46331
@@ -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=QvHRbROeeibccCTv_SXLvLKL4mU9wItTFCYm6cyqZMM,128069
+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.1.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-aider_ce-0.88.1.dist-info/METADATA,sha256=3Bl3Ayxcg5RkIKkU8bU0IBq6K6xwk2e3UXkzJVU5Lq0,20820
-aider_ce-0.88.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-aider_ce-0.88.1.dist-info/entry_points.txt,sha256=OxI0JxfyJrc24nTmsdvpaWUx8Flz2huOij_-ifp-48w,69
-aider_ce-0.88.1.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
-aider_ce-0.88.1.dist-info/RECORD,,
+aider_ce-0.88.3.dist-info/licenses/LICENSE.txt,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+aider_ce-0.88.3.dist-info/METADATA,sha256=3XMMyoRjhPiiC-TNNFw4oVg3yUtLttJRCfvX03w5zBE,20820
+aider_ce-0.88.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+aider_ce-0.88.3.dist-info/entry_points.txt,sha256=qUBEUd84DYNEHFSgZbgsjgsrAABxqwOj-Dwut9pHZx0,45
+aider_ce-0.88.3.dist-info/top_level.txt,sha256=uwOA6ycgSiRLrBsaRBcIeN_eBKAX78U01_KDEHR8mBk,6
+aider_ce-0.88.3.dist-info/RECORD,,

{aider_ce-0.88.1.dist-info → aider_ce-0.88.3.dist-info}/entry_points.txt

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