+
+
+
+Aider lets you pair program with LLMs to start a new project or build on your existing codebase. +
-
+Aider works best with Claude 3.7 Sonnet, DeepSeek R1 & Chat V3, OpenAI o1, o3-mini & GPT-4o, but can connect to almost any LLM, including local models.
+
+
+Aider makes a map of your entire codebase, which helps it work well in larger projects.
+
+
+Aider works with most popular programming languages: python, javascript, rust, ruby, go, cpp, php, html, css, and dozens more.
+
+
+Aider automatically commits changes with sensible commit messages. Use familiar git tools to easily diff, manage and undo AI changes.
+
+
+Use aider from within your favorite IDE or editor. Ask for changes by adding comments to your code and aider will get to work.
+
+
+Add images and web pages to the chat to provide visual context, screenshots, reference docs, etc.
+
+
+Speak with aider about your code! Request new features, test cases or bug fixes using your voice and let aider implement the changes.
+
+
+Automatically lint and test your code every time aider makes changes. Aider can fix problems detected by your linters and test suites.
+
+
+Work with any LLM via its web chat interface. Aider streamlines copy/pasting code context and edits back and forth with a browser.
+
+## Getting Started
```bash
python -m pip install aider-install
aider-install
-# Change directory into your code base
+# Change directory into your codebase
cd /to/your/project
-# Work with DeepSeek via DeepSeek's API
-aider --model deepseek --api-key deepseek=your-key-goes-here
+# DeepSeek
+aider --model deepseek --api-key deepseek=Aider has received the authentication code. " + b"You can close this browser tab.
" + ) + # Signal the main thread to shut down the server + # Signal the main thread to shut down the server + shutdown_server.set() + else: + # Redirect to aider website if 'code' is missing (e.g., user visited manually) + self.send_response(302) # Found (temporary redirect) + self.send_header("Location", urls.website) + self.end_headers() + # No need to set server_error, just redirect. + # Do NOT shut down the server here; wait for timeout or success. + else: + # Redirect anything else (e.g., favicon.ico) to the main website as well + self.send_response(302) + self.send_header("Location", urls.website) + self.end_headers() + self.wfile.write(b"Not Found") + + def log_message(self, format, *args): + # Suppress server logging to keep terminal clean + pass + + def run_server(): + nonlocal server_error + try: + with socketserver.TCPServer(("localhost", port), OAuthCallbackHandler) as httpd: + io.tool_output(f"Temporary server listening on {callback_url}", log_only=True) + server_started.set() # Signal that the server is ready + # Wait until shutdown is requested or timeout occurs (handled by main thread) + while not shutdown_server.is_set(): + httpd.handle_request() # Handle one request at a time + # Add a small sleep to prevent busy-waiting if needed, + # though handle_request should block appropriately. + time.sleep(0.1) + io.tool_output("Shutting down temporary server.", log_only=True) + except Exception as e: + server_error = f"Failed to start or run temporary server: {e}" + server_started.set() # Signal even if failed, error will be checked + shutdown_server.set() # Ensure shutdown logic proceeds + + server_thread = threading.Thread(target=run_server, daemon=True) + server_thread.start() + + # Wait briefly for the server to start, or for an error + if not server_started.wait(timeout=5): + io.tool_error("Temporary authentication server failed to start in time.") + shutdown_server.set() # Ensure thread exits if it eventually starts + server_thread.join(timeout=1) + return None + + # Check if server failed during startup + if server_error: + io.tool_error(server_error) + shutdown_server.set() # Ensure thread exits + server_thread.join(timeout=1) + return None + + # Generate codes and URL + code_verifier, code_challenge = generate_pkce_codes() + auth_url_base = "https://openrouter.ai/auth" + auth_params = { + "callback_url": callback_url, + "code_challenge": code_challenge, + "code_challenge_method": "S256", + } + auth_url = f"{auth_url_base}?{'&'.join(f'{k}={v}' for k, v in auth_params.items())}" + + io.tool_output("\nPlease open this URL in your browser to connect Aider with OpenRouter:") + io.tool_output() + print(auth_url) + + MINUTES = 5 + io.tool_output(f"\nWaiting up to {MINUTES} minutes for you to finish in the browser...") + io.tool_output("Use Control-C to interrupt.") + + try: + webbrowser.open(auth_url) + except Exception: + pass + + # Wait for the callback to set the auth_code or for timeout/error + interrupted = False + try: + shutdown_server.wait(timeout=MINUTES * 60) # Convert minutes to seconds + except KeyboardInterrupt: + io.tool_warning("\nOAuth flow interrupted.") + analytics.event("oauth_flow_failed", provider="openrouter", reason="user_interrupt") + interrupted = True + # Ensure the server thread is signaled to shut down + shutdown_server.set() + + # Join the server thread to ensure it's cleaned up + server_thread.join(timeout=1) + + if interrupted: + return None # Return None if interrupted by user + + if server_error: + io.tool_error(f"Authentication failed: {server_error}") + analytics.event("oauth_flow_failed", provider="openrouter", reason=server_error) + return None + + if not auth_code: + io.tool_error("Authentication with OpenRouter failed.") + analytics.event("oauth_flow_failed", provider="openrouter") + return None + + io.tool_output("Completing authentication...") + analytics.event("oauth_flow_code_received", provider="openrouter") + + # Exchange code for key + api_key = exchange_code_for_key(auth_code, code_verifier, io) + + if api_key: + # Set env var for the current session immediately + os.environ["OPENROUTER_API_KEY"] = api_key + + # Save the key to the oauth-keys.env file + try: + config_dir = os.path.expanduser("~/.aider") + os.makedirs(config_dir, exist_ok=True) + key_file = os.path.join(config_dir, "oauth-keys.env") + with open(key_file, "a", encoding="utf-8") as f: + f.write(f'OPENROUTER_API_KEY="{api_key}"\n') + + io.tool_warning("Aider will load the OpenRouter key automatically in future sessions.") + io.tool_output() + + analytics.event("oauth_flow_success", provider="openrouter") + return api_key + except Exception as e: + io.tool_error(f"Successfully obtained key, but failed to save it to file: {e}") + io.tool_warning("Set OPENROUTER_API_KEY environment variable for this session only.") + # Still return the key for the current session even if saving failed + analytics.event("oauth_flow_save_failed", provider="openrouter", reason=str(e)) + return api_key + else: + io.tool_error("Authentication with OpenRouter failed.") + analytics.event("oauth_flow_failed", provider="openrouter", reason="code_exchange_failed") + return None + + +# Dummy Analytics class for testing +class DummyAnalytics: + def event(self, *args, **kwargs): + # print(f"Analytics Event: {args} {kwargs}") # Optional: print events + pass + + +def main(): + """Main function to test the OpenRouter OAuth flow.""" + print("Starting OpenRouter OAuth flow test...") + + # Use a real IO object for interaction + io = InputOutput( + pretty=True, + yes=False, + input_history_file=None, + chat_history_file=None, + tool_output_color="BLUE", + tool_error_color="RED", + ) + # Use a dummy analytics object + analytics = DummyAnalytics() + + # Ensure OPENROUTER_API_KEY is not set, to trigger the flow naturally + # (though start_openrouter_oauth_flow doesn't check this itself) + if "OPENROUTER_API_KEY" in os.environ: + print("Warning: OPENROUTER_API_KEY is already set in environment.") + # del os.environ["OPENROUTER_API_KEY"] # Optionally unset it for testing + + api_key = start_openrouter_oauth_flow(io, analytics) + + if api_key: + print("\nOAuth flow completed successfully!") + print(f"Obtained API Key (first 5 chars): {api_key[:5]}...") + # Be careful printing the key, even partially + else: + print("\nOAuth flow failed or was cancelled.") + + print("\nOpenRouter OAuth flow test finished.") + + +if __name__ == "__main__": + main() diff --git a/aider/queries/tree-sitter-language-pack/README.md b/aider/queries/tree-sitter-language-pack/README.md new file mode 100644 index 000000000..4654865ef --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/README.md @@ -0,0 +1,7 @@ +These scm files are all adapted from the github repositories listed here: + +https://github.com/Goldziher/tree-sitter-language-pack/blob/main/sources/language_definitions.json + +See this URL for information on the licenses of each repo: + +https://github.com/Goldziher/tree-sitter-language-pack/ diff --git a/aider/queries/tree-sitter-language-pack/arduino-tags.scm b/aider/queries/tree-sitter-language-pack/arduino-tags.scm new file mode 100644 index 000000000..71cc3849f --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/arduino-tags.scm @@ -0,0 +1,5 @@ +(function_declarator + declarator: (identifier) @name.definition.function) @definition.function + +(call_expression + function: (identifier) @name.reference.call) @reference.call diff --git a/aider/queries/tree-sitter-language-pack/c-tags.scm b/aider/queries/tree-sitter-language-pack/c-tags.scm new file mode 100644 index 000000000..1035aa224 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/c-tags.scm @@ -0,0 +1,9 @@ +(struct_specifier name: (type_identifier) @name.definition.class body:(_)) @definition.class + +(declaration type: (union_specifier name: (type_identifier) @name.definition.class)) @definition.class + +(function_declarator declarator: (identifier) @name.definition.function) @definition.function + +(type_definition declarator: (type_identifier) @name.definition.type) @definition.type + +(enum_specifier name: (type_identifier) @name.definition.type) @definition.type diff --git a/aider/queries/tree-sitter-language-pack/chatito-tags.scm b/aider/queries/tree-sitter-language-pack/chatito-tags.scm new file mode 100644 index 000000000..6fbac9420 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/chatito-tags.scm @@ -0,0 +1,16 @@ +; Definitions +(intent_def + (intent) @name.definition.intent) @definition.intent + +(slot_def + (slot) @name.definition.slot) @definition.slot + +(alias_def + (alias) @name.definition.alias) @definition.alias + +; References +(slot_ref + (slot) @name.reference.slot) @reference.slot + +(alias_ref + (alias) @name.reference.alias) @reference.alias diff --git a/aider/queries/tree-sitter-language-pack/commonlisp-tags.scm b/aider/queries/tree-sitter-language-pack/commonlisp-tags.scm new file mode 100644 index 000000000..a47dfeeda --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/commonlisp-tags.scm @@ -0,0 +1,122 @@ +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; Function Definitions ;;;;;;;;;;;;;;;;;;;;;;; + +(defun_header + function_name: (sym_lit) @name.definition.function) @definition.function + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; Function Calls ;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Basically, we consider every list literal with symbol as the +;;; first element to be a call to a function named by that element. +;;; But we must exclude some cases. Note, tree-sitter @ignore +;;; cases only work if they are declared before the cases +;;; we want to include. + +;; Exclude lambda lists for function definitions +;; For example: +;; +;; (defun my-func (arg1 arg2) ...) +;; +;; do not treat (arg1 arg2) as a call of function arg1 +;; +(defun_header + lambda_list: (list_lit . [(sym_lit) (package_lit)] @ignore)) + +;; Similar to the above, but for +;; +;; (defmethod m ((type1 param1) (type2 param2)) ...) +;; +;; where list literals having symbol as their first element +;; are nested inside the lambda list. +(defun_header + lambda_list: (list_lit (list_lit . [(sym_lit) (package_lit)] @ignore))) + +;; +;; (let ((var ...) (var2 ...)) ...) +;; +;; - exclude var, var2 +;; - the same for let*, flet, labels, macrolet, symbol-macrolet +(list_lit . [(sym_lit) (package_lit)] @name.reference.call + . (list_lit (list_lit . [(sym_lit) (package_lit)] @ignore)) + (#match? @name.reference.call + "(?i)^(cl:)?(let|let\\*|flet|labels|macrolet|symbol-macrolet)$") + ) + +;; TODO: +;; - exclude also: +;; - (defclass name (parent parent2) +;; ((slot1 ...) +;; (slot2 ...)) +;; exclude the parent, slot1, slot2 +;; - (flet ((func-1 (param1 param2))) ...) +;; - we already exclude func-1, but param1 is still recognized +;; as a function call - exclude it too +;; - the same for labels +;; - the same macrolet +;; - what else? +;; (that's a non-goal to completely support all macros +;; and special operators, but every one we support +;; makes the solution a little bit better) +;; - (flet ((func-1 (param1 param2))) ...) +;; - instead of simply excluding it, as we do today, +;; tag func-1 as @local.definition.function (I suppose) +;; - the same for labels, macrolet +;; - @local.scope for let, let*, flet, labels, macrolet +;; - I guess the whole span of the scope text, +;; till the closing paren, should be tagged as @local.scope; +;; Hopefully, combined with @local.definition.function +;; within the scope, the usual @reference.call within +;; that scope will refer to the local definition, +;; and there will be no need to use @local.reference.call +;; (which is more difficult to implement). +;; - When implementing, remember the scope rules differences +;; of let vs let*, flet vs labels. + + +;; Include all other cases - list literal with symbol as the +;; first element +(list_lit . [(sym_lit) (package_lit)] @name.reference.call) @reference.call + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; classes + +(list_lit . [(sym_lit) (package_lit)] @ignore + . [(sym_lit) (package_lit)] @name.definition.class + (#match? @ignore "(?i)^(cl:)?defclass$") + ) @definition.class + +(list_lit . [(sym_lit) (package_lit)] @ignore + . (quoting_lit [(sym_lit) (package_lit)] @name.reference.class) + (#match? @ignore "(?i)^(cl:)?make-instance$") + ) @reference.class + +;;; TODO: +;; - @reference.class for base classes + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; TODO: +;; - Symbols referenced in defpackage +;; +;; (defpackage ... +;; (:export (symbol-a :symbol-b #:symbol-c "SYMBOL-D"))) +;; +;; The goal is to allow quick navigation from the API +;; overview in the form of defpackage, to the definition +;; where user can read parameters, docstring, etc. +;; - The @name must not include the colon, or sharpsign colon, quotes, +;; just symbol-a, symbol-b, symbol-c, sybmol-d +;; - Downcase the names specified as string literals? +;; ("SYMBOL-D" -> symbol-d) +;; - We don't know if the exported symbol is a function, variable, +;; class or something else. The official doc +;; (https://tree-sitter.github.io/tree-sitter/code-navigation-systems) +;; does not even suggest a tag for variable reference. +;; (Although in practice, the `tree-sitter tags` command +;; allows any @reference.* and @definition.* tags) +;; Probably it's better to just use @reference.call for all +;; the symbols in the :export clause. +;; +;; - The same for the export function call: +;; +;; (export '(symbol-a :symbol-b #:symbol-c "SYMBOL-D")) diff --git a/aider/queries/tree-sitter-language-pack/cpp-tags.scm b/aider/queries/tree-sitter-language-pack/cpp-tags.scm new file mode 100644 index 000000000..00cc96637 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/cpp-tags.scm @@ -0,0 +1,15 @@ +(struct_specifier name: (type_identifier) @name.definition.class body:(_)) @definition.class + +(declaration type: (union_specifier name: (type_identifier) @name.definition.class)) @definition.class + +(function_declarator declarator: (identifier) @name.definition.function) @definition.function + +(function_declarator declarator: (field_identifier) @name.definition.function) @definition.function + +(function_declarator declarator: (qualified_identifier scope: (namespace_identifier) @local.scope name: (identifier) @name.definition.method)) @definition.method + +(type_definition declarator: (type_identifier) @name.definition.type) @definition.type + +(enum_specifier name: (type_identifier) @name.definition.type) @definition.type + +(class_specifier name: (type_identifier) @name.definition.class) @definition.class diff --git a/aider/queries/tree-sitter-language-pack/d-tags.scm b/aider/queries/tree-sitter-language-pack/d-tags.scm new file mode 100644 index 000000000..7572cc4a6 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/d-tags.scm @@ -0,0 +1,26 @@ +(module_def (module_declaration (module_fqn) @name.definition.module)) @definition.module + +(struct_declaration (struct) . (identifier) @name.definition.class) @definition.class +(interface_declaration (interface) . (identifier) @name.definition.interface) @definition.interface +(enum_declaration (enum) . (identifier) @name.definition.type) @definition.type + +(class_declaration (class) . (identifier) @name.definition.class) @definition.class +(constructor (this) @name.definition.method) @definition.method +(destructor (this) @name.definition.method) @definition.method +(postblit (this) @name.definition.method) @definition.method + +(manifest_declarator . (identifier) @name.definition.type) @definition.type + +(function_declaration (identifier) @name.definition.function) @definition.function + +(union_declaration (union) . (identifier) @name.definition.type) @definition.type + +(anonymous_enum_declaration (enum_member . (identifier) @name.definition.constant)) @definition.constant + +(enum_declaration (enum_member . (identifier) @name.definition.constant)) @definition.constant + +(call_expression (identifier) @name.reference.call) @reference.call +(call_expression (type (template_instance (identifier) @name.reference.call))) @reference.call +(parameter (type (identifier) @name.reference.class) @reference.class (identifier)) + +(variable_declaration (type (identifier) @name.reference.class) @reference.class (declarator)) diff --git a/aider/queries/tree-sitter-language-pack/dart-tags.scm b/aider/queries/tree-sitter-language-pack/dart-tags.scm new file mode 100644 index 000000000..a11fafcb1 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/dart-tags.scm @@ -0,0 +1,92 @@ + +(class_definition + name: (identifier) @name.definition.class) @definition.class + +(method_signature + (function_signature)) @definition.method + +(type_alias + (type_identifier) @name.definition.type) @definition.type + +(method_signature +(getter_signature + name: (identifier) @name.definition.method)) @definition.method + +(method_signature +(setter_signature + name: (identifier) @name.definition.method)) @definition.method + +(method_signature + (function_signature + name: (identifier) @name.definition.method)) @definition.method + +(method_signature + (factory_constructor_signature + (identifier) @name.definition.method)) @definition.method + +(method_signature + (constructor_signature + name: (identifier) @name.definition.method)) @definition.method + +(method_signature + (operator_signature)) @definition.method + +(method_signature) @definition.method + +(mixin_declaration + (mixin) + (identifier) @name.definition.mixin) @definition.mixin + +(extension_declaration + name: (identifier) @name.definition.extension) @definition.extension + + +(new_expression + (type_identifier) @name.reference.class) @reference.class + +(enum_declaration + name: (identifier) @name.definition.enum) @definition.enum + +(function_signature + name: (identifier) @name.definition.function) @definition.function + +(initialized_variable_definition + name: (identifier) + value: (identifier) @name.reference.class + value: (selector + "!"? + (argument_part + (arguments + (argument)*))?)?) @reference.class + +(assignment_expression + left: (assignable_expression + (identifier) + (unconditional_assignable_selector + "." + (identifier) @name.reference.send))) @reference.call + +(assignment_expression + left: (assignable_expression + (identifier) + (conditional_assignable_selector + "?." + (identifier) @name.reference.send))) @reference.call + +((identifier) @name.reference.send + (selector + "!"? + (conditional_assignable_selector + "?." (identifier) @name.reference.send)? + (unconditional_assignable_selector + "."? (identifier) @name.reference.send)? + (argument_part + (arguments + (argument)*))?)* + (cascade_section + (cascade_selector + (identifier)) @name.reference.send + (argument_part + (arguments + (argument)*))?)?) @reference.call + diff --git a/aider/queries/tree-sitter-language-pack/elisp-tags.scm b/aider/queries/tree-sitter-language-pack/elisp-tags.scm new file mode 100644 index 000000000..81e50d8e0 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/elisp-tags.scm @@ -0,0 +1,5 @@ +;; defun/defsubst +(function_definition name: (symbol) @name.definition.function) @definition.function + +;; Treat macros as function definitions for the sake of TAGS. +(macro_definition name: (symbol) @name.definition.function) @definition.function diff --git a/aider/queries/tree-sitter-language-pack/elixir-tags.scm b/aider/queries/tree-sitter-language-pack/elixir-tags.scm new file mode 100644 index 000000000..e0a351e32 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/elixir-tags.scm @@ -0,0 +1,54 @@ +; Definitions + +; * modules and protocols +(call + target: (identifier) @ignore + (arguments (alias) @name.definition.module) + (#any-of? @ignore "defmodule" "defprotocol")) @definition.module + +; * functions/macros +(call + target: (identifier) @ignore + (arguments + [ + ; zero-arity functions with no parentheses + (identifier) @name.definition.function + ; regular function clause + (call target: (identifier) @name.definition.function) + ; function clause with a guard clause + (binary_operator + left: (call target: (identifier) @name.definition.function) + operator: "when") + ]) + (#any-of? @ignore "def" "defp" "defdelegate" "defguard" "defguardp" "defmacro" "defmacrop" "defn" "defnp")) @definition.function + +; References + +; ignore calls to kernel/special-forms keywords +(call + target: (identifier) @ignore + (#any-of? @ignore "def" "defp" "defdelegate" "defguard" "defguardp" "defmacro" "defmacrop" "defn" "defnp" "defmodule" "defprotocol" "defimpl" "defstruct" "defexception" "defoverridable" "alias" "case" "cond" "else" "for" "if" "import" "quote" "raise" "receive" "require" "reraise" "super" "throw" "try" "unless" "unquote" "unquote_splicing" "use" "with")) + +; ignore module attributes +(unary_operator + operator: "@" + operand: (call + target: (identifier) @ignore)) + +; * function call +(call + target: [ + ; local + (identifier) @name.reference.call + ; remote + (dot + right: (identifier) @name.reference.call) + ]) @reference.call + +; * pipe into function call +(binary_operator + operator: "|>" + right: (identifier) @name.reference.call) @reference.call + +; * modules +(alias) @name.reference.module @reference.module diff --git a/aider/queries/tree-sitter-language-pack/elm-tags.scm b/aider/queries/tree-sitter-language-pack/elm-tags.scm new file mode 100644 index 000000000..c2e042763 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/elm-tags.scm @@ -0,0 +1,19 @@ +(value_declaration (function_declaration_left (lower_case_identifier) @name.definition.function)) @definition.function + +(function_call_expr (value_expr (value_qid) @name.reference.function)) @reference.function +(exposed_value (lower_case_identifier) @name.reference.function) @reference.function +(type_annotation ((lower_case_identifier) @name.reference.function) (colon)) @reference.function + +(type_declaration ((upper_case_identifier) @name.definition.type) ) @definition.type + +(type_ref (upper_case_qid (upper_case_identifier) @name.reference.type)) @reference.type +(exposed_type (upper_case_identifier) @name.reference.type) @reference.type + +(type_declaration (union_variant (upper_case_identifier) @name.definition.union)) @definition.union + +(value_expr (upper_case_qid (upper_case_identifier) @name.reference.union)) @reference.union + + +(module_declaration + (upper_case_qid (upper_case_identifier)) @name.definition.module +) @definition.module diff --git a/aider/queries/tree-sitter-language-pack/gleam-tags.scm b/aider/queries/tree-sitter-language-pack/gleam-tags.scm new file mode 100644 index 000000000..b1b934c20 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/gleam-tags.scm @@ -0,0 +1,41 @@ +; Modules +(module) @name.reference.module @reference.module +(import alias: (identifier) @name.reference.module) @reference.module +(remote_type_identifier + module: (identifier) @name.reference.module) @reference.module +((field_access + record: (identifier) @name.reference.module) + (#is-not? local)) @reference.module + +; Functions +(function + name: (identifier) @name.definition.function) @definition.function +(external_function + name: (identifier) @name.definition.function) @definition.function +(unqualified_import (identifier) @name.reference.function) @reference.function +((function_call + function: (identifier) @name.reference.function) @reference.function + (#is-not? local)) +((field_access + record: (identifier) @ignore + field: (label) @name.reference.function) + (#is-not? local)) @reference.function +((binary_expression + operator: "|>" + right: (identifier) @name.reference.function) + (#is-not? local)) @reference.function + +; Types +(type_definition + (type_name + name: (type_identifier) @name.definition.type)) @definition.type +(type_definition + (data_constructors + (data_constructor + name: (constructor_name) @name.definition.constructor))) @definition.constructor +(external_type + (type_name + name: (type_identifier) @name.definition.type)) @definition.type + +(type_identifier) @name.reference.type @reference.type +(constructor_name) @name.reference.constructor @reference.constructor diff --git a/aider/queries/tree-sitter-language-pack/go-tags.scm b/aider/queries/tree-sitter-language-pack/go-tags.scm new file mode 100644 index 000000000..16ecc4de8 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/go-tags.scm @@ -0,0 +1,42 @@ +( + (comment)* @doc + . + (function_declaration + name: (identifier) @name.definition.function) @definition.function + (#strip! @doc "^//\\s*") + (#set-adjacent! @doc @definition.function) +) + +( + (comment)* @doc + . + (method_declaration + name: (field_identifier) @name.definition.method) @definition.method + (#strip! @doc "^//\\s*") + (#set-adjacent! @doc @definition.method) +) + +(call_expression + function: [ + (identifier) @name.reference.call + (parenthesized_expression (identifier) @name.reference.call) + (selector_expression field: (field_identifier) @name.reference.call) + (parenthesized_expression (selector_expression field: (field_identifier) @name.reference.call)) + ]) @reference.call + +(type_spec + name: (type_identifier) @name.definition.type) @definition.type + +(type_identifier) @name.reference.type @reference.type + +(package_clause "package" (package_identifier) @name.definition.module) + +(type_declaration (type_spec name: (type_identifier) @name.definition.interface type: (interface_type))) + +(type_declaration (type_spec name: (type_identifier) @name.definition.class type: (struct_type))) + +(import_declaration (import_spec) @name.reference.module) + +(var_declaration (var_spec name: (identifier) @name.definition.variable)) + +(const_declaration (const_spec name: (identifier) @name.definition.constant)) diff --git a/aider/queries/tree-sitter-language-pack/java-tags.scm b/aider/queries/tree-sitter-language-pack/java-tags.scm new file mode 100644 index 000000000..ae4481e9e --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/java-tags.scm @@ -0,0 +1,20 @@ +(class_declaration + name: (identifier) @name.definition.class) @definition.class + +(method_declaration + name: (identifier) @name.definition.method) @definition.method + +(method_invocation + name: (identifier) @name.reference.method + arguments: (argument_list) @reference.call) + +(interface_declaration + name: (identifier) @name.definition.interface) @definition.interface + +(type_list + (type_identifier) @name.reference.interface) @reference.implementation + +(object_creation_expression + type: (type_identifier) @name.reference.class) @reference.class + +(superclass (type_identifier) @name.reference.class) @reference.class diff --git a/aider/queries/tree-sitter-language-pack/lua-tags.scm b/aider/queries/tree-sitter-language-pack/lua-tags.scm new file mode 100644 index 000000000..0910cf153 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/lua-tags.scm @@ -0,0 +1,34 @@ +(function_declaration + name: [ + (identifier) @name.definition.function + (dot_index_expression + field: (identifier) @name.definition.function) + ]) @definition.function + +(function_declaration + name: (method_index_expression + method: (identifier) @name.definition.method)) @definition.method + +(assignment_statement + (variable_list . + name: [ + (identifier) @name.definition.function + (dot_index_expression + field: (identifier) @name.definition.function) + ]) + (expression_list . + value: (function_definition))) @definition.function + +(table_constructor + (field + name: (identifier) @name.definition.function + value: (function_definition))) @definition.function + +(function_call + name: [ + (identifier) @name.reference.call + (dot_index_expression + field: (identifier) @name.reference.call) + (method_index_expression + method: (identifier) @name.reference.method) + ]) @reference.call diff --git a/aider/queries/tree-sitter-language-pack/pony-tags.scm b/aider/queries/tree-sitter-language-pack/pony-tags.scm new file mode 100644 index 000000000..695f628ea --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/pony-tags.scm @@ -0,0 +1,39 @@ +;Class definitions @definition.class +;Function definitions @definition.function +;Interface definitions @definition.interface +;Method definitions @definition.method +;Module definitions @definition.module +;Function/method calls @reference.call +;Class reference @reference.class +;Interface implementation @reference.implementation +( + (identifier) @reference.class + (#match? @reference.class "^_*[A-Z][a-zA-Z0-9_]*$") +) + +(class_definition (identifier) @name.definition.class) @definition.class +(actor_definition (identifier) @name.definition.class) @definition.class +(primitive_definition (identifier) @name.definition.class) @definition.class +(struct_definition (identifier) @name.definition.class) @definition.class +(type_alias (identifier) @name.definition.class) @definition.class + +(trait_definition (identifier) @name.definition.interface) @definition.interface +(interface_definition (identifier) @name.definition.interface) @definition.interface + +(constructor (identifier) @name.definition.method) @definition.method +(method (identifier) @name.definition.method) @definition.method +(behavior (identifier) @name.definition.method) @definition.method + +(class_definition (type) @name.reference.implementation) @reference.implementation +(actor_definition (type) @name.reference.implementation) @reference.implementation +(primitive_definition (type) @name.reference.implementation) @reference.implementation +(struct_definition (type) @name.reference.implementation) @reference.implementation +(type_alias (type) @name.reference.implementation) @reference.implementation + +; calls - not catching all possible call cases of callees for capturing the method name +(call_expression callee: [(identifier) (ffi_identifier)] @name.reference.call) @reference.call +(call_expression callee: (generic_expression [(identifier) (ffi_identifier)] @name.reference.call)) @reference.call +(call_expression callee: (member_expression (identifier) @name.reference.call .)) @reference.call +(call_expression callee: (member_expression (generic_expression [(identifier) (ffi_identifier)] @name.reference.call) .)) @reference.call +; TODO: add more possible callee expressions +(call_expression) @reference.call diff --git a/aider/queries/tree-sitter-language-pack/properties-tags.scm b/aider/queries/tree-sitter-language-pack/properties-tags.scm new file mode 100644 index 000000000..1d70c6a7f --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/properties-tags.scm @@ -0,0 +1,5 @@ +(property + (key) @name.definition.property) @definition.property + +(substitution + (key) @name.reference.property) @reference.property diff --git a/aider/queries/tree-sitter-language-pack/python-tags.scm b/aider/queries/tree-sitter-language-pack/python-tags.scm new file mode 100644 index 000000000..dab8b941d --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/python-tags.scm @@ -0,0 +1,14 @@ +(module (expression_statement (assignment left: (identifier) @name.definition.constant) @definition.constant)) + +(class_definition + name: (identifier) @name.definition.class) @definition.class + +(function_definition + name: (identifier) @name.definition.function) @definition.function + +(call + function: [ + (identifier) @name.reference.call + (attribute + attribute: (identifier) @name.reference.call) + ]) @reference.call diff --git a/aider/queries/tree-sitter-language-pack/r-tags.scm b/aider/queries/tree-sitter-language-pack/r-tags.scm new file mode 100644 index 000000000..5ffc72332 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/r-tags.scm @@ -0,0 +1,21 @@ +(binary_operator + lhs: (identifier) @name.definition.function + operator: "<-" + rhs: (function_definition) +) @definition.function + +(binary_operator + lhs: (identifier) @name.definition.function + operator: "=" + rhs: (function_definition) +) @definition.function + +(call + function: (identifier) @name.reference.call +) @reference.call + +(call + function: (namespace_operator + rhs: (identifier) @name.reference.call + ) +) @reference.call diff --git a/aider/queries/tree-sitter-language-pack/racket-tags.scm b/aider/queries/tree-sitter-language-pack/racket-tags.scm new file mode 100644 index 000000000..b3034026c --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/racket-tags.scm @@ -0,0 +1,12 @@ +(list + . + (symbol) @reference._define + (#match? @reference._define "^(define|define/contract)$") + . + (list + . + (symbol) @name.definition.function) @definition.function) + +(list + . + (symbol) @name.reference.call) diff --git a/aider/queries/tree-sitter-language-pack/ruby-tags.scm b/aider/queries/tree-sitter-language-pack/ruby-tags.scm new file mode 100644 index 000000000..79e71d2d6 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/ruby-tags.scm @@ -0,0 +1,64 @@ +; Method definitions + +( + (comment)* @doc + . + [ + (method + name: (_) @name.definition.method) @definition.method + (singleton_method + name: (_) @name.definition.method) @definition.method + ] + (#strip! @doc "^#\\s*") + (#select-adjacent! @doc @definition.method) +) + +(alias + name: (_) @name.definition.method) @definition.method + +(setter + (identifier) @ignore) + +; Class definitions + +( + (comment)* @doc + . + [ + (class + name: [ + (constant) @name.definition.class + (scope_resolution + name: (_) @name.definition.class) + ]) @definition.class + (singleton_class + value: [ + (constant) @name.definition.class + (scope_resolution + name: (_) @name.definition.class) + ]) @definition.class + ] + (#strip! @doc "^#\\s*") + (#select-adjacent! @doc @definition.class) +) + +; Module definitions + +( + (module + name: [ + (constant) @name.definition.module + (scope_resolution + name: (_) @name.definition.module) + ]) @definition.module +) + +; Calls + +(call method: (identifier) @name.reference.call) @reference.call + +( + [(identifier) (constant)] @name.reference.call @reference.call + (#is-not? local) + (#not-match? @name.reference.call "^(lambda|load|require|require_relative|__FILE__|__LINE__)$") +) diff --git a/aider/queries/tree-sitter-language-pack/rust-tags.scm b/aider/queries/tree-sitter-language-pack/rust-tags.scm new file mode 100644 index 000000000..0888cc0d8 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/rust-tags.scm @@ -0,0 +1,60 @@ +; ADT definitions + +(struct_item + name: (type_identifier) @name.definition.class) @definition.class + +(enum_item + name: (type_identifier) @name.definition.class) @definition.class + +(union_item + name: (type_identifier) @name.definition.class) @definition.class + +; type aliases + +(type_item + name: (type_identifier) @name.definition.class) @definition.class + +; method definitions + +(declaration_list + (function_item + name: (identifier) @name.definition.method) @definition.method) + +; function definitions + +(function_item + name: (identifier) @name.definition.function) @definition.function + +; trait definitions +(trait_item + name: (type_identifier) @name.definition.interface) @definition.interface + +; module definitions +(mod_item + name: (identifier) @name.definition.module) @definition.module + +; macro definitions + +(macro_definition + name: (identifier) @name.definition.macro) @definition.macro + +; references + +(call_expression + function: (identifier) @name.reference.call) @reference.call + +(call_expression + function: (field_expression + field: (field_identifier) @name.reference.call)) @reference.call + +(macro_invocation + macro: (identifier) @name.reference.call) @reference.call + +; implementations + +(impl_item + trait: (type_identifier) @name.reference.implementation) @reference.implementation + +(impl_item + type: (type_identifier) @name.reference.implementation + !trait) @reference.implementation diff --git a/aider/queries/tree-sitter-language-pack/solidity-tags.scm b/aider/queries/tree-sitter-language-pack/solidity-tags.scm new file mode 100644 index 000000000..d56bc19a0 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/solidity-tags.scm @@ -0,0 +1,43 @@ +;; Method and Function declarations +(contract_declaration (_ + (function_definition + name: (identifier) @name.definition.function) @definition.method)) + +(source_file + (function_definition + name: (identifier) @name.definition.function) @definition.function) + +;; Contract, struct, enum and interface declarations +(contract_declaration + name: (identifier) @name.definition.class) @definition.class + +(interface_declaration + name: (identifier) @name.definition.interface) @definition.interface + +(library_declaration + name: (identifier) @name.definition.class) @definition.interface + +(struct_declaration name: (identifier) @name.definition.class) @definition.class +(enum_declaration name: (identifier) @name.definition.class) @definition.class +(event_definition name: (identifier) @name.definition.class) @definition.class + +;; Function calls +(call_expression (expression (identifier)) @name.reference.call ) @reference.call + +(call_expression + (expression (member_expression + property: (_) @name.reference.method ))) @reference.call + +;; Log emit +(emit_statement name: (_) @name.reference.class) @reference.class + + +;; Inheritance + +(inheritance_specifier + ancestor: (user_defined_type (_) @name.reference.class . )) @reference.class + + +;; Imports ( note that unknown is not standardised ) +(import_directive + import_name: (_) @name.reference.module ) @reference.unknown diff --git a/aider/queries/tree-sitter-language-pack/swift-tags.scm b/aider/queries/tree-sitter-language-pack/swift-tags.scm new file mode 100644 index 000000000..9b81cf7bd --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/swift-tags.scm @@ -0,0 +1,51 @@ +(class_declaration + name: (type_identifier) @name.definition.class) @definition.class + +(protocol_declaration + name: (type_identifier) @name.definition.interface) @definition.interface + +(class_declaration + (class_body + [ + (function_declaration + name: (simple_identifier) @name.definition.method + ) + (subscript_declaration + (parameter (simple_identifier) @name.definition.method) + ) + (init_declaration "init" @name.definition.method) + (deinit_declaration "deinit" @name.definition.method) + ] + ) +) @definition.method + +(protocol_declaration + (protocol_body + [ + (protocol_function_declaration + name: (simple_identifier) @name.definition.method + ) + (subscript_declaration + (parameter (simple_identifier) @name.definition.method) + ) + (init_declaration "init" @name.definition.method) + ] + ) +) @definition.method + +(class_declaration + (class_body + [ + (property_declaration + (pattern (simple_identifier) @name.definition.property) + ) + ] + ) +) @definition.property + +(property_declaration + (pattern (simple_identifier) @name.definition.property) +) @definition.property + +(function_declaration + name: (simple_identifier) @name.definition.function) @definition.function diff --git a/aider/queries/tree-sitter-language-pack/udev-tags.scm b/aider/queries/tree-sitter-language-pack/udev-tags.scm new file mode 100644 index 000000000..a3a60b569 --- /dev/null +++ b/aider/queries/tree-sitter-language-pack/udev-tags.scm @@ -0,0 +1,20 @@ +(assignment + key: "LABEL" + (value + (content) @name.definition.label)) @definition.label + +(assignment + key: "GOTO" + (value + (content) @name.reference.label)) @reference.label + +(assignment + key: "ENV" + (env_var) @name.definition.variable) @definition.variable + +(match + key: "ENV" + (env_var) @name.reference.variable) @reference.variable + +(var_sub + (env_var) @name.reference.variable) @reference.variable diff --git a/aider/queries/tree-sitter-languages/scala-tags.scm b/aider/queries/tree-sitter-languages/scala-tags.scm new file mode 100644 index 000000000..4bf3953ff --- /dev/null +++ b/aider/queries/tree-sitter-languages/scala-tags.scm @@ -0,0 +1,65 @@ +; Definitions + +(package_clause + name: (package_identifier) @name.definition.module) @definition.module + +(trait_definition + name: (identifier) @name.definition.interface) @definition.interface + +(enum_definition + name: (identifier) @name.definition.enum) @definition.enum + +(simple_enum_case + name: (identifier) @name.definition.class) @definition.class + +(full_enum_case + name: (identifier) @name.definition.class) @definition.class + +(class_definition + name: (identifier) @name.definition.class) @definition.class + +(object_definition + name: (identifier) @name.definition.object) @definition.object + +(function_definition + name: (identifier) @name.definition.function) @definition.function + +(val_definition + pattern: (identifier) @name.definition.variable) @definition.variable + +(given_definition + name: (identifier) @name.definition.variable) @definition.variable + +(var_definition + pattern: (identifier) @name.definition.variable) @definition.variable + +(val_declaration + name: (identifier) @name.definition.variable) @definition.variable + +(var_declaration + name: (identifier) @name.definition.variable) @definition.variable + +(type_definition + name: (type_identifier) @name.definition.type) @definition.type + +(class_parameter + name: (identifier) @name.definition.property) @definition.property + +; References + +(call_expression + (identifier) @name.reference.call) @reference.call + +(instance_expression + (type_identifier) @name.reference.interface) @reference.interface + +(instance_expression + (generic_type + (type_identifier) @name.reference.interface)) @reference.interface + +(extends_clause + (type_identifier) @name.reference.class) @reference.class + +(extends_clause + (generic_type + (type_identifier) @name.reference.class)) @reference.class diff --git a/aider/reasoning_tags.py b/aider/reasoning_tags.py index 137e617ed..e87922383 100644 --- a/aider/reasoning_tags.py +++ b/aider/reasoning_tags.py @@ -7,8 +7,8 @@ from aider.dump import dump # noqa # Standard tag identifier REASONING_TAG = "thinking-content-" + "7bbeb8e1441453ad999a0bbba8a46d4b" # Output formatting -REASONING_START = "> Thinking ..." -REASONING_END = "> ... done thinking.\n\n------" +REASONING_START = "--------------\n► **THINKING**" +REASONING_END = "------------\n► **ANSWER**" def remove_reasoning_content(res, reasoning_tag): diff --git a/aider/repo.py b/aider/repo.py index b0956973f..94143b5f3 100644 --- a/aider/repo.py +++ b/aider/repo.py @@ -56,6 +56,7 @@ class GitRepo: attribute_commit_message_committer=False, commit_prompt=None, subtree_only=False, + git_commit_verify=True, ): self.io = io self.models = models @@ -69,6 +70,7 @@ class GitRepo: self.attribute_commit_message_committer = attribute_commit_message_committer self.commit_prompt = commit_prompt self.subtree_only = subtree_only + self.git_commit_verify = git_commit_verify self.ignore_file_cache = {} if git_dname: @@ -133,7 +135,9 @@ class GitRepo: # if context: # full_commit_message += "\n\n# Aider chat conversation:\n\n" + context - cmd = ["-m", full_commit_message, "--no-verify"] + cmd = ["-m", full_commit_message] + if not self.git_commit_verify: + cmd.append("--no-verify") if fnames: fnames = [str(self.abs_root_path(fn)) for fn in fnames] for fname in fnames: diff --git a/aider/repomap.py b/aider/repomap.py index de5a162b6..598770d18 100644 --- a/aider/repomap.py +++ b/aider/repomap.py @@ -398,13 +398,30 @@ class RepoMap: # dump(fname) rel_fname = self.get_rel_fname(fname) + current_pers = 0.0 # Start with 0 personalization score if fname in chat_fnames: - personalization[rel_fname] = personalize + current_pers += personalize chat_rel_fnames.add(rel_fname) if rel_fname in mentioned_fnames: - personalization[rel_fname] = personalize + # Use max to avoid double counting if in chat_fnames and mentioned_fnames + current_pers = max(current_pers, personalize) + + # Check path components against mentioned_idents + path_obj = Path(rel_fname) + path_components = set(path_obj.parts) + basename_with_ext = path_obj.name + basename_without_ext, _ = os.path.splitext(basename_with_ext) + components_to_check = path_components.union({basename_with_ext, basename_without_ext}) + + matched_idents = components_to_check.intersection(mentioned_idents) + if matched_idents: + # Add personalization *once* if any path component matches a mentioned ident + current_pers += personalize + + if current_pers > 0: + personalization[rel_fname] = current_pers # Assign the final calculated value tags = list(self.get_tags(fname, rel_fname)) if tags is None: @@ -445,12 +462,19 @@ class RepoMap: progress() definers = defines[ident] + + mul = 1.0 + + is_snake = ("_" in ident) and any(c.isalpha() for c in ident) + is_camel = any(c.isupper() for c in ident) and any(c.islower() for c in ident) if ident in mentioned_idents: - mul = 10 - elif ident.startswith("_"): - mul = 0.1 - else: - mul = 1 + mul *= 10 + if (is_snake or is_camel) and len(ident) >= 8: + mul *= 10 + if ident.startswith("_"): + mul *= 0.1 + if len(defines[ident]) > 5: + mul *= 0.1 for referencer, num_refs in Counter(references[ident]).items(): for definer in definers: @@ -458,10 +482,14 @@ class RepoMap: # if referencer == definer: # continue + use_mul = mul + if referencer in chat_rel_fnames: + use_mul *= 50 + # scale down so high freq (low value) mentions don't dominate num_refs = math.sqrt(num_refs) - G.add_edge(referencer, definer, weight=mul * num_refs, ident=ident) + G.add_edge(referencer, definer, weight=use_mul * num_refs, ident=ident) if not references: pass diff --git a/aider/resources/model-metadata.json b/aider/resources/model-metadata.json index 5db04769a..64d851599 100644 --- a/aider/resources/model-metadata.json +++ b/aider/resources/model-metadata.json @@ -63,6 +63,22 @@ //"supports_tool_choice": true, "supports_prompt_caching": true }, + "openrouter/deepseek/deepseek-chat-v3-0324": { + "max_tokens": 8192, + "max_input_tokens": 64000, + "max_output_tokens": 8192, + "input_cost_per_token": 0.00000055, + "input_cost_per_token_cache_hit": 0.00000014, + "cache_read_input_token_cost": 0.00000014, + "cache_creation_input_token_cost": 0.0, + "output_cost_per_token": 0.00000219, + "litellm_provider": "openrouter", + "mode": "chat", + //"supports_function_calling": true, + "supports_assistant_prefill": true, + //"supports_tool_choice": true, + "supports_prompt_caching": true + }, "fireworks_ai/accounts/fireworks/models/deepseek-r1": { "max_tokens": 160000, "max_input_tokens": 128000, @@ -241,4 +257,113 @@ "supports_system_messages": true, "supports_tool_choice": true }, + "gemini/gemini-2.5-pro-exp-03-25": { + "max_tokens": 8192, + "max_input_tokens": 1048576, + "max_output_tokens": 64000, + "max_images_per_prompt": 3000, + "max_videos_per_prompt": 10, + "max_video_length": 1, + "max_audio_length_hours": 8.4, + "max_audio_per_prompt": 1, + "max_pdf_size_mb": 30, + "input_cost_per_image": 0, + "input_cost_per_video_per_second": 0, + "input_cost_per_audio_per_second": 0, + "input_cost_per_token": 0, + "input_cost_per_character": 0, + "input_cost_per_token_above_128k_tokens": 0, + "input_cost_per_character_above_128k_tokens": 0, + "input_cost_per_image_above_128k_tokens": 0, + "input_cost_per_video_per_second_above_128k_tokens": 0, + "input_cost_per_audio_per_second_above_128k_tokens": 0, + "output_cost_per_token": 0, + "output_cost_per_character": 0, + "output_cost_per_token_above_128k_tokens": 0, + "output_cost_per_character_above_128k_tokens": 0, + //"litellm_provider": "vertex_ai-language-models", + "litellm_provider": "gemini", + "mode": "chat", + "supports_system_messages": true, + "supports_function_calling": true, + "supports_vision": true, + "supports_audio_input": true, + "supports_video_input": true, + "supports_pdf_input": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" + }, + "vertex_ai/gemini-2.5-pro-exp-03-25": { + "max_tokens": 8192, + "max_input_tokens": 1048576, + "max_output_tokens": 64000, + "max_images_per_prompt": 3000, + "max_videos_per_prompt": 10, + "max_video_length": 1, + "max_audio_length_hours": 8.4, + "max_audio_per_prompt": 1, + "max_pdf_size_mb": 30, + "input_cost_per_image": 0, + "input_cost_per_video_per_second": 0, + "input_cost_per_audio_per_second": 0, + "input_cost_per_token": 0, + "input_cost_per_character": 0, + "input_cost_per_token_above_128k_tokens": 0, + "input_cost_per_character_above_128k_tokens": 0, + "input_cost_per_image_above_128k_tokens": 0, + "input_cost_per_video_per_second_above_128k_tokens": 0, + "input_cost_per_audio_per_second_above_128k_tokens": 0, + "output_cost_per_token": 0, + "output_cost_per_character": 0, + "output_cost_per_token_above_128k_tokens": 0, + "output_cost_per_character_above_128k_tokens": 0, + "litellm_provider": "vertex_ai-language-models", + "mode": "chat", + "supports_system_messages": true, + "supports_function_calling": true, + "supports_vision": true, + "supports_audio_input": true, + "supports_video_input": true, + "supports_pdf_input": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" + }, + "openrouter/google/gemini-2.5-pro-exp-03-25:free": { + "max_tokens": 8192, + "max_input_tokens": 1048576, + "max_output_tokens": 64000, + "max_images_per_prompt": 3000, + "max_videos_per_prompt": 10, + "max_video_length": 1, + "max_audio_length_hours": 8.4, + "max_audio_per_prompt": 1, + "max_pdf_size_mb": 30, + "input_cost_per_image": 0, + "input_cost_per_video_per_second": 0, + "input_cost_per_audio_per_second": 0, + "input_cost_per_token": 0, + "input_cost_per_character": 0, + "input_cost_per_token_above_128k_tokens": 0, + "input_cost_per_character_above_128k_tokens": 0, + "input_cost_per_image_above_128k_tokens": 0, + "input_cost_per_video_per_second_above_128k_tokens": 0, + "input_cost_per_audio_per_second_above_128k_tokens": 0, + "output_cost_per_token": 0, + "output_cost_per_character": 0, + "output_cost_per_token_above_128k_tokens": 0, + "output_cost_per_character_above_128k_tokens": 0, + "litellm_provider": "openrouter", + "mode": "chat", + "supports_system_messages": true, + "supports_function_calling": true, + "supports_vision": true, + "supports_audio_input": true, + "supports_video_input": true, + "supports_pdf_input": true, + "supports_response_schema": true, + "supports_tool_choice": true, + "source": "https://cloud.google.com/vertex-ai/generative-ai/pricing" + }, } diff --git a/aider/resources/model-settings.yml b/aider/resources/model-settings.yml index c3ca37187..136bac76c 100644 --- a/aider/resources/model-settings.yml +++ b/aider/resources/model-settings.yml @@ -185,6 +185,7 @@ editor_edit_format: editor-diff - name: anthropic/claude-3-7-sonnet-20250219 + overeager: true edit_format: diff weak_model_name: anthropic/claude-3-5-haiku-20241022 use_repo_map: true @@ -196,8 +197,10 @@ cache_control: true editor_model_name: anthropic/claude-3-7-sonnet-20250219 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: anthropic/claude-3-7-sonnet-latest + overeager: true edit_format: diff weak_model_name: anthropic/claude-3-5-haiku-20241022 use_repo_map: true @@ -209,6 +212,7 @@ cache_control: true editor_model_name: anthropic/claude-3-7-sonnet-latest editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: claude-3-7-sonnet-20250219 edit_format: diff @@ -222,8 +226,10 @@ cache_control: true editor_model_name: claude-3-7-sonnet-20250219 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: claude-3-7-sonnet-latest + overeager: true edit_format: diff weak_model_name: claude-3-5-haiku-20241022 use_repo_map: true @@ -235,8 +241,10 @@ cache_control: true editor_model_name: claude-3-7-sonnet-latest editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: bedrock/anthropic.claude-3-7-sonnet-20250219-v1:0 + overeager: true edit_format: diff weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0 use_repo_map: true @@ -248,8 +256,10 @@ cache_control: true editor_model_name: bedrock/anthropic.claude-3-7-sonnet-20250219-v1:0 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: bedrock/us.anthropic.claude-3-7-sonnet-20250219-v1:0 + overeager: true edit_format: diff weak_model_name: bedrock/us.anthropic.claude-3-5-haiku-20241022-v1:0 use_repo_map: true @@ -261,8 +271,10 @@ cache_control: true editor_model_name: bedrock/us.anthropic.claude-3-7-sonnet-20250219-v1:0 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: bedrock_converse/anthropic.claude-3-7-sonnet-20250219-v1:0 + overeager: true edit_format: diff weak_model_name: bedrock_converse/anthropic.claude-3-5-haiku-20241022-v1:0 use_repo_map: true @@ -274,8 +286,10 @@ cache_control: true editor_model_name: bedrock_converse/anthropic.claude-3-7-sonnet-20250219-v1:0 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: bedrock_converse/us.anthropic.claude-3-7-sonnet-20250219-v1:0 + overeager: true edit_format: diff weak_model_name: bedrock_converse/us.anthropic.claude-3-5-haiku-20241022-v1:0 use_repo_map: true @@ -287,8 +301,10 @@ cache_control: true editor_model_name: bedrock_converse/us.anthropic.claude-3-7-sonnet-20250219-v1:0 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: vertex_ai/claude-3-7-sonnet@20250219 + overeager: true edit_format: diff weak_model_name: vertex_ai/claude-3-5-haiku@20241022 use_repo_map: true @@ -297,8 +313,10 @@ max_tokens: 64000 editor_model_name: vertex_ai/claude-3-7-sonnet@20250219 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: vertex_ai-anthropic_models/vertex_ai/claude-3-7-sonnet@20250219 + overeager: true edit_format: diff weak_model_name: vertex_ai/claude-3-5-haiku@20241022 use_repo_map: true @@ -307,8 +325,10 @@ max_tokens: 64000 editor_model_name: vertex_ai-anthropic_models/vertex_ai/claude-3-7-sonnet@20250219 editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: openrouter/anthropic/claude-3.7-sonnet + overeager: true edit_format: diff weak_model_name: openrouter/anthropic/claude-3-5-haiku use_repo_map: true @@ -320,8 +340,10 @@ cache_control: true editor_model_name: openrouter/anthropic/claude-3.7-sonnet editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: openrouter/anthropic/claude-3.7-sonnet:beta + overeager: true edit_format: diff weak_model_name: openrouter/anthropic/claude-3-5-haiku use_repo_map: true @@ -333,6 +355,7 @@ cache_control: true editor_model_name: openrouter/anthropic/claude-3.7-sonnet editor_edit_format: editor-diff + accepts_settings: ["thinking_tokens"] - name: bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0 edit_format: diff @@ -547,8 +570,8 @@ examples_as_sys_msg: true extra_params: max_tokens: 8192 + include_reasoning: true caches_by_default: true - use_temperature: false editor_model_name: openrouter/deepseek/deepseek-chat editor_edit_format: editor-diff @@ -635,6 +658,15 @@ reminder: sys examples_as_sys_msg: true +- name: openrouter/deepseek/deepseek-chat-v3-0324 + edit_format: diff + use_repo_map: true + reminder: sys + examples_as_sys_msg: true + extra_params: + max_tokens: 8192 + caches_by_default: true + - name: openrouter/openai/gpt-4o edit_format: diff weak_model_name: openrouter/openai/gpt-4o-mini @@ -694,6 +726,7 @@ streaming: false editor_model_name: azure/gpt-4o editor_edit_format: editor-diff + accepts_settings: ["reasoning_effort"] - name: o1-preview edit_format: architect @@ -732,6 +765,7 @@ editor_model_name: openrouter/openai/gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: openai/o1 edit_format: diff @@ -742,6 +776,7 @@ editor_model_name: openai/gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: o1 edit_format: diff @@ -752,6 +787,7 @@ editor_model_name: gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: openrouter/qwen/qwen-2.5-coder-32b-instruct edit_format: diff @@ -780,7 +816,7 @@ streaming: true editor_model_name: fireworks_ai/accounts/fireworks/models/deepseek-v3 editor_edit_format: editor-diff - remove_reasoning: think + reasoning_tag: think extra_params: max_tokens: 160000 @@ -800,6 +836,7 @@ editor_model_name: gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: o3-mini edit_format: diff @@ -809,6 +846,7 @@ editor_model_name: gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: openrouter/openai/o3-mini edit_format: diff @@ -818,6 +856,7 @@ editor_model_name: openrouter/openai/gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: openrouter/openai/o3-mini-high edit_format: diff @@ -827,6 +866,7 @@ editor_model_name: openrouter/openai/gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: azure/o3-mini edit_format: diff @@ -836,6 +876,7 @@ editor_model_name: azure/gpt-4o editor_edit_format: editor-diff system_prompt_prefix: "Formatting re-enabled. " + accepts_settings: ["reasoning_effort"] - name: gpt-4.5-preview edit_format: diff @@ -858,7 +899,7 @@ editor_edit_format: editor-diff - name: fireworks_ai/accounts/fireworks/models/qwq-32b - remove_reasoning: think + reasoning_tag: think edit_format: diff weak_model_name: fireworks_ai/accounts/fireworks/models/qwen2p5-coder-32b-instruct use_repo_map: true @@ -872,7 +913,7 @@ top_p: 0.95 - name: groq/qwen-qwq-32b - remove_reasoning: think + reasoning_tag: think edit_format: diff weak_model_name: groq/qwen-2.5-coder-32b use_repo_map: true @@ -1003,3 +1044,30 @@ extra_headers: editor-version: Neovim/0.9.0 Copilot-Integration-Id: vscode-chat + +- name: cohere_chat/command-a-03-2025 + examples_as_sys_msg: true + +- name: openrouter/cohere/command-a-03-2025 + examples_as_sys_msg: true + +- name: gemini/gemma-3-27b-it + use_system_prompt: false + +- name: openrouter/google/gemma-3-27b-it:free + use_system_prompt: false + +- name: openrouter/google/gemma-3-27b-it + use_system_prompt: false + +- name: gemini/gemini-2.5-pro-exp-03-25 + edit_format: diff-fenced + use_repo_map: true + +- name: openrouter/google/gemini-2.5-pro-exp-03-25:free + edit_format: diff-fenced + use_repo_map: true + +- name: vertex_ai/gemini-2.5-pro-exp-03-25 + edit_format: diff-fenced + use_repo_map: true diff --git a/aider/scrape.py b/aider/scrape.py index 7977a8548..8ab5a93ed 100755 --- a/aider/scrape.py +++ b/aider/scrape.py @@ -159,7 +159,8 @@ class Scraper: try: response = page.goto(url, wait_until="networkidle", timeout=5000) except PlaywrightTimeoutError: - self.print_error(f"Timeout while loading {url}") + print(f"Page didn't quiesce, scraping content anyway: {url}") + response = None except PlaywrightError as e: self.print_error(f"Error navigating to {url}: {str(e)}") return None, None diff --git a/aider/watch.py b/aider/watch.py index 989aa8bf6..e7b115730 100644 --- a/aider/watch.py +++ b/aider/watch.py @@ -64,7 +64,7 @@ class FileWatcher: """Watches source files for changes and AI comments""" # Compiled regex pattern for AI comments - ai_comment_pattern = re.compile(r"(?:#|//|--) *(ai\b.*|ai\b.*|.*\bai[?!]?) *$", re.IGNORECASE) + ai_comment_pattern = re.compile(r"(?:#|//|--|;+) *(ai\b.*|ai\b.*|.*\bai[?!]?) *$", re.IGNORECASE) def __init__(self, coder, gitignores=None, verbose=False, analytics=None, root=None): self.coder = coder @@ -140,7 +140,10 @@ class FileWatcher: roots_to_watch = self.get_roots_to_watch() for changes in watch( - *roots_to_watch, watch_filter=self.filter_func, stop_event=self.stop_event + *roots_to_watch, + watch_filter=self.filter_func, + stop_event=self.stop_event, + ignore_permission_denied=True, ): if self.handle_changes(changes): return @@ -259,7 +262,7 @@ class FileWatcher: line_nums.append(i) comments.append(comment) comment = comment.lower() - comment = comment.lstrip("/#-") + comment = comment.lstrip("/#-;") # Added semicolon for Lisp comments comment = comment.strip() if comment.startswith("ai!") or comment.endswith("ai!"): has_action = "!" diff --git a/aider/website/HISTORY.md b/aider/website/HISTORY.md index ce180c84b..951e1eac7 100644 --- a/aider/website/HISTORY.md +++ b/aider/website/HISTORY.md @@ -7,12 +7,13 @@ description: Release notes and stats on aider writing its own code. # Release history -{% include blame.md %} - -The above -[stats are based on the git commit history](/docs/faq.html#how-are-the-aider-wrote-xx-of-code-stats-computed) +Aider writes most of its own code, usually about 70-80% of the new code in each release. +These +[statistics are based on the git commit history](/docs/faq.html#how-are-the-aider-wrote-xx-of-code-stats-computed) of the aider repo. +{% include blame.md %} + ## Release notes + + + + diff --git a/aider/website/_includes/recording.css b/aider/website/_includes/recording.css new file mode 100644 index 000000000..292407d2a --- /dev/null +++ b/aider/website/_includes/recording.css @@ -0,0 +1,228 @@ +/* Terminal header styling */ +.terminal-header { + background-color: #e0e0e0; + border-top-left-radius: 6px; + border-top-right-radius: 6px; + padding: 4px 10px; + display: flex; + align-items: center; + border-bottom: 1px solid #c0c0c0; +} + +.terminal-buttons { + display: flex; + gap: 4px; + margin-right: 10px; +} + +.terminal-button { + width: 10px; + height: 10px; + border-radius: 50%; +} + +.terminal-close { + background-color: #ff5f56; + border: 1px solid #e0443e; +} + +.terminal-minimize { + background-color: #ffbd2e; + border: 1px solid #dea123; +} + +.terminal-expand { + background-color: #27c93f; + border: 1px solid #1aab29; +} + +.terminal-title { + flex-grow: 1; + text-align: center; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; + font-size: 11px; + color: #666; +} + +/* Toast notification styling */ +.toast-container { + position: fixed; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); + z-index: 9999; + pointer-events: none; +} + +.toast-notification { + background-color: rgba(0, 0, 0, 0.7); + color: white; + padding: 12px 25px; + border-radius: 8px; + margin-bottom: 10px; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2); + opacity: 0; + transition: opacity 0.3s ease-in-out; + font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif; + font-size: 18px; + text-align: center; + display: inline-block; + min-width: 200px; + max-width: 90%; +} + +/* Page container styling */ +.page-container { + max-width: 950px; + margin-left: auto; + margin-right: auto; + position: relative; +} + +/* macOS backdrop styling */ +.macos-backdrop { + background: linear-gradient(135deg, #ff9966, #ff5e62, #6666ff, #0066ff); + border-radius: 12px; + padding: clamp(5px, 5vw, 50px) clamp(5px, 2.5vw, 50px); + margin: 20px 0; + box-shadow: 0 10px 30px rgba(0, 0, 0, 0.2); + position: relative; + overflow: hidden; +} + +/* Add subtle wave animation to backdrop */ +.macos-backdrop::before { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background: radial-gradient(circle at center, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 70%); + opacity: 0.7; + pointer-events: none; +} + +/* Add decorative curved lines to the backdrop */ +.macos-backdrop::after { + content: ''; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + background-image: + radial-gradient(circle at 20% 30%, transparent 0%, transparent 60%, rgba(255,255,255,0.2) 61%, transparent 62%), + radial-gradient(circle at 80% 70%, transparent 0%, transparent 40%, rgba(255,255,255,0.2) 41%, transparent 42%), + radial-gradient(circle at 40% 90%, transparent 0%, transparent 70%, rgba(255,255,255,0.2) 71%, transparent 72%), + radial-gradient(circle at 60% 10%, transparent 0%, transparent 50%, rgba(255,255,255,0.2) 51%, transparent 52%); + background-size: 100% 100%; + opacity: 1; + pointer-events: none; + z-index: 0; +} + +.terminal-container { + border-radius: 8px; + overflow: hidden; + box-shadow: 0 5px 15px rgba(0, 0, 0, 0.2); + margin-top: 0; + margin-bottom: 0; + position: relative; + background-color: white; /* Add background color to terminal container */ + z-index: 2; /* Ensure terminal appears above the backdrop effects */ +} + +/* Timestamp link styling */ +.timestamp-link { + color: #0366d6; + text-decoration: none; + font-weight: bold; + cursor: pointer; +} + +.timestamp-link:hover { + text-decoration: underline; +} + +/* Active timestamp styling */ +.timestamp-active { + background-color: #f0f8ff; /* Light blue background */ + border-radius: 3px; + padding: 2px 4px; + margin: -2px -4px; +} + +/* Highlight the list item containing the active timestamp */ +li.active-marker { + background-color: #f6f8fa; + border-radius: 4px; + padding: 4px 8px; + margin-left: -8px; +} + +/* Make list items clickable */ +.transcript-item { + cursor: pointer; + transition: background-color 0.2s ease; + padding: 4px 8px; + margin-left: -8px; + border-radius: 4px; +} + +.transcript-item:hover { + background-color: #f0f0f0; +} + +/* Keyboard shortcuts styling */ +.keyboard-shortcuts { + text-align: center; + font-size: 14px; + color: #666; + margin-top: 10px; + margin-bottom: 20px; +} + +/* Hide keyboard shortcuts on devices likely without physical keyboards */ +.no-physical-keyboard .keyboard-shortcuts { + display: none; +} + +.keyboard-shortcuts kbd { + background-color: #f7f7f7; + border: 1px solid #ccc; + border-radius: 3px; + box-shadow: 0 1px 0 rgba(0,0,0,0.2); + color: #333; + display: inline-block; + font-family: monospace; + line-height: 1; + margin: 0 2px; + padding: 3px 5px; + white-space: nowrap; +} +.asciinema-player-theme-aider { + /* Foreground (default text) color */ + --term-color-foreground: #444444; /* colour238 */ + + /* Background color */ + --term-color-background: #dadada; /* colour253 */ + + /* Palette of 16 standard ANSI colors */ + --term-color-0: #21222c; + --term-color-1: #ff5555; + --term-color-2: #50fa7b; + --term-color-3: #f1fa8c; + --term-color-4: #bd93f9; + --term-color-5: #ff79c6; + --term-color-6: #8be9fd; + --term-color-7: #f8f8f2; + --term-color-8: #6272a4; + --term-color-9: #ff6e6e; + --term-color-10: #69ff94; + --term-color-11: #ffffa5; + --term-color-12: #d6acff; + --term-color-13: #ff92df; + --term-color-14: #a4ffff; + --term-color-15: #ffffff; +} diff --git a/aider/website/_includes/recording.js b/aider/website/_includes/recording.js new file mode 100644 index 000000000..a2f8cf627 --- /dev/null +++ b/aider/website/_includes/recording.js @@ -0,0 +1,428 @@ +document.addEventListener('DOMContentLoaded', function() { + let player; // Store player reference to make it accessible to click handlers + let globalAudio; // Global audio element to be reused + + // Detect if device likely has no physical keyboard + function detectNoKeyboard() { + // Check if it's a touch device (most mobile devices) + const isTouchDevice = ('ontouchstart' in window) || + (navigator.maxTouchPoints > 0) || + (navigator.msMaxTouchPoints > 0); + + // Check common mobile user agents as additional signal + const isMobileUA = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent); + + // If it's a touch device and has a mobile user agent, likely has no physical keyboard + if (isTouchDevice && isMobileUA) { + document.body.classList.add('no-physical-keyboard'); + } + } + + // Run detection + detectNoKeyboard(); + + // Parse the transcript section to create markers and convert timestamps to links + function parseTranscript() { + const markers = []; + // Find the Commentary heading + const transcriptHeading = Array.from(document.querySelectorAll('h2')).find(el => el.textContent.trim() === 'Commentary'); + + if (transcriptHeading) { + // Get all list items after the transcript heading + let currentElement = transcriptHeading.nextElementSibling; + + while (currentElement && currentElement.tagName === 'UL') { + const listItems = currentElement.querySelectorAll('li'); + + listItems.forEach(item => { + const text = item.textContent.trim(); + const match = text.match(/(\d+):(\d+)\s+(.*)/); + + if (match) { + const minutes = parseInt(match[1], 10); + const seconds = parseInt(match[2], 10); + const timeInSeconds = minutes * 60 + seconds; + const formattedTime = `${minutes}:${seconds.toString().padStart(2, '0')}`; + const message = match[3].trim(); + + // Create link for the timestamp + const timeLink = document.createElement('a'); + timeLink.href = '#'; + timeLink.textContent = formattedTime; + timeLink.className = 'timestamp-link'; + timeLink.dataset.time = timeInSeconds; + timeLink.dataset.message = message; + + // Add click event to seek the player + timeLink.addEventListener('click', function(e) { + e.preventDefault(); + if (player && typeof player.seek === 'function') { + player.seek(timeInSeconds); + player.play(); + + // Also trigger toast and speech + showToast(message); + speakText(message, timeInSeconds); + + // Highlight this timestamp + highlightTimestamp(timeInSeconds); + } + }); + + // Replace text with the link + message + item.textContent = ''; + item.appendChild(timeLink); + item.appendChild(document.createTextNode(' ' + message)); + + // Add class and click handler to the entire list item + item.classList.add('transcript-item'); + item.dataset.time = timeInSeconds; + item.dataset.message = message; + + item.addEventListener('click', function(e) { + // Prevent click event if the user clicked directly on the timestamp link + // This prevents double-firing of the event + if (e.target !== timeLink) { + e.preventDefault(); + if (player && typeof player.seek === 'function') { + player.seek(timeInSeconds); + player.play(); + + // Also trigger toast and speech + showToast(message); + speakText(message, timeInSeconds); + + // Highlight this timestamp + highlightTimestamp(timeInSeconds); + } + } + }); + + markers.push([timeInSeconds, message]); + } + }); + + currentElement = currentElement.nextElementSibling; + } + } + + return markers; + } + + // Parse transcript and create markers + const markers = parseTranscript(); + + // Create player with a single call + player = AsciinemaPlayer.create( + recording_url, + document.getElementById('demo'), + { + speed: 1.25, + idleTimeLimit: 1, + theme: "aider", + poster: "npt:0:01", + markers: markers, + controls: true + } + ); + + // Focus on the player element so keyboard shortcuts work immediately + setTimeout(() => { + // Use setTimeout to ensure the player is fully initialized + if (player && typeof player.focus === 'function') { + player.focus(); + } else { + // If player doesn't have a focus method, try to find and focus the terminal element + const playerElement = document.querySelector('.asciinema-terminal'); + if (playerElement) { + playerElement.focus(); + } else { + // Last resort - try to find element with tabindex + const tabbableElement = document.querySelector('[tabindex]'); + if (tabbableElement) { + tabbableElement.focus(); + } + } + } + }, 100); + + // Track active toast elements + let activeToast = null; + + // Function to display toast notification + function showToast(text) { + // Get the appropriate container based on fullscreen state + let container = document.getElementById('toast-container'); + const isFullscreen = document.fullscreenElement || + document.webkitFullscreenElement || + document.mozFullScreenElement || + document.msFullscreenElement; + + // If in fullscreen, check if we need to create a fullscreen toast container + if (isFullscreen) { + // Target the fullscreen element as the container parent + const fullscreenElement = document.fullscreenElement || + document.webkitFullscreenElement || + document.mozFullScreenElement || + document.msFullscreenElement; + + // Look for an existing fullscreen toast container + let fsContainer = fullscreenElement.querySelector('.fs-toast-container'); + + if (!fsContainer) { + // Create a new container for fullscreen mode + fsContainer = document.createElement('div'); + fsContainer.className = 'toast-container fs-toast-container'; + fsContainer.id = 'fs-toast-container'; + fullscreenElement.appendChild(fsContainer); + } + + container = fsContainer; + } + + // Remove any existing toast + if (activeToast) { + hideToast(activeToast); + } + + // Create toast element + const toast = document.createElement('div'); + toast.className = 'toast-notification'; + toast.textContent = text; + + // Add to container + container.appendChild(toast); + + // Store reference to active toast + activeToast = { + element: toast, + container: container + }; + + // Trigger animation + setTimeout(() => { + toast.style.opacity = '1'; + }, 10); + + return activeToast; + } + + // Function to hide a toast + function hideToast(toastInfo) { + if (!toastInfo || !toastInfo.element) return; + + toastInfo.element.style.opacity = '0'; + setTimeout(() => { + if (toastInfo.container && toastInfo.container.contains(toastInfo.element)) { + toastInfo.container.removeChild(toastInfo.element); + } + + // If this was the active toast, clear the reference + if (activeToast === toastInfo) { + activeToast = null; + } + }, 300); // Wait for fade out animation + } + + // Track if TTS is currently in progress to prevent duplicates + let ttsInProgress = false; + let currentToast = null; + + // Improved browser TTS function + function useBrowserTTS(text) { + // Don't start new speech if already in progress + if (ttsInProgress) { + console.log('Speech synthesis already in progress, skipping'); + return false; + } + + if ('speechSynthesis' in window) { + console.log('Using browser TTS fallback'); + + // Set flag to prevent duplicate speech + ttsInProgress = true; + + // Cancel any ongoing speech + window.speechSynthesis.cancel(); + + const utterance = new SpeechSynthesisUtterance(text); + utterance.rate = 1.0; + utterance.pitch = 1.0; + utterance.volume = 1.0; + + // For iOS, use a shorter utterance if possible + if (/iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream) { + utterance.text = text.length > 100 ? text.substring(0, 100) + '...' : text; + } + + utterance.onstart = () => console.log('Speech started'); + utterance.onend = () => { + console.log('Speech ended'); + ttsInProgress = false; // Reset flag when speech completes + + // Hide toast when speech ends + if (currentToast) { + hideToast(currentToast); + currentToast = null; + } + }; + utterance.onerror = (e) => { + console.warn('Speech error:', e); + ttsInProgress = false; // Reset flag on error + + // Also hide toast on error + if (currentToast) { + hideToast(currentToast); + currentToast = null; + } + }; + + window.speechSynthesis.speak(utterance); + return true; + } + console.warn('SpeechSynthesis not supported'); + return false; + } + + // Function to play pre-generated TTS audio files + function speakText(text, timeInSeconds) { + // Show the toast and keep reference + currentToast = showToast(text); + + // Format time for filename (MM-SS) + const minutes = Math.floor(timeInSeconds / 60); + const seconds = timeInSeconds % 60; + const formattedTime = `${minutes.toString().padStart(2, '0')}-${seconds.toString().padStart(2, '0')}`; + + // Get recording_id from the page or use default from the URL + const recordingId = typeof recording_id !== 'undefined' ? recording_id : + window.location.pathname.split('/').pop().replace('.html', ''); + + // Construct audio file path + const audioPath = `/assets/audio/${recordingId}/${formattedTime}.mp3`; + + // Log for debugging + console.log(`Attempting to play audio: ${audioPath}`); + + // Detect iOS + const isIOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; + console.log(`Device is iOS: ${isIOS}`); + + // Flag to track if we've already fallen back to TTS + let fallenBackToTTS = false; + + try { + // Create or reuse audio element + if (!globalAudio) { + globalAudio = new Audio(); + console.log("Created new global Audio element"); + } + + // Set up event handlers + globalAudio.onended = () => { + console.log('Audio playback ended'); + // Hide toast when audio ends + if (currentToast) { + hideToast(currentToast); + currentToast = null; + } + }; + + globalAudio.onerror = (e) => { + console.warn(`Audio error: ${e.type}`, e); + if (!fallenBackToTTS) { + fallenBackToTTS = true; + useBrowserTTS(text); + } else if (currentToast) { + // If we've already tried TTS and that failed too, hide the toast + hideToast(currentToast); + currentToast = null; + } + }; + + // For iOS, preload might help with subsequent plays + if (isIOS) { + globalAudio.preload = "auto"; + } + + // Set the new source + globalAudio.src = audioPath; + + // Play with proper error handling + const playPromise = globalAudio.play(); + + if (playPromise !== undefined) { + playPromise.catch(error => { + console.warn(`Play error: ${error.message}`); + + // On iOS, a user gesture might be required + if (isIOS) { + console.log("iOS playback failed, trying SpeechSynthesis"); + } + + if (!fallenBackToTTS) { + fallenBackToTTS = true; + useBrowserTTS(text); + } + }); + } + } catch (e) { + console.error(`Exception in audio playback: ${e.message}`); + useBrowserTTS(text); + } + } + + // Function to highlight the active timestamp in the transcript + function highlightTimestamp(timeInSeconds) { + // Remove previous highlights + document.querySelectorAll('.timestamp-active').forEach(el => { + el.classList.remove('timestamp-active'); + }); + + document.querySelectorAll('.active-marker').forEach(el => { + el.classList.remove('active-marker'); + }); + + // Find the timestamp link with matching time + const timestampLinks = document.querySelectorAll('.timestamp-link'); + let activeLink = null; + + for (const link of timestampLinks) { + if (parseInt(link.dataset.time) === timeInSeconds) { + activeLink = link; + break; + } + } + + if (activeLink) { + // Add highlight class to the link + activeLink.classList.add('timestamp-active'); + + // Also highlight the parent list item + const listItem = activeLink.closest('li'); + if (listItem) { + listItem.classList.add('active-marker'); + + // No longer scrolling into view to avoid shifting focus + } + } + } + + // Add event listener with safety checks + if (player && typeof player.addEventListener === 'function') { + player.addEventListener('marker', function(event) { + try { + const { index, time, label } = event; + console.log(`marker! ${index} - ${time} - ${label}`); + + // Speak the marker label (toast is now shown within speakText) + speakText(label, time); + + // Highlight the corresponding timestamp in the transcript + highlightTimestamp(time); + } catch (error) { + console.error('Error in marker event handler:', error); + } + }); + } +}); diff --git a/aider/website/_includes/recording.md b/aider/website/_includes/recording.md new file mode 100644 index 000000000..f4fc346de --- /dev/null +++ b/aider/website/_includes/recording.md @@ -0,0 +1,34 @@ + + + + + + + +| Model Name | Total Tokens | Percent |
|---|---|---|
| anthropic/claude-3-7-sonnet-20250219 | 1,948,550 | 99.0% |
| fireworks_ai/accounts/fireworks/models/deepseek-r1 | 14,961 | 0.8% |
| deepseek/deepseek-reasoner | 4,430 | 0.2% |
| o3-mini | 97 | 0.0% |
| claude-3-7-sonnet-20250219 | 93 | 0.0% |
| anthropic/claude-3-7-sonnet-20250219 | 1,466,934 | 59.5% |
| gemini/gemini-2.5-pro-exp-03-25 | 968,704 | 39.3% |
| deepseek/deepseek-chat | 30,307 | 1.2% |
+ Aider lets you pair program with LLMs to start + a new project or build on your existing + codebase. +
+ + +Aider works best with Claude 3.7 Sonnet, DeepSeek R1 & Chat V3, OpenAI o1, o3-mini & GPT-4o, but can connect to almost any LLM, including local models.
+ + ++ Aider makes a map of your entire codebase, + which helps it work well in larger projects. +
+ + ++ Aider works with most popular programming + languages: python, javascript, rust, ruby, go, cpp, + php, html, css, and dozens more. +
+ + ++ Aider automatically commits changes with + sensible commit messages. + Use familiar git tools to easily + diff, manage and undo AI changes. +
+ + ++ Use aider from within your favorite IDE or editor. + Ask for changes by adding comments to + your code and aider will get to work. +
+ + ++ Add images and web pages to the chat to + provide visual context, screenshots, reference docs, + etc. +
+ + ++ Speak with aider about your code! Request new features, + test cases or bug fixes using your voice and let aider + implement the changes. +
+ + ++ Automatically lint and test your code every time aider makes changes. + Aider can fix problems detected by your linters and test suites. +
+ + ++ Aider works best with LLM APIs, + but it can also work an LLM via its web chat interface. + Aider streamlines copy/pasting code + back and forth with a browser. +
+ +
- 
- python -m pip install aider-install
+aider-install
+
+# Change directory into your codebase
+cd /to/your/project
+
+# DeepSeek
+aider --model deepseek --api-key deepseek=<key>
+
+# Claude 3.7 Sonnet
+aider --model sonnet --api-key anthropic=<key>
+
+# o3-mini
+aider --model o3-mini --api-key openai=<key>Want more details?
+ +Everything you need to get started and make the most of Aider
+ +Connect with other users and find additional resources
+ +- -
- - - - -## Getting started - - -If you already have python 3.8-3.13 installed, you can get started quickly like this: - -```bash -python -m pip install aider-install -aider-install - -# Change directory into your code base -cd /to/your/project - -# Work with DeepSeek via DeepSeek's API -aider --model deepseek --api-key deepseek=your-key-goes-here - -# Work with Claude 3.7 Sonnet via Anthropic's API -aider --model sonnet --api-key anthropic=your-key-goes-here - -# Work with GPT-4o via OpenAI's API -aider --model gpt-4o --api-key openai=your-key-goes-here - -# Work with Sonnet via OpenRouter's API -aider --model openrouter/anthropic/claude-3.7-sonnet --api-key openrouter=your-key-goes-here - -# Work with DeepSeek via OpenRouter's API -aider --model openrouter/deepseek/deepseek-chat --api-key openrouter=your-key-goes-here -``` - - -See the -[installation instructions](https://aider.chat/docs/install.html) -and -[usage documentation](https://aider.chat/docs/usage.html) -for more details. - -## Features - -- Run aider with the files you want to edit: `aider