aider-ce 0.88.0__tar.gz → 0.88.2__tar.gz

{aider_ce-0.88.0/aider_ce.egg-info → aider_ce-0.88.2}/PKG-INFO

@@ -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 → aider_ce-0.88.2}/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_ce-0.88.0 → aider_ce-0.88.2}/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 = 'g24d162af8'
+__commit_id__ = commit_id = 'g0cb2e8876'

{aider_ce-0.88.0 → aider_ce-0.88.2}/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_ce-0.88.0 → aider_ce-0.88.2}/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_ce-0.88.0 → aider_ce-0.88.2}/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_ce-0.88.0 → aider_ce-0.88.2}/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_ce-0.88.0 → aider_ce-0.88.2}/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_ce-0.88.0 → aider_ce-0.88.2}/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.0 → aider_ce-0.88.2}/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 → aider_ce-0.88.2/aider_ce.egg-info}/PKG-INFO

@@ -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 → aider_ce-0.88.2}/aider_ce.egg-info/entry_points.txt

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

{aider_ce-0.88.0 → aider_ce-0.88.2}/pyproject.toml

@@ -22,7 +22,6 @@ dynamic = ["dependencies", "optional-dependencies", "version"]
 Homepage = "https://github.com/dwash96/aider-ce"
 
 [project.scripts]
-aider = "aider.main:main"
 aider-ce = "aider.main:main"
 
 [tool.setuptools.dynamic]

{aider_ce-0.88.0 → aider_ce-0.88.2}/tests/basic/test_sanity_check_repo.py

@@ -1,3 +1,4 @@
+import asyncio
 import os
 import shutil
 import struct
@@ -81,7 +82,7 @@ def mock_repo_wrapper(repo_obj, git_repo_error=None):
     return mock_repo
 
 
-def test_detached_head_state(create_repo, mock_io):
+async def test_detached_head_state(create_repo, mock_io):
     repo_path, repo = create_repo
     # Detach the HEAD
     detach_head(repo)
@@ -90,7 +91,7 @@ def test_detached_head_state(create_repo, mock_io):
     mock_repo_obj = mock_repo_wrapper(repo)
 
     # Call the function
-    result = sanity_check_repo(mock_repo_obj, mock_io)
+    result = await sanity_check_repo(mock_repo_obj, mock_io)
 
     # Assert that the function returns True
     assert result is True
@@ -101,7 +102,7 @@ def test_detached_head_state(create_repo, mock_io):
 
 
 @mock.patch("webbrowser.open")
-def test_git_index_version_greater_than_2(mock_browser, create_repo, mock_io):
+async def test_git_index_version_greater_than_2(mock_browser, create_repo, mock_io):
     repo_path, repo = create_repo
     # Set the git index version to 3
     set_git_index_version(str(repo_path), 3)
@@ -110,8 +111,12 @@ def test_git_index_version_greater_than_2(mock_browser, create_repo, mock_io):
     git_error = GitError("index version in (1, 2) is required")
     mock_repo_obj = mock_repo_wrapper(repo, git_repo_error=git_error)
 
+    # Configure the mock to return an async mock for offer_url
+    mock_io.offer_url.return_value = asyncio.Future()
+    mock_io.offer_url.return_value.set_result(False)
+
     # Call the function
-    result = sanity_check_repo(mock_repo_obj, mock_io)
+    result = await sanity_check_repo(mock_repo_obj, mock_io)
 
     # Assert that the function returns False
     assert result is False
@@ -133,7 +138,7 @@ def test_git_index_version_greater_than_2(mock_browser, create_repo, mock_io):
     )
 
 
-def test_bare_repository(create_repo, mock_io, tmp_path):
+async def test_bare_repository(create_repo, mock_io, tmp_path):
     # Initialize a bare repository
     bare_repo_path = tmp_path / "bare_repo.git"
     bare_repo = Repo.init(bare_repo_path, bare=True)
@@ -142,7 +147,7 @@ def test_bare_repository(create_repo, mock_io, tmp_path):
     mock_repo_obj = mock_repo_wrapper(bare_repo)
 
     # Call the function
-    result = sanity_check_repo(mock_repo_obj, mock_io)
+    result = await sanity_check_repo(mock_repo_obj, mock_io)
 
     # Assert that the function returns False
     assert result is False
@@ -152,7 +157,7 @@ def test_bare_repository(create_repo, mock_io, tmp_path):
     mock_io.tool_output.assert_not_called()
 
 
-def test_sanity_check_repo_with_corrupt_repo(create_repo, mock_io):
+async def test_sanity_check_repo_with_corrupt_repo(create_repo, mock_io):
     repo_path, repo = create_repo
     # Simulate a corrupt repository by removing the .git directory
     shutil.rmtree(os.path.join(repo_path, ".git"))
@@ -162,7 +167,7 @@ def test_sanity_check_repo_with_corrupt_repo(create_repo, mock_io):
     mock_repo_obj = mock_repo_wrapper(repo, git_repo_error=git_error)
 
     # Call the function
-    result = sanity_check_repo(mock_repo_obj, mock_io)
+    result = await sanity_check_repo(mock_repo_obj, mock_io)
 
     # Assert that the function returns False
     assert result is False
@@ -172,9 +177,9 @@ def test_sanity_check_repo_with_corrupt_repo(create_repo, mock_io):
     mock_io.tool_output.assert_called_with(str(git_error))
 
 
-def test_sanity_check_repo_with_no_repo(mock_io):
+async def test_sanity_check_repo_with_no_repo(mock_io):
     # Call the function with repo=None
-    result = sanity_check_repo(None, mock_io)
+    result = await sanity_check_repo(None, mock_io)
 
     # Assert that the function returns True
     assert result is True