aider-ce 0.88.20__py3-none-any.whl → 0.88.38__py3-none-any.whl

aider/main.py

@@ -353,6 +353,13 @@ def register_models(git_root, model_settings_fname, io, verbose=False):
                     io.tool_output(f"  - {file_loaded}")  # noqa: E221
         elif verbose:
             io.tool_output("No model settings files loaded")
+
+        if (
+            model_settings_fname
+            and model_settings_fname not in files_loaded
+            and model_settings_fname != ".aider.model.settings.yml"
+        ):
+            io.tool_warning(f"Model Settings File Not Found: {model_settings_fname}")
     except Exception as e:
         io.tool_error(f"Error loading aider model settings: {e}")
         return 1
@@ -411,6 +418,13 @@ def register_litellm_models(git_root, model_metadata_fname, io, verbose=False):
             io.tool_output("Loaded model metadata from:")
             for model_metadata_file in model_metadata_files_loaded:
                 io.tool_output(f"  - {model_metadata_file}")  # noqa: E221
+
+        if (
+            model_metadata_fname
+            and model_metadata_fname not in model_metadata_files_loaded
+            and model_metadata_fname != ".aider.model.metadata.json"
+        ):
+            io.tool_warning(f"Model Metadata File Not Found: {model_metadata_fname}")
     except Exception as e:
         io.tool_error(f"Error loading model metadata models: {e}")
         return 1
@@ -478,10 +492,27 @@ def expand_glob_patterns(patterns, root="."):
 
 PROJECT_ROOT = os.path.abspath(os.path.dirname(__file__))
 log_file = None
-file_excludelist = ["get_bottom_toolbar", "<genexpr>"]
+file_excludelist = {
+    "get_bottom_toolbar": True,
+    "<genexpr>": True,
+    "is_active": True,
+    "auto_save_session": True,
+    "input_task": True,
+    "output_task": True,
+}
 
 
 def custom_tracer(frame, event, arg):
+    try:
+        import os
+    except Exception:
+        return None
+
+    global log_file
+    if not log_file:
+        os.makedirs(".aider/logs/", exist_ok=True)
+        log_file = open(".aider/logs/debug.log", "w", buffering=1)
+
     # Get the absolute path of the file where the code is executing
     filename = os.path.abspath(frame.f_code.co_filename)
 
@@ -556,7 +587,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     except AttributeError as e:
         if all(word in str(e) for word in ["bool", "object", "has", "no", "attribute", "strip"]):
             if check_config_files_for_yes(default_config_files):
-                return 1
+                return await graceful_exit(None, 1)
         raise e
 
     if args.verbose:
@@ -588,7 +619,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         # Ensure parser.prog is set for shtab, though it should be by default
         parser.prog = "aider"
         print(shtab.complete(parser, shell=args.shell_completions))
-        sys.exit(0)
+        return await graceful_exit(None, 0)
 
     if git is None:
         args.git = False
@@ -677,7 +708,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             except ValueError:
                 io.tool_error(f"Invalid --set-env format: {env_setting}")
                 io.tool_output("Format should be: ENV_VAR_NAME=value")
-                return 1
+                return await graceful_exit(None, 1)
 
     # Process any API keys set via --api-key
     if args.api_key:
@@ -689,7 +720,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             except ValueError:
                 io.tool_error(f"Invalid --api-key format: {api_setting}")
                 io.tool_output("Format should be: provider=key")
-                return 1
+                return await graceful_exit(None, 1)
 
     if args.anthropic_api_key:
         os.environ["ANTHROPIC_API_KEY"] = args.anthropic_api_key
@@ -747,11 +778,11 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     if args.gui and not return_coder:
         if not await check_streamlit_install(io):
             analytics.event("exit", reason="Streamlit not installed")
-            return
+            return await graceful_exit(None)
         analytics.event("gui session")
         launch_gui(argv)
         analytics.event("exit", reason="GUI session ended")
-        return
+        return await graceful_exit(None)
 
     if args.verbose:
         for fname in loaded_dotenvs:
@@ -784,7 +815,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
                 "Provide either a single directory of a git repo, or a list of one or more files."
             )
             analytics.event("exit", reason="Invalid directory input")
-            return 1
+            return await graceful_exit(None, 1)
 
     git_dname = None
     if len(all_files) == 1:
@@ -795,7 +826,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             else:
                 io.tool_error(f"{all_files[0]} is a directory, but --no-git selected.")
                 analytics.event("exit", reason="Directory with --no-git")
-                return 1
+                return await graceful_exit(None, 1)
 
     # We can't know the git repo for sure until after parsing the args.
     # If we guessed wrong, reparse because that changes things like
@@ -809,17 +840,17 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     if args.just_check_update:
         update_available = await check_version(io, just_check=True, verbose=args.verbose)
         analytics.event("exit", reason="Just checking update")
-        return 0 if not update_available else 1
+        return await graceful_exit(None, 0 if not update_available else 1)
 
     if args.install_main_branch:
         success = await install_from_main_branch(io)
         analytics.event("exit", reason="Installed main branch")
-        return 0 if success else 1
+        return await graceful_exit(None, 0 if success else 1)
 
     if args.upgrade:
         success = await install_upgrade(io)
         analytics.event("exit", reason="Upgrade completed")
-        return 0 if success else 1
+        return await graceful_exit(None, 0 if success else 1)
 
     if args.check_update:
         await check_version(io, verbose=args.verbose)
@@ -841,7 +872,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     if args.list_models:
         models.print_matching_models(io, args.list_models)
         analytics.event("exit", reason="Listed models")
-        return 0
+        return await graceful_exit(None)
 
     # Process any command line aliases
     if args.alias:
@@ -852,7 +883,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
                 io.tool_error(f"Invalid alias format: {alias_def}")
                 io.tool_output("Format should be: alias:model-name")
                 analytics.event("exit", reason="Invalid alias format error")
-                return 1
+                return await graceful_exit(None, 1)
             alias, model = parts
             models.MODEL_ALIASES[alias.strip()] = model.strip()
 
@@ -861,7 +892,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         # Error message and analytics event are handled within select_default_model
         # It might have already offered OAuth if no model/keys were found.
         # If it failed here, we exit.
-        return 1
+        return await graceful_exit(None, 1)
     args.model = selected_model_name  # Update args with the selected model
 
     # Check if an OpenRouter model was selected/specified but the key is missing
@@ -888,7 +919,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
                     "exit",
                     reason="OpenRouter key missing after successful OAuth for specified model",
                 )
-                return 1
+                return await graceful_exit(None, 1)
         else:
             # OAuth failed or was declined by the user
             io.tool_error(
@@ -901,7 +932,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
                 "exit",
                 reason="OpenRouter key missing for specified model and OAuth failed/declined",
             )
-            return 1
+            return await graceful_exit(None, 1)
 
     main_model = models.Model(
         args.model,
@@ -969,7 +1000,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     lint_cmds = parse_lint_cmds(args.lint_cmd, io)
     if lint_cmds is None:
         analytics.event("exit", reason="Invalid lint command format")
-        return 1
+        return await graceful_exit(None, 1)
 
     repo = None
     if args.git:
@@ -995,7 +1026,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
     if not args.skip_sanity_check_repo:
         if not await sanity_check_repo(repo, io):
             analytics.event("exit", reason="Repository sanity check failed")
-            return 1
+            return await graceful_exit(None, 1)
 
     if repo and not args.skip_sanity_check_repo:
         num_files = len(repo.get_tracked_files())
@@ -1116,7 +1147,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
                     io.tool_output()
                 except KeyboardInterrupt:
                     analytics.event("exit", reason="Keyboard interrupt during model warnings")
-                    return 1
+                    return await graceful_exit(coder, 1)
 
         if args.git:
             git_root = await setup_git(git_root, io)
@@ -1129,11 +1160,12 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             urls.edit_formats, "Open documentation about edit formats?", acknowledge=True
         )
         analytics.event("exit", reason="Unknown edit format")
-        return 1
+        return await graceful_exit(None, 1)
+
     except ValueError as err:
         io.tool_error(str(err))
         analytics.event("exit", reason="ValueError during coder creation")
-        return 1
+        return await graceful_exit(None, 1)
 
     if return_coder:
         analytics.event("exit", reason="Returning coder object")
@@ -1166,7 +1198,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         messages = coder.format_messages().all_messages()
         utils.show_messages(messages)
         analytics.event("exit", reason="Showed prompts")
-        return
+        return await graceful_exit(coder)
 
     if args.lint:
         await coder.commands.cmd_lint(fnames=fnames)
@@ -1175,7 +1207,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         if not args.test_cmd:
             io.tool_error("No --test-cmd provided.")
             analytics.event("exit", reason="No test command provided")
-            return 1
+            return await graceful_exit(coder, 1)
         await coder.commands.cmd_test(args.test_cmd)
         if io.placeholder:
             await coder.run(io.placeholder)
@@ -1188,27 +1220,27 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
 
     if args.lint or args.test or args.commit:
         analytics.event("exit", reason="Completed lint/test/commit")
-        return
+        return await graceful_exit(coder)
 
     if args.show_repo_map:
         repo_map = coder.get_repo_map()
         if repo_map:
             io.tool_output(repo_map)
         analytics.event("exit", reason="Showed repo map")
-        return
+        return await graceful_exit(coder)
 
     if args.apply:
         content = io.read_text(args.apply)
         if content is None:
             analytics.event("exit", reason="Failed to read apply content")
-            return
+            return await graceful_exit(coder)
         coder.partial_response_content = content
         # For testing #2879
         # from aider.coders.base_coder import all_fences
         # coder.fence = all_fences[1]
         await coder.apply_updates()
         analytics.event("exit", reason="Applied updates")
-        return
+        return await graceful_exit(coder)
 
     if args.apply_clipboard_edits:
         args.edit_format = main_model.editor_edit_format
@@ -1250,7 +1282,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         except (SwitchCoder, KeyboardInterrupt, SystemExit):
             pass
         analytics.event("exit", reason="Completed --message")
-        return
+        return await graceful_exit(coder)
 
     if args.message_file:
         try:
@@ -1262,18 +1294,18 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
         except FileNotFoundError:
             io.tool_error(f"Message file not found: {args.message_file}")
             analytics.event("exit", reason="Message file not found")
-            return 1
+            return await graceful_exit(coder, 1)
         except IOError as e:
             io.tool_error(f"Error reading message file: {e}")
             analytics.event("exit", reason="Message file IO error")
-            return 1
+            return await graceful_exit(coder, 1)
 
         analytics.event("exit", reason="Completed --message-file")
-        return
+        return await graceful_exit(coder)
 
     if args.exit:
         analytics.event("exit", reason="Exit flag set")
-        return
+        return await graceful_exit(coder)
 
     analytics.event("cli session", main_model=main_model, edit_format=main_model.edit_format)
 
@@ -1293,7 +1325,7 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
             coder.ok_to_warm_cache = bool(args.cache_keepalive_pings)
             await coder.run()
             analytics.event("exit", reason="Completed main CLI coder.run")
-            return
+            return await graceful_exit(coder)
         except SwitchCoder as switch:
             coder.ok_to_warm_cache = False
 
@@ -1316,7 +1348,8 @@ async def main_async(argv=None, input=None, output=None, force_git_root=None, re
                 coder.suppress_announcements_for_next_prompt = True
         except SystemExit:
             analytics.event("exit", reason="/exit command")
-            return
+            sys.settrace(None)
+            return await graceful_exit(coder)
 
 
 def is_first_run_of_new_version(io, verbose=False):
@@ -1410,6 +1443,24 @@ def load_slow_imports(swallow=True):
             raise e
 
 
+async def graceful_exit(coder=None, exit_code=0):
+    sys.settrace(None)
+
+    if coder:
+        if hasattr(coder, "_autosave_future"):
+            await coder._autosave_future
+
+        for server in coder.mcp_servers:
+            try:
+                await server.exit_stack.aclose()
+            except Exception:
+                pass
+
+    # Commenting since this can sometimes case hanging
+    # await asyncio.sleep(0.5)
+    return exit_code
+
+
 if __name__ == "__main__":
     status = main()
     sys.exit(status)

aider/models.py

@@ -12,15 +12,15 @@ from dataclasses import dataclass, fields
 from pathlib import Path
 from typing import Optional, Union
 
-import json5
 import yaml
 from PIL import Image
 
 from aider import __version__
 from aider.dump import dump  # noqa: F401
+from aider.helpers.requests import model_request_parser
 from aider.llm import litellm
 from aider.openrouter import OpenRouterModelManager
-from aider.sendchat import ensure_alternating_roles, sanity_check_messages
+from aider.sendchat import sanity_check_messages
 from aider.utils import check_pip_install_extra
 
 RETRY_TIMEOUT = 60
@@ -98,7 +98,8 @@ MODEL_ALIASES = {
     "quasar": "openrouter/openrouter/quasar-alpha",
     "r1": "deepseek/deepseek-reasoner",
     "gemini-2.5-pro": "gemini/gemini-2.5-pro",
-    "gemini": "gemini/gemini-2.5-pro",
+    "gemini-3-pro-preview": "gemini/gemini-3-pro-preview",
+    "gemini": "gemini/gemini-3-pro-preview",
     "gemini-exp": "gemini/gemini-2.5-pro-exp-03-25",
     "grok3": "xai/grok-3-beta",
     "optimus": "openrouter/openrouter/optimus-alpha",
@@ -438,7 +439,7 @@ class Model(ModelSettings):
             return  # <--
 
         last_segment = model.split("/")[-1]
-        if last_segment in ("gpt-5", "gpt-5-2025-08-07"):
+        if last_segment in ("gpt-5", "gpt-5-2025-08-07") or "gpt-5.1" in model:
             self.use_temperature = False
             self.edit_format = "diff"
             if "reasoning_effort" not in self.accepts_settings:
@@ -909,7 +910,7 @@ class Model(ModelSettings):
         if os.environ.get("AIDER_SANITY_CHECK_TURNS"):
             sanity_check_messages(messages)
 
-        messages = ensure_alternating_roles(messages)
+        messages = model_request_parser(self, messages)
 
         if self.verbose:
             for message in messages:
@@ -976,6 +977,14 @@ class Model(ModelSettings):
             dump(kwargs)
         kwargs["messages"] = messages
 
+        # Cache System Prompts When Possible
+        kwargs["cache_control_injection_points"] = [
+            {
+                "location": "message",
+                "role": "system",
+            },
+        ]
+
         # Are we using github copilot?
         if "GITHUB_COPILOT_TOKEN" in os.environ or self.name.startswith("github_copilot/"):
             if "extra_headers" not in kwargs:
@@ -1000,8 +1009,7 @@ class Model(ModelSettings):
         from aider.exceptions import LiteLLMExceptions
 
         litellm_ex = LiteLLMExceptions()
-        if "deepseek-reasoner" in self.name:
-            messages = ensure_alternating_roles(messages)
+        messages = model_request_parser(self, messages)
         retry_delay = 0.125
 
         if self.verbose:
@@ -1094,7 +1102,7 @@ def register_litellm_models(model_fnames):
             data = Path(model_fname).read_text()
             if not data.strip():
                 continue
-            model_def = json5.loads(data)
+            model_def = json.loads(data)
             if not model_def:
                 continue
 

aider/queries/tree-sitter-language-pack/c-tags.scm

@@ -7,3 +7,6 @@
 (type_definition declarator: (type_identifier) @name.definition.type) @definition.type
 
 (enum_specifier name: (type_identifier) @name.definition.type) @definition.type
+
+(preproc_include
+  path: (_) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/clojure-tags.scm

@@ -5,3 +5,8 @@
   (#match? @ignore "^def.*"))
 
 (sym_lit name: (sym_name) @name.reference.call)
+
+(list_lit
+ . (sym_lit name: (sym_name) @import_call)
+ . (sym_lit name: (sym_name) @name.reference.import)
+ (#match? @import_call "^(require|use)$")) @reference.import

aider/queries/tree-sitter-language-pack/commonlisp-tags.scm

@@ -78,6 +78,11 @@
 ;; first element
 (list_lit . [(sym_lit) (package_lit)] @name.reference.call) @reference.call
 
+(list_lit
+  . (sym_lit) @import_call
+  . (sym_lit) @name.reference.import
+  (#match? @import_call "^(require|load)$")) @reference.import
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;; classes
 

aider/queries/tree-sitter-language-pack/cpp-tags.scm

@@ -13,3 +13,6 @@
 (enum_specifier name: (type_identifier) @name.definition.type) @definition.type
 
 (class_specifier name: (type_identifier) @name.definition.class) @definition.class
+
+(preproc_include
+  path: (_) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/csharp-tags.scm

@@ -24,3 +24,9 @@
 (namespace_declaration name: (identifier) @name.definition.module) @definition.module
 
 (namespace_declaration name: (identifier) @name.definition.module) @module
+
+(using_directive
+  (qualified_name) @name.reference.import) @reference.import
+
+(using_directive
+  (identifier) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/dart-tags.scm

@@ -90,3 +90,8 @@
 		(arguments
 		  (argument)*))?)?) @reference.call
 
+(import_or_export
+  (library_import
+    (import_specification
+      (configurable_uri
+        (uri (string_literal) @name.reference.import))))) @reference.import

aider/queries/tree-sitter-language-pack/elixir-tags.scm

@@ -52,3 +52,8 @@
 
 ; * modules
 (alias) @name.reference.module @reference.module
+
+(call
+  target: (identifier) @import_call
+  (arguments (alias) @name.reference.import)
+  (#any-of? @import_call "alias" "import" "require" "use")) @reference.import

aider/queries/tree-sitter-language-pack/elm-tags.scm

@@ -17,3 +17,6 @@
 (module_declaration 
     (upper_case_qid (upper_case_identifier)) @name.definition.module
 ) @definition.module
+
+(import_clause
+  (upper_case_qid) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/go-tags.scm

@@ -40,3 +40,10 @@
 (var_declaration (var_spec name: (identifier) @name.definition.variable))
 
 (const_declaration (const_spec name: (identifier) @name.definition.constant))
+
+(import_spec
+  path: [
+    (interpreted_string_literal)
+    (raw_string_literal)
+  ] @name.reference.import) @reference.import
+

aider/queries/tree-sitter-language-pack/java-tags.scm

@@ -18,3 +18,9 @@
   type: (type_identifier) @name.reference.class) @reference.class
 
 (superclass (type_identifier) @name.reference.class) @reference.class
+
+(import_declaration
+  (scoped_identifier) @name.reference.import) @reference.import
+
+(import_declaration
+  (identifier) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/javascript-tags.scm

@@ -86,3 +86,11 @@
 
 (new_expression
   constructor: (_) @name.reference.class) @reference.class
+
+(import_statement
+  source: (string (string_fragment) @name.reference.import)) @reference.import
+
+(call_expression
+  function: (identifier) @import_func
+  arguments: (arguments (string (string_fragment) @name.reference.import))
+  (#eq? @import_func "require")) @reference.import

aider/queries/tree-sitter-language-pack/lua-tags.scm

@@ -32,3 +32,8 @@
     (method_index_expression
       method: (identifier) @name.reference.method)
   ]) @reference.call
+
+(function_call
+  name: (identifier) @import_func
+  arguments: (arguments (string (string_content) @name.reference.import))
+  (#eq? @import_func "require")) @reference.import

aider/queries/tree-sitter-language-pack/ocaml_interface-tags.scm

@@ -96,3 +96,6 @@
   ) @definition.function
   (#strip! @doc "^\\(\\*+\\s*|\\s*\\*+\\)$")
 )
+
+(open_module
+  (module_path) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/python-tags.scm

@@ -12,3 +12,13 @@
       (attribute
         attribute: (identifier) @name.reference.call)
   ]) @reference.call
+
+(import_statement
+  name: (dotted_name) @name.reference.import) @reference.import
+
+(import_statement
+  name: (aliased_import
+    name: (dotted_name) @name.reference.import)) @reference.import
+
+(import_from_statement
+  module_name: (dotted_name) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/r-tags.scm

@@ -19,3 +19,9 @@
         rhs: (identifier) @name.reference.call
     )
 ) @reference.call
+
+(call
+    function: (identifier) @import_call
+    arguments: (arguments (identifier) @name.reference.import)
+    (#match? @import_call "^(library|require)$")
+) @reference.import

aider/queries/tree-sitter-language-pack/ruby-tags.scm

@@ -62,3 +62,8 @@
   (#is-not? local)
   (#not-match? @name.reference.call "^(lambda|load|require|require_relative|__FILE__|__LINE__)$")
 )
+
+(call
+  method: (identifier) @import_method
+  arguments: (argument_list (string (string_content) @name.reference.import))
+  (#match? @import_method "^(require|require_relative|load)$")) @reference.import

aider/queries/tree-sitter-language-pack/rust-tags.scm

@@ -58,3 +58,6 @@
 (impl_item
     type: (type_identifier) @name.reference.implementation
     !trait) @reference.implementation
+
+(use_declaration
+    argument: (_) @name.reference.import) @reference.import

aider/queries/tree-sitter-language-pack/solidity-tags.scm

@@ -40,4 +40,4 @@
 
 ;; Imports ( note that unknown is not standardised )
 (import_directive
-  import_name: (_) @name.reference.module ) @reference.unknown
+  import_name: (_) @name.reference.import ) @reference.import

aider/queries/tree-sitter-language-pack/swift-tags.scm

@@ -48,4 +48,7 @@
 ) @definition.property
 
 (function_declaration
-    name: (simple_identifier) @name.definition.function) @definition.function
+  name: (simple_identifier) @name.definition.function) @definition.function
+
+(import_declaration
+    "import" @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/c-tags.scm

@@ -7,3 +7,6 @@
 (type_definition declarator: (type_identifier) @name.definition.type) @definition.type
 
 (enum_specifier name: (type_identifier) @name.definition.type) @definition.type
+
+(preproc_include
+  path: (_) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/c_sharp-tags.scm

@@ -44,3 +44,9 @@
 (namespace_declaration
  name: (identifier) @name.definition.module
 ) @definition.module
+
+(using_directive
+  (qualified_name) @name.reference.import) @reference.import
+
+(using_directive
+  (identifier) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/cpp-tags.scm

@@ -13,3 +13,6 @@
 (enum_specifier name: (type_identifier) @name.definition.type) @definition.type
 
 (class_specifier name: (type_identifier) @name.definition.class) @definition.class
+
+(preproc_include
+  path: (_) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/dart-tags.scm

@@ -88,4 +88,5 @@
 		(arguments
 		  (argument)*))?)?) @reference.call
 
-
+(import_or_export
+  (string_literal) @name.reference.import) @reference.import

aider/queries/tree-sitter-languages/elixir-tags.scm

@@ -52,3 +52,8 @@
 
 ; * modules
 (alias) @name.reference.module @reference.module
+
+(call
+  target: (identifier) @import_call
+  (arguments (alias) @name.reference.import)
+  (#match? @import_call "^(alias|import|require|use)$")) @reference.import