Get last few confirmations and helper functions async, fix tests to account for that

Author: dwash96

aider/commands.py

@@ -86,7 +86,7 @@ def __init__(
         self.original_read_only_fnames = set(original_read_only_fnames or [])
         self.cmd_running = False
 
-    def cmd_model(self, args):
+    async def cmd_model(self, args):
         "Switch the Main Model to a new LLM"
 
         model_name = args.strip()
@@ -100,7 +100,7 @@ def cmd_model(self, args):
             editor_model=self.coder.main_model.editor_model.name,
             weak_model=self.coder.main_model.weak_model.name,
         )
-        models.sanity_check_models(self.io, model)
+        await models.sanity_check_models(self.io, model)
 
         # Check if the current edit format is the default for the old model
         old_model_edit_format = self.coder.main_model.edit_format
@@ -113,7 +113,7 @@ def cmd_model(self, args):
 
         raise SwitchCoder(main_model=model, edit_format=new_edit_format)
 
-    def cmd_editor_model(self, args):
+    async def cmd_editor_model(self, args):
         "Switch the Editor Model to a new LLM"
 
         model_name = args.strip()
@@ -122,10 +122,10 @@ def cmd_editor_model(self, args):
             editor_model=model_name,
             weak_model=self.coder.main_model.weak_model.name,
         )
-        models.sanity_check_models(self.io, model)
+        await models.sanity_check_models(self.io, model)
         raise SwitchCoder(main_model=model)
 
-    def cmd_weak_model(self, args):
+    async def cmd_weak_model(self, args):
         "Switch the Weak Model to a new LLM"
 
         model_name = args.strip()
@@ -134,7 +134,7 @@ def cmd_weak_model(self, args):
             editor_model=self.coder.main_model.editor_model.name,
             weak_model=model_name,
         )
-        models.sanity_check_models(self.io, model)
+        await models.sanity_check_models(self.io, model)
         raise SwitchCoder(main_model=model)
 
     def cmd_chat_mode(self, args):
@@ -1370,7 +1370,7 @@ async def cmd_help(self, args):
         from aider.coders.base_coder import Coder
 
         if not self.help:
-            res = install_help_extra(self.io)
+            res = await install_help_extra(self.io)
             if not res:
                 self.io.tool_error("Unable to initialize interactive help.")
                 return

aider/help.py

@@ -15,13 +15,13 @@
 warnings.simplefilter("ignore", category=FutureWarning)
 
 
-def install_help_extra(io):
+async def install_help_extra(io):
     pip_install_cmd = [
         "aider-ce[help]",
         "--extra-index-url",
         "https://download.pytorch.org/whl/cpu",
     ]
-    res = utils.check_pip_install_extra(
+    res = await utils.check_pip_install_extra(
         io,
         "llama_index.embeddings.huggingface",
         "To use interactive /help you need to install the help extras",

aider/main.py

@@ -89,10 +89,10 @@ def guessed_wrong_repo(io, git_root, fnames, git_dname):
     return str(check_repo)
 
 
-def make_new_repo(git_root, io):
+async def make_new_repo(git_root, io):
     try:
         repo = git.Repo.init(git_root)
-        check_gitignore(git_root, io, False)
+        await check_gitignore(git_root, io, False)
     except ANY_GIT_ERROR as err:  # issue #1233
         io.tool_error(f"Unable to create git repo in {git_root}")
         io.tool_output(str(err))
@@ -102,7 +102,7 @@ def make_new_repo(git_root, io):
     return repo
 
 
-def setup_git(git_root, io):
+async def setup_git(git_root, io):
     if git is None:
         return
 
@@ -123,11 +123,11 @@ def setup_git(git_root, io):
             "You should probably run aider in your project's directory, not your home dir."
         )
         return
-    elif cwd and io.confirm_ask(
+    elif cwd and await io.confirm_ask(
         "No git repo found, create one to track aider's changes (recommended)?"
     ):
         git_root = str(cwd.resolve())
-        repo = make_new_repo(git_root, io)
+        repo = await make_new_repo(git_root, io)
 
     if not repo:
         return
@@ -156,7 +156,7 @@ def setup_git(git_root, io):
     return repo.working_tree_dir
 
 
-def check_gitignore(git_root, io, ask=True):
+async def check_gitignore(git_root, io, ask=True):
     if not git_root:
         return
 
@@ -192,7 +192,9 @@ def check_gitignore(git_root, io, ask=True):
 
     if ask:
         io.tool_output("You can skip this check with --no-gitignore")
-        if not io.confirm_ask(f"Add {', '.join(patterns_to_add)} to .gitignore (recommended)?"):
+        if not await io.confirm_ask(
+            f"Add {', '.join(patterns_to_add)} to .gitignore (recommended)?"
+        ):
             return
 
     content += "\n".join(patterns_to_add) + "\n"
@@ -209,16 +211,16 @@ def check_gitignore(git_root, io, ask=True):
             io.tool_output(f"  {pattern}")
 
 
-def check_streamlit_install(io):
-    return utils.check_pip_install_extra(
+async def check_streamlit_install(io):
+    return await utils.check_pip_install_extra(
         io,
         "streamlit",
         "You need to install the aider browser feature",
         ["aider-ce[browser]"],
     )
 
 
-def write_streamlit_credentials():
+async def write_streamlit_credentials():
     from streamlit.file_util import get_streamlit_file_path
 
     # See https://github.com/Aider-AI/aider/issues/772
@@ -722,7 +724,7 @@ def get_io(pretty):
                 " personal info."
             )
             io.tool_output(f"For more info: {urls.analytics}")
-            disable = not io.confirm_ask(
+            disable = not await io.confirm_ask(
                 "Allow collection of anonymous analytics to help improve aider?"
             )
 
@@ -740,7 +742,7 @@ def get_io(pretty):
     analytics.event("launched")
 
     if args.gui and not return_coder:
-        if not check_streamlit_install(io):
+        if not await check_streamlit_install(io):
             analytics.event("exit", reason="Streamlit not installed")
             return
         analytics.event("gui session")
@@ -807,22 +809,22 @@ def get_io(pretty):
         return 0 if not update_available else 1
 
     if args.install_main_branch:
-        success = install_from_main_branch(io)
+        success = await install_from_main_branch(io)
         analytics.event("exit", reason="Installed main branch")
         return 0 if success else 1
 
     if args.upgrade:
-        success = install_upgrade(io)
+        success = await install_upgrade(io)
         analytics.event("exit", reason="Upgrade completed")
         return 0 if success else 1
 
     if args.check_update:
         check_version(io, verbose=args.verbose)
 
     if args.git:
-        git_root = setup_git(git_root, io)
+        git_root = await setup_git(git_root, io)
         if args.gitignore:
-            check_gitignore(git_root, io)
+            await check_gitignore(git_root, io)
 
     if args.verbose:
         show = format_settings(parser, args)
@@ -970,7 +972,7 @@ def get_io(pretty):
         return 1
 
     if args.show_model_warnings:
-        problem = models.sanity_check_models(io, main_model)
+        problem = await models.sanity_check_models(io, main_model)
         if problem:
             analytics.event("model warning", main_model=main_model)
             io.tool_output("You can skip this check with --no-show-model-warnings")

aider/models.py

@@ -846,17 +846,24 @@ def set_thinking_tokens(self, value):
                         if current_beta:
                             beta_features.update(current_beta.split(","))
                         beta_features.add("thinking-2025-10-22")
-                        self.extra_params["extra_headers"]["anthropic-beta"] = ",".join(sorted(beta_features))
+                        self.extra_params["extra_headers"]["anthropic-beta"] = ",".join(
+                            sorted(beta_features)
+                        )
                 else:
                     if "thinking" in self.extra_params:
                         del self.extra_params["thinking"]
                     # Remove thinking beta header if thinking is disabled
-                    if "extra_headers" in self.extra_params and "anthropic-beta" in self.extra_params["extra_headers"]:
+                    if (
+                        "extra_headers" in self.extra_params
+                        and "anthropic-beta" in self.extra_params["extra_headers"]
+                    ):
                         current_beta = self.extra_params["extra_headers"]["anthropic-beta"]
                         beta_features = set(current_beta.split(","))
                         beta_features.discard("thinking-2025-10-22")
                         if beta_features:
-                            self.extra_params["extra_headers"]["anthropic-beta"] = ",".join(sorted(beta_features))
+                            self.extra_params["extra_headers"]["anthropic-beta"] = ",".join(
+                                sorted(beta_features)
+                            )
                         else:
                             del self.extra_params["extra_headers"]["anthropic-beta"]
                             if not self.extra_params["extra_headers"]:
@@ -1145,25 +1152,25 @@ def validate_variables(vars):
     return dict(keys_in_environment=True, missing_keys=missing)
 
 
-def sanity_check_models(io, main_model):
-    problem_main = sanity_check_model(io, main_model)
+async def sanity_check_models(io, main_model):
+    problem_main = await sanity_check_model(io, main_model)
 
     problem_weak = None
     if main_model.weak_model and main_model.weak_model is not main_model:
-        problem_weak = sanity_check_model(io, main_model.weak_model)
+        problem_weak = await sanity_check_model(io, main_model.weak_model)
 
     problem_editor = None
     if (
         main_model.editor_model
         and main_model.editor_model is not main_model
         and main_model.editor_model is not main_model.weak_model
     ):
-        problem_editor = sanity_check_model(io, main_model.editor_model)
+        problem_editor = await sanity_check_model(io, main_model.editor_model)
 
     return problem_main or problem_weak or problem_editor
 
 
-def sanity_check_model(io, model):
+async def sanity_check_model(io, model):
     show = False
 
     if model.missing_keys:
@@ -1185,7 +1192,7 @@ def sanity_check_model(io, model):
         io.tool_warning(f"Warning for {model}: Unknown which environment variables are required.")
 
     # Check for model-specific dependencies
-    check_for_dependencies(io, model.name)
+    await check_for_dependencies(io, model.name)
 
     if not model.info:
         show = True
@@ -1202,7 +1209,7 @@ def sanity_check_model(io, model):
     return show
 
 
-def check_for_dependencies(io, model_name):
+async def check_for_dependencies(io, model_name):
     """
     Check for model-specific dependencies and install them if needed.
 
@@ -1212,13 +1219,13 @@ def check_for_dependencies(io, model_name):
     """
     # Check if this is a Bedrock model and ensure boto3 is installed
     if model_name.startswith("bedrock/"):
-        check_pip_install_extra(
+        await check_pip_install_extra(
             io, "boto3", "AWS Bedrock models require the boto3 package.", ["boto3"]
         )
 
     # Check if this is a Vertex AI model and ensure google-cloud-aiplatform is installed
     elif model_name.startswith("vertex_ai/"):
-        check_pip_install_extra(
+        await check_pip_install_extra(
             io,
             "google.cloud.aiplatform",
             "Google Vertex AI models require the google-cloud-aiplatform package.",

aider/utils.py

@@ -338,7 +338,7 @@ def touch_file(fname):
         return False
 
 
-def check_pip_install_extra(io, module, prompt, pip_install_cmd, self_update=False):
+async def check_pip_install_extra(io, module, prompt, pip_install_cmd, self_update=False):
     if module:
         try:
             __import__(module)
@@ -357,7 +357,9 @@ def check_pip_install_extra(io, module, prompt, pip_install_cmd, self_update=Fal
         print(printable_shell_command(cmd))  # plain print so it doesn't line-wrap
         return
 
-    if not io.confirm_ask("Run pip install?", default="y", subject=printable_shell_command(cmd)):
+    if not await io.confirm_ask(
+        "Run pip install?", default="y", subject=printable_shell_command(cmd)
+    ):
         return
 
     success, output = run_install(cmd)

aider/versioncheck.py

@@ -12,12 +12,12 @@
 VERSION_CHECK_FNAME = Path.home() / ".aider" / "caches" / "versioncheck"
 
 
-def install_from_main_branch(io):
+async def install_from_main_branch(io):
     """
     Install the latest version of aider from the main branch of the GitHub repository.
     """
 
-    return utils.check_pip_install_extra(
+    return await utils.check_pip_install_extra(
         io,
         None,
         "Install the development version of aider from the main branch?",
@@ -26,7 +26,7 @@ def install_from_main_branch(io):
     )
 
 
-def install_upgrade(io, latest_version=None):
+async def install_upgrade(io, latest_version=None):
     """
     Install the latest version of aider from PyPI.
     """
@@ -46,7 +46,7 @@ def install_upgrade(io, latest_version=None):
         io.tool_warning(text)
         return True
 
-    success = utils.check_pip_install_extra(
+    success = await utils.check_pip_install_extra(
         io,
         None,
         new_ver_text,
@@ -75,7 +75,7 @@ def check_version(io, just_check=False, verbose=False):
     import requests
 
     try:
-        response = requests.get("https://pypi.org/pypi/aider-chat/json")
+        response = requests.get("https://pypi.org/pypi/aider-ce/json")
         data = response.json()
         latest_version = data["info"]["version"]
         current_version = aider.__version__