diff --git a/aider/website/assets/sample.aider.conf.yml b/aider/website/assets/sample.aider.conf.yml index 9b9b46077..f8316ad8a 100644 --- a/aider/website/assets/sample.aider.conf.yml +++ b/aider/website/assets/sample.aider.conf.yml @@ -50,6 +50,12 @@ ## 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: @@ -83,17 +89,29 @@ ## Specify what edit format the LLM should use (default depends on model) #edit-format: xxx +## Use senior edit format for the main chat +#senior: false + ## Specify the model to use for commit messages and chat history summarization (default depends on --model) #weak-model: xxx +## Specify the model to use for junior tasks (default depends on --model) +#junior-model: xxx + +## Specify the edit format for the junior model (default: depends on junior model) +#junior-edit-format: xxx + ## Only work with models that have meta-data available (default: True) #show-model-warnings: true -## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024) -#map-tokens: xxx +## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens. +#max-chat-history-tokens: xxx -## Control how often the repo map is refreshed (default: auto) -#map-refresh: auto +## 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 @@ -101,15 +119,18 @@ ## 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 -## Maximum number of tokens to use for chat history. If not specified, uses 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 - ################ # History Files: @@ -155,6 +176,18 @@ ## 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: default + +## Set the background color for the completion menu (default: terminal's default background color) +#completion-menu-bg-color: default + +## Set the color for the current item in the completion menu (default: terminal's default background color) +#completion-menu-current-color: default + +## Set the background color for the current item in the completion menu (default: terminal's default text color) +#completion-menu-current-bg-color: default + ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light) #code-theme: default @@ -242,9 +275,6 @@ ## 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 @@ -298,3 +328,12 @@ ## Enable/disable suggesting shell commands (default: True) #suggest-shell-commands: 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 diff --git a/aider/website/assets/sample.env b/aider/website/assets/sample.env index fb122c026..556dd8221 100644 --- a/aider/website/assets/sample.env +++ b/aider/website/assets/sample.env @@ -54,6 +54,12 @@ ## 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: @@ -87,17 +93,29 @@ ## Specify what edit format the LLM should use (default depends on model) #AIDER_EDIT_FORMAT= +## Use senior edit format for the main chat +#AIDER_SENIOR= + ## 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 junior tasks (default depends on --model) +#AIDER_JUNIOR_MODEL= + +## Specify the edit format for the junior model (default: depends on junior model) +#AIDER_JUNIOR_EDIT_FORMAT= + ## Only work with models that have meta-data available (default: True) #AIDER_SHOW_MODEL_WARNINGS=true -## Suggested 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. +#AIDER_MAX_CHAT_HISTORY_TOKENS= -## Control how often the repo map is refreshed (default: auto) -#AIDER_MAP_REFRESH=auto +## 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 @@ -105,15 +123,18 @@ ## 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 -## Maximum number of tokens to use for chat history. If not specified, uses 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 - ################ # History Files: @@ -159,6 +180,18 @@ ## 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=default + +## Set the background color for the completion menu (default: terminal's default background color) +#AIDER_COMPLETION_MENU_BG_COLOR=default + +## Set the color for the current item in the completion menu (default: terminal's default background color) +#AIDER_COMPLETION_MENU_CURRENT_COLOR=default + +## Set the background color for the current item in the completion menu (default: terminal's default text color) +#AIDER_COMPLETION_MENU_CURRENT_BG_COLOR=default + ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light) #AIDER_CODE_THEME=default @@ -240,9 +273,6 @@ ## 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= @@ -290,3 +320,12 @@ ## Enable/disable suggesting shell commands (default: True) #AIDER_SUGGEST_SHELL_COMMANDS=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 diff --git a/aider/website/docs/config/aider_conf.md b/aider/website/docs/config/aider_conf.md index d906e11bd..f67fefdf8 100644 --- a/aider/website/docs/config/aider_conf.md +++ b/aider/website/docs/config/aider_conf.md @@ -98,6 +98,12 @@ cog.outl("```") ## 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: @@ -131,17 +137,29 @@ cog.outl("```") ## Specify what edit format the LLM should use (default depends on model) #edit-format: xxx +## Use senior edit format for the main chat +#senior: false + ## Specify the model to use for commit messages and chat history summarization (default depends on --model) #weak-model: xxx +## Specify the model to use for junior tasks (default depends on --model) +#junior-model: xxx + +## Specify the edit format for the junior model (default: depends on junior model) +#junior-edit-format: xxx + ## Only work with models that have meta-data available (default: True) #show-model-warnings: true -## Suggested number of tokens to use for repo map, use 0 to disable (default: 1024) -#map-tokens: xxx +## Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens. +#max-chat-history-tokens: xxx -## Control how often the repo map is refreshed (default: auto) -#map-refresh: auto +## 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 @@ -149,15 +167,18 @@ cog.outl("```") ## 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 -## Maximum number of tokens to use for chat history. If not specified, uses 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 - ################ # History Files: @@ -203,6 +224,18 @@ cog.outl("```") ## 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: default + +## Set the background color for the completion menu (default: terminal's default background color) +#completion-menu-bg-color: default + +## Set the color for the current item in the completion menu (default: terminal's default background color) +#completion-menu-current-color: default + +## Set the background color for the current item in the completion menu (default: terminal's default text color) +#completion-menu-current-bg-color: default + ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light) #code-theme: default @@ -290,9 +323,6 @@ cog.outl("```") ## 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 @@ -346,5 +376,14 @@ cog.outl("```") ## Enable/disable suggesting shell commands (default: True) #suggest-shell-commands: 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 ``` diff --git a/aider/website/docs/config/dotenv.md b/aider/website/docs/config/dotenv.md index 21c3b4619..716ab707c 100644 --- a/aider/website/docs/config/dotenv.md +++ b/aider/website/docs/config/dotenv.md @@ -96,6 +96,12 @@ cog.outl("```") ## 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: @@ -129,17 +135,29 @@ cog.outl("```") ## Specify what edit format the LLM should use (default depends on model) #AIDER_EDIT_FORMAT= +## Use senior edit format for the main chat +#AIDER_SENIOR= + ## 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 junior tasks (default depends on --model) +#AIDER_JUNIOR_MODEL= + +## Specify the edit format for the junior model (default: depends on junior model) +#AIDER_JUNIOR_EDIT_FORMAT= + ## Only work with models that have meta-data available (default: True) #AIDER_SHOW_MODEL_WARNINGS=true -## Suggested 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. +#AIDER_MAX_CHAT_HISTORY_TOKENS= -## Control how often the repo map is refreshed (default: auto) -#AIDER_MAP_REFRESH=auto +## 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 @@ -147,15 +165,18 @@ cog.outl("```") ## 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 -## Maximum number of tokens to use for chat history. If not specified, uses 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 - ################ # History Files: @@ -201,6 +222,18 @@ cog.outl("```") ## 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=default + +## Set the background color for the completion menu (default: terminal's default background color) +#AIDER_COMPLETION_MENU_BG_COLOR=default + +## Set the color for the current item in the completion menu (default: terminal's default background color) +#AIDER_COMPLETION_MENU_CURRENT_COLOR=default + +## Set the background color for the current item in the completion menu (default: terminal's default text color) +#AIDER_COMPLETION_MENU_CURRENT_BG_COLOR=default + ## Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light) #AIDER_CODE_THEME=default @@ -282,9 +315,6 @@ cog.outl("```") ## 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= @@ -332,6 +362,15 @@ cog.outl("```") ## Enable/disable suggesting shell commands (default: True) #AIDER_SUGGEST_SHELL_COMMANDS=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 ``` diff --git a/aider/website/docs/config/options.md b/aider/website/docs/config/options.md index 779441677..92bcd5c24 100644 --- a/aider/website/docs/config/options.md +++ b/aider/website/docs/config/options.md @@ -27,25 +27,29 @@ cog.out(get_md_help()) ``` usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model] [--opus] [--sonnet] [--4] [--4o] [--mini] [--4-turbo] - [--35turbo] [--deepseek] [--list-models] - [--openai-api-base] [--openai-api-type] + [--35turbo] [--deepseek] [--o1-mini] [--o1-preview] + [--list-models] [--openai-api-base] [--openai-api-type] [--openai-api-version] [--openai-api-deployment-id] [--openai-organization-id] [--model-settings-file] [--model-metadata-file] [--verify-ssl | --no-verify-ssl] [--edit-format] - [--weak-model] + [--senior] [--weak-model] [--junior-model] + [--junior-edit-format] [--show-model-warnings | --no-show-model-warnings] - [--map-tokens] [--map-refresh] - [--cache-prompts | --no-cache-prompts] - [--cache-keepalive-pings] [--map-multiplier-no-files] [--max-chat-history-tokens] [--env-file] + [--cache-prompts | --no-cache-prompts] + [--cache-keepalive-pings] [--map-tokens] + [--map-refresh] [--map-multiplier-no-files] [--input-history-file] [--chat-history-file] [--restore-chat-history | --no-restore-chat-history] [--llm-history-file] [--dark-mode] [--light-mode] [--pretty | --no-pretty] [--stream | --no-stream] [--user-input-color] [--tool-output-color] [--tool-error-color] [--tool-warning-color] - [--assistant-output-color] [--code-theme] + [--assistant-output-color] [--completion-menu-color] + [--completion-menu-bg-color] + [--completion-menu-current-color] + [--completion-menu-current-bg-color] [--code-theme] [--show-diffs] [--git | --no-git] [--gitignore | --no-gitignore] [--aiderignore] [--subtree-only] [--auto-commits | --no-auto-commits] @@ -57,13 +61,14 @@ usage: aider [-h] [--openai-api-key] [--anthropic-api-key] [--model] [--commit] [--commit-prompt] [--dry-run | --no-dry-run] [--lint] [--lint-cmd] [--auto-lint | --no-auto-lint] [--test-cmd] [--auto-test | --no-auto-test] [--test] - [--file] [--read] [--vim] [--voice-language] - [--chat-language] [--version] [--just-check-update] + [--file] [--read] [--vim] [--chat-language] [--version] + [--just-check-update] [--check-update | --no-check-update] [--install-main-branch] [--upgrade] [--apply] [--yes] [-v] [--show-repo-map] [--show-prompts] [--exit] [--message] [--message-file] [--encoding] [-c] [--gui] [--suggest-shell-commands | --no-suggest-shell-commands] + [--voice-format] [--voice-language] ``` @@ -129,6 +134,14 @@ Aliases: Use deepseek/deepseek-coder model for the main chat Environment variable: `AIDER_DEEPSEEK` +### `--o1-mini` +Use o1-mini model for the main chat +Environment variable: `AIDER_O1_MINI` + +### `--o1-preview` +Use o1-preview model for the main chat +Environment variable: `AIDER_O1_PREVIEW` + ## Model Settings: ### `--list-models MODEL` @@ -183,10 +196,22 @@ Aliases: - `--edit-format EDIT_FORMAT` - `--chat-mode EDIT_FORMAT` +### `--senior` +Use senior edit format for the main chat +Environment variable: `AIDER_SENIOR` + ### `--weak-model WEAK_MODEL` Specify the model to use for commit messages and chat history summarization (default depends on --model) Environment variable: `AIDER_WEAK_MODEL` +### `--junior-model JUNIOR_MODEL` +Specify the model to use for junior tasks (default depends on --model) +Environment variable: `AIDER_JUNIOR_MODEL` + +### `--junior-edit-format JUNIOR_EDIT_FORMAT` +Specify the edit format for the junior model (default: depends on junior model) +Environment variable: `AIDER_JUNIOR_EDIT_FORMAT` + ### `--show-model-warnings` Only work with models that have meta-data available (default: True) Default: True @@ -195,14 +220,16 @@ Aliases: - `--show-model-warnings` - `--no-show-model-warnings` -### `--map-tokens VALUE` -Suggested number of tokens to use for repo map, use 0 to disable (default: 1024) -Environment variable: `AIDER_MAP_TOKENS` +### `--max-chat-history-tokens VALUE` +Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens. +Environment variable: `AIDER_MAX_CHAT_HISTORY_TOKENS` -### `--map-refresh VALUE` -Control how often the repo map is refreshed (default: auto) -Default: auto -Environment variable: `AIDER_MAP_REFRESH` +### `--env-file ENV_FILE` +Specify the .env file to load (default: .env in git root) +Default: .env +Environment variable: `AIDER_ENV_FILE` + +## Cache Settings: ### `--cache-prompts` Enable caching of prompts (default: False) @@ -217,20 +244,22 @@ Number of times to ping at 5min intervals to keep prompt cache warm (default: 0) Default: 0 Environment variable: `AIDER_CACHE_KEEPALIVE_PINGS` +## Repomap Settings: + +### `--map-tokens VALUE` +Suggested number of tokens to use for repo map, use 0 to disable (default: 1024) +Environment variable: `AIDER_MAP_TOKENS` + +### `--map-refresh VALUE` +Control how often the repo map is refreshed. Options: auto, always, files, manual (default: auto) +Default: auto +Environment variable: `AIDER_MAP_REFRESH` + ### `--map-multiplier-no-files VALUE` Multiplier for map tokens when no files are specified (default: 2) Default: 2 Environment variable: `AIDER_MAP_MULTIPLIER_NO_FILES` -### `--max-chat-history-tokens VALUE` -Maximum number of tokens to use for chat history. If not specified, uses the model's max_chat_history_tokens. -Environment variable: `AIDER_MAX_CHAT_HISTORY_TOKENS` - -### `--env-file ENV_FILE` -Specify the .env file to load (default: .env in git root) -Default: .env -Environment variable: `AIDER_ENV_FILE` - ## History Files: ### `--input-history-file INPUT_HISTORY_FILE` @@ -307,6 +336,26 @@ Set the color for assistant output (default: #0088ff) Default: #0088ff Environment variable: `AIDER_ASSISTANT_OUTPUT_COLOR` +### `--completion-menu-color COLOR` +Set the color for the completion menu (default: terminal's default text color) +Default: default +Environment variable: `AIDER_COMPLETION_MENU_COLOR` + +### `--completion-menu-bg-color COLOR` +Set the background color for the completion menu (default: terminal's default background color) +Default: default +Environment variable: `AIDER_COMPLETION_MENU_BG_COLOR` + +### `--completion-menu-current-color COLOR` +Set the color for the current item in the completion menu (default: terminal's default background color) +Default: default +Environment variable: `AIDER_COMPLETION_MENU_CURRENT_COLOR` + +### `--completion-menu-current-bg-color COLOR` +Set the background color for the current item in the completion menu (default: terminal's default text color) +Default: default +Environment variable: `AIDER_COMPLETION_MENU_CURRENT_BG_COLOR` + ### `--code-theme VALUE` Set the markdown code theme (default: default, other options include monokai, solarized-dark, solarized-light) Default: default @@ -463,11 +512,6 @@ Use VI editing mode in the terminal (default: False) Default: False Environment variable: `AIDER_VIM` -### `--voice-language VOICE_LANGUAGE` -Specify the language for voice using ISO 639-1 code (default: auto) -Default: en -Environment variable: `AIDER_VOICE_LANGUAGE` - ### `--chat-language CHAT_LANGUAGE` Specify the language to use in the chat (default: None, uses system settings) Environment variable: `AIDER_CHAT_LANGUAGE` @@ -573,4 +617,16 @@ Environment variable: `AIDER_SUGGEST_SHELL_COMMANDS` Aliases: - `--suggest-shell-commands` - `--no-suggest-shell-commands` + +## Voice Settings: + +### `--voice-format VOICE_FORMAT` +Audio format for voice recording (default: wav). webm and mp3 require ffmpeg +Default: wav +Environment variable: `AIDER_VOICE_FORMAT` + +### `--voice-language VOICE_LANGUAGE` +Specify the language for voice using ISO 639-1 code (default: auto) +Default: en +Environment variable: `AIDER_VOICE_LANGUAGE`