Merge branch 'main' into mixpanel

aider/website/assets/sample.aider.conf.yml

@@ -12,30 +12,30 @@
 # options:
 
 ## show this help message and exit
-#help:
+#help: xxx
 
 #######
 # Main:
 
 ## Specify the OpenAI API key
-#openai-api-key:
+#openai-api-key: xxx
 
 ## Specify the Anthropic API key
-#anthropic-api-key:
+#anthropic-api-key: xxx
 
 ## Specify the model to use for the main chat
-#model:
+#model: xxx
 
 ## Use claude-3-opus-20240229 model for the main chat
 #opus: false
 
-## Use claude-3-5-sonnet-20240620 model for the main chat
+## Use claude-3-5-sonnet-20241022 model for the main chat
 #sonnet: false
 
 ## Use gpt-4-0613 model for the main chat
 #4: false
 
-## Use gpt-4o model for the main chat
+## Use gpt-4o-2024-08-06 model for the main chat
 #4o: false
 
 ## Use gpt-4o-mini model for the main chat
@@ -50,26 +50,32 @@
 ## Use deepseek/deepseek-coder model for the main chat
 #deepseek: false
 
+## Use o1-mini model for the main chat
+#o1-mini: false
+
+## Use o1-preview model for the main chat
+#o1-preview: false
+
 #################
 # Model Settings:
 
 ## List known models which match the (partial) MODEL name
-#models:
+#list-models: xxx
 
 ## Specify the api base url
-#openai-api-base:
+#openai-api-base: xxx
 
 ## Specify the api_type
-#openai-api-type:
+#openai-api-type: xxx
 
 ## Specify the api_version
-#openai-api-version:
+#openai-api-version: xxx
 
 ## Specify the deployment_id
-#openai-api-deployment-id:
+#openai-api-deployment-id: xxx
 
 ## Specify the OpenAI organization ID
-#openai-organization-id:
+#openai-organization-id: xxx
 
 ## Specify a file with aider model settings for unknown models
 #model-settings-file: .aider.model.settings.yml
@@ -81,23 +87,50 @@
 #verify-ssl: true
 
 ## Specify what edit format the LLM should use (default depends on model)
-#edit-format:
+#edit-format: xxx
+
+## Use architect edit format for the main chat
+#architect: false
 
 ## Specify the model to use for commit messages and chat history summarization (default depends on --model)
-#weak-model:
+#weak-model: xxx
+
+## Specify the model to use for editor tasks (default depends on --model)
+#editor-model: xxx
+
+## Specify the edit format for the editor model (default: depends on editor model)
+#editor-edit-format: xxx
 
 ## Only work with models that have meta-data available (default: True)
 #show-model-warnings: true
 
-## Max number of tokens to use for repo map, use 0 to disable (default: 1024)
-#map-tokens:
-
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
-#max-chat-history-tokens:
+## Soft limit on tokens for chat history, after which summarization begins. If unspecified, defaults to the model's max_chat_history_tokens.
+#max-chat-history-tokens: xxx
 
 ## Specify the .env file to load (default: .env in git root)
 #env-file: .env
 
+#################
+# Cache Settings:
+
+## Enable caching of prompts (default: False)
+#cache-prompts: false
+
+## Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)
+#cache-keepalive-pings: false
+
+###################
+# Repomap Settings:
+
+## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
+#map-tokens: xxx
+
+## Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto)
+#map-refresh: auto
+
+## Multiplier for map tokens when no files are specified (default: 2)
+#map-multiplier-no-files: true
+
 ################
 # History Files:
 
@@ -111,7 +144,7 @@
 #restore-chat-history: false
 
 ## Log the conversation with the LLM to this file (for example, .aider.llm.history)
-#llm-history-file:
+#llm-history-file: xxx
 
 ##################
 # Output Settings:
@@ -132,14 +165,29 @@
 #user-input-color: #00cc00
 
 ## Set the color for tool output (default: None)
-#tool-output-color:
+#tool-output-color: xxx
 
-## Set the color for tool error messages (default: red)
+## Set the color for tool error messages (default: #FF2222)
 #tool-error-color: #FF2222
 
+## Set the color for tool warning messages (default: #FFA500)
+#tool-warning-color: #FFA500
+
 ## Set the color for assistant output (default: #0088ff)
 #assistant-output-color: #0088ff
 
+## Set the color for the completion menu (default: terminal's default text color)
+#completion-menu-color: xxx
+
+## Set the background color for the completion menu (default: terminal's default background color)
+#completion-menu-bg-color: xxx
+
+## Set the color for the current item in the completion menu (default: terminal's default background color)
+#completion-menu-current-color: xxx
+
+## Set the background color for the current item in the completion menu (default: terminal's default text color)
+#completion-menu-current-bg-color: xxx
+
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
 #code-theme: default
 
@@ -183,11 +231,14 @@
 #commit: false
 
 ## Specify a custom prompt for generating commit messages
-#commit-prompt:
+#commit-prompt: xxx
 
 ## Perform a dry run without modifying files (default: False)
 #dry-run: false
 
+## Skip the sanity check for the git repository (default: False)
+#skip-sanity-check-repo: false
+
 ########################
 # Fixing and committing:
 
@@ -195,13 +246,18 @@
 #lint: false
 
 ## Specify lint commands to run for different languages, eg: "python: flake8 --select=..." (can be used multiple times)
+#lint-cmd: xxx
+## Specify multiple values like this:
 #lint-cmd:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## Enable/disable automatic linting after changes (default: True)
 #auto-lint: true
 
 ## Specify command to run tests
-#test-cmd:
+#test-cmd: xxx
 
 ## Enable/disable automatic testing after changes (default: False)
 #auto-test: false
@@ -225,19 +281,29 @@
 # Other Settings:
 
 ## specify a file to edit (can be used multiple times)
+#file: xxx
+## Specify multiple values like this:
 #file:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## specify a read-only file (can be used multiple times)
+#read: xxx
+## Specify multiple values like this:
 #read:
+#  - xxx
+#  - yyy
+#  - zzz
 
 ## Use VI editing mode in the terminal (default: False)
 #vim: false
 
-## Specify the language for voice using ISO 639-1 code (default: auto)
-#voice-language: en
+## Specify the language to use in the chat (default: None, uses system settings)
+#chat-language: xxx
 
 ## Show the version number and exit
-#version:
+#version: xxx
 
 ## Check for updates and return status in the exit code
 #just-check-update: false
@@ -245,11 +311,17 @@
 ## Check for new aider versions on launch
 #check-update: true
 
+## Install the latest version from the main branch
+#install-main-branch: false
+
+## Upgrade aider to the latest version from PyPI
+#upgrade: false
+
 ## Apply the changes from the given file instead of running the chat (debug)
-#apply:
+#apply: xxx
 
 ## Always say yes to every confirmation
-#yes: false
+#yes-always: false
 
 ## Enable verbose output
 #verbose: false
@@ -264,16 +336,34 @@
 #exit: false
 
 ## Specify a single message to send the LLM, process reply then exit (disables chat mode)
-#message:
+#message: xxx
 
 ## Specify a file containing the message to send the LLM, process reply, then exit (disables chat mode)
-#message-file:
+#message-file: xxx
+
+## Load and execute /commands from a file on launch
+#load: xxx
 
 ## Specify the encoding for input and output (default: utf-8)
 #encoding: utf-8
 
 ## Specify the config file (default: search for .aider.conf.yml in git root, cwd or home directory)
-#config:
+#config: xxx
 
 ## Run aider in your browser
 #gui: false
+
+## Enable/disable suggesting shell commands (default: True)
+#suggest-shell-commands: true
+
+## Enable/disable fancy input with history and completion (default: True)
+#fancy-input: true
+
+#################
+# Voice Settings:
+
+## Audio format for voice recording (default: wav). webm and mp3 require ffmpeg
+#voice-format: wav
+
+## Specify the language for voice using ISO 639-1 code (default: auto)
+#voice-language: en

aider/website/assets/sample.env

@@ -33,13 +33,13 @@
 ## Use claude-3-opus-20240229 model for the main chat
 #AIDER_OPUS=
 
-## Use claude-3-5-sonnet-20240620 model for the main chat
+## Use claude-3-5-sonnet-20241022 model for the main chat
 #AIDER_SONNET=
 
 ## Use gpt-4-0613 model for the main chat
 #AIDER_4=
 
-## Use gpt-4o model for the main chat
+## Use gpt-4o-2024-08-06 model for the main chat
 #AIDER_4O=
 
 ## Use gpt-4o-mini model for the main chat
@@ -54,11 +54,17 @@
 ## Use deepseek/deepseek-coder model for the main chat
 #AIDER_DEEPSEEK=
 
+## Use o1-mini model for the main chat
+#AIDER_O1_MINI=
+
+## Use o1-preview model for the main chat
+#AIDER_O1_PREVIEW=
+
 #################
 # Model Settings:
 
 ## List known models which match the (partial) MODEL name
-#AIDER_MODELS=
+#AIDER_LIST_MODELS=
 
 ## Specify the api base url
 #OPENAI_API_BASE=
@@ -87,21 +93,48 @@
 ## Specify what edit format the LLM should use (default depends on model)
 #AIDER_EDIT_FORMAT=
 
+## Use architect edit format for the main chat
+#AIDER_ARCHITECT=
+
 ## Specify the model to use for commit messages and chat history summarization (default depends on --model)
 #AIDER_WEAK_MODEL=
 
+## Specify the model to use for editor tasks (default depends on --model)
+#AIDER_EDITOR_MODEL=
+
+## Specify the edit format for the editor model (default: depends on editor model)
+#AIDER_EDITOR_EDIT_FORMAT=
+
 ## Only work with models that have meta-data available (default: True)
 #AIDER_SHOW_MODEL_WARNINGS=true
 
-## Max number of tokens to use for repo map, use 0 to disable (default: 1024)
-#AIDER_MAP_TOKENS=
-
-## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens.
+## Soft limit on tokens for chat history, after which summarization begins. If unspecified, defaults to the model's max_chat_history_tokens.
 #AIDER_MAX_CHAT_HISTORY_TOKENS=
 
 ## Specify the .env file to load (default: .env in git root)
 #AIDER_ENV_FILE=.env
 
+#################
+# Cache Settings:
+
+## Enable caching of prompts (default: False)
+#AIDER_CACHE_PROMPTS=false
+
+## Number of times to ping at 5min intervals to keep prompt cache warm (default: 0)
+#AIDER_CACHE_KEEPALIVE_PINGS=false
+
+###################
+# Repomap Settings:
+
+## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024)
+#AIDER_MAP_TOKENS=
+
+## Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto)
+#AIDER_MAP_REFRESH=auto
+
+## Multiplier for map tokens when no files are specified (default: 2)
+#AIDER_MAP_MULTIPLIER_NO_FILES=true
+
 ################
 # History Files:
 
@@ -138,12 +171,27 @@
 ## Set the color for tool output (default: None)
 #AIDER_TOOL_OUTPUT_COLOR=
 
-## Set the color for tool error messages (default: red)
+## Set the color for tool error messages (default: #FF2222)
 #AIDER_TOOL_ERROR_COLOR=#FF2222
 
+## Set the color for tool warning messages (default: #FFA500)
+#AIDER_TOOL_WARNING_COLOR=#FFA500
+
 ## Set the color for assistant output (default: #0088ff)
 #AIDER_ASSISTANT_OUTPUT_COLOR=#0088ff
 
+## Set the color for the completion menu (default: terminal's default text color)
+#AIDER_COMPLETION_MENU_COLOR=
+
+## Set the background color for the completion menu (default: terminal's default background color)
+#AIDER_COMPLETION_MENU_BG_COLOR=
+
+## Set the color for the current item in the completion menu (default: terminal's default background color)
+#AIDER_COMPLETION_MENU_CURRENT_COLOR=
+
+## Set the background color for the current item in the completion menu (default: terminal's default text color)
+#AIDER_COMPLETION_MENU_CURRENT_BG_COLOR=
+
 ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light)
 #AIDER_CODE_THEME=default
 
@@ -192,6 +240,9 @@
 ## Perform a dry run without modifying files (default: False)
 #AIDER_DRY_RUN=false
 
+## Skip the sanity check for the git repository (default: False)
+#AIDER_SKIP_SANITY_CHECK_REPO=false
+
 ########################
 # Fixing and committing:
 
@@ -237,8 +288,8 @@
 ## Use VI editing mode in the terminal (default: False)
 #AIDER_VIM=false
 
-## Specify the language for voice using ISO 639-1 code (default: auto)
-#AIDER_VOICE_LANGUAGE=en
+## Specify the language to use in the chat (default: None, uses system settings)
+#AIDER_CHAT_LANGUAGE=
 
 ## Check for updates and return status in the exit code
 #AIDER_JUST_CHECK_UPDATE=false
@@ -246,11 +297,17 @@
 ## Check for new aider versions on launch
 #AIDER_CHECK_UPDATE=true
 
+## Install the latest version from the main branch
+#AIDER_INSTALL_MAIN_BRANCH=false
+
+## Upgrade aider to the latest version from PyPI
+#AIDER_UPGRADE=false
+
 ## Apply the changes from the given file instead of running the chat (debug)
 #AIDER_APPLY=
 
 ## Always say yes to every confirmation
-#AIDER_YES=
+#AIDER_YES_ALWAYS=
 
 ## Enable verbose output
 #AIDER_VERBOSE=false
@@ -270,8 +327,26 @@
 ## Specify a file containing the message to send the LLM, process reply, then exit (disables chat mode)
 #AIDER_MESSAGE_FILE=
 
+## Load and execute /commands from a file on launch
+#AIDER_LOAD=
+
 ## Specify the encoding for input and output (default: utf-8)
 #AIDER_ENCODING=utf-8
 
 ## Run aider in your browser
 #AIDER_GUI=false
+
+## Enable/disable suggesting shell commands (default: True)
+#AIDER_SUGGEST_SHELL_COMMANDS=true
+
+## Enable/disable fancy input with history and completion (default: True)
+#AIDER_FANCY_INPUT=true
+
+#################
+# Voice Settings:
+
+## Audio format for voice recording (default: wav). webm and mp3 require ffmpeg
+#AIDER_VOICE_FORMAT=wav
+
+## Specify the language for voice using ISO 639-1 code (default: auto)
+#AIDER_VOICE_LANGUAGE=en