diff --git a/aider/resources/model-settings.yml b/aider/resources/model-settings.yml
new file mode 100644
index 000000000..3607d979f
--- /dev/null
+++ b/aider/resources/model-settings.yml
@@ -0,0 +1,580 @@
+- name: gpt-3.5-turbo
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-0125
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-1106
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-0613
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-16k-0613
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-4-turbo-2024-04-09
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+
+- name: gpt-4-turbo
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+
+- name: openai/gpt-4o
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+  editor_edit_format: editor-diff
+
+- name: openai/gpt-4o-2024-08-06
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4o-2024-08-06
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4o-2024-11-20
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: openai/gpt-4o-2024-11-20
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4o
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+  editor_edit_format: editor-diff
+
+- name: gpt-4o-mini
+  weak_model_name: gpt-4o-mini
+  lazy: true
+  reminder: sys
+
+- name: openai/gpt-4o-mini
+  weak_model_name: openai/gpt-4o-mini
+  lazy: true
+  reminder: sys
+
+- name: gpt-4-0125-preview
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4-1106-preview
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+
+- name: gpt-4-vision-preview
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+
+- name: gpt-4-0314
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4-0613
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+
+- name: gpt-4-32k-0613
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+
+- name: claude-3-opus-20240229
+  edit_format: diff
+  weak_model_name: claude-3-5-haiku-20241022
+  use_repo_map: true
+
+- name: openrouter/anthropic/claude-3-opus
+  edit_format: diff
+  weak_model_name: openrouter/anthropic/claude-3-5-haiku
+  use_repo_map: true
+
+- name: claude-3-sonnet-20240229
+  weak_model_name: claude-3-5-haiku-20241022
+
+- name: claude-3-5-sonnet-20240620
+  edit_format: diff
+  weak_model_name: claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: claude-3-5-sonnet-20240620
+  editor_edit_format: editor-diff
+
+- name: anthropic/claude-3-5-sonnet-20240620
+  edit_format: diff
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: anthropic/claude-3-5-sonnet-20240620
+  editor_edit_format: editor-diff
+
+- name: anthropic/claude-3-5-sonnet-20241022
+  edit_format: diff
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: anthropic/claude-3-5-sonnet-20241022
+  editor_edit_format: editor-diff
+
+- name: bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0
+  edit_format: diff
+  weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0
+  editor_edit_format: editor-diff
+
+- name: anthropic/claude-3-5-sonnet-latest
+  edit_format: diff
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: anthropic/claude-3-5-sonnet-20241022
+  editor_edit_format: editor-diff
+
+- name: claude-3-5-sonnet-20241022
+  edit_format: diff
+  weak_model_name: claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: claude-3-5-sonnet-20241022
+  editor_edit_format: editor-diff
+
+- name: anthropic/claude-3-haiku-20240307
+  weak_model_name: anthropic/claude-3-haiku-20240307
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
+- name: anthropic/claude-3-5-haiku-20241022
+  edit_format: diff
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+  use_repo_map: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
+- name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+  edit_format: diff
+  weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+  use_repo_map: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
+- name: claude-3-5-haiku-20241022
+  edit_format: diff
+  weak_model_name: claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
+- name: vertex_ai/claude-3-5-haiku@20241022
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+  extra_params:
+    max_tokens: 4096
+
+- name: claude-3-haiku-20240307
+  weak_model_name: claude-3-haiku-20240307
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
+- name: openrouter/anthropic/claude-3.5-sonnet
+  edit_format: diff
+  weak_model_name: openrouter/anthropic/claude-3-5-haiku
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: openrouter/anthropic/claude-3.5-sonnet
+  editor_edit_format: editor-diff
+
+- name: openrouter/anthropic/claude-3.5-sonnet:beta
+  edit_format: diff
+  weak_model_name: openrouter/anthropic/claude-3-5-haiku:beta
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: openrouter/anthropic/claude-3.5-sonnet:beta
+  editor_edit_format: editor-diff
+
+- name: vertex_ai/claude-3-5-sonnet@20240620
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  editor_model_name: vertex_ai/claude-3-5-sonnet@20240620
+  editor_edit_format: editor-diff
+
+- name: vertex_ai/claude-3-5-sonnet-v2@20241022
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  editor_model_name: vertex_ai/claude-3-5-sonnet-v2@20241022
+  editor_edit_format: editor-diff
+
+- name: vertex_ai/claude-3-opus@20240229
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+
+- name: vertex_ai/claude-3-sonnet@20240229
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+
+- name: command-r-plus
+  weak_model_name: command-r-plus
+  use_repo_map: true
+
+- name: command-r-08-2024
+  weak_model_name: command-r-08-2024
+  use_repo_map: true
+
+- name: command-r-plus-08-2024
+  weak_model_name: command-r-plus-08-2024
+  use_repo_map: true
+
+- name: groq/llama3-70b-8192
+  edit_format: diff
+  weak_model_name: groq/llama3-8b-8192
+  examples_as_sys_msg: true
+
+- name: openrouter/meta-llama/llama-3-70b-instruct
+  edit_format: diff
+  weak_model_name: openrouter/meta-llama/llama-3-70b-instruct
+  examples_as_sys_msg: true
+
+- name: gemini/gemini-1.5-pro-002
+  edit_format: diff
+  use_repo_map: true
+
+- name: gemini/gemini-1.5-flash-002
+
+- name: gemini/gemini-1.5-pro
+  edit_format: diff-fenced
+  use_repo_map: true
+
+- name: gemini/gemini-1.5-pro-latest
+  edit_format: diff-fenced
+  use_repo_map: true
+
+- name: gemini/gemini-1.5-pro-exp-0827
+  edit_format: diff-fenced
+  use_repo_map: true
+
+- name: gemini/gemini-exp-1206
+  edit_format: diff
+  use_repo_map: true
+
+- name: gemini/gemini-exp-1114
+  edit_format: diff
+  use_repo_map: true
+
+- name: gemini/gemini-exp-1121
+  edit_format: diff
+  use_repo_map: true
+
+- name: vertex_ai/gemini-pro-experimental
+  edit_format: diff-fenced
+  use_repo_map: true
+
+- name: gemini/gemini-1.5-flash-exp-0827
+
+- name: gemini/gemini-2.0-flash-exp
+  edit_format: diff
+  use_repo_map: true
+
+- name: openrouter/deepseek/deepseek-r1
+  edit_format: diff
+  weak_model_name: openrouter/deepseek/deepseek-chat
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+  use_temperature: false
+  editor_model_name: openrouter/deepseek/deepseek-chat
+  editor_edit_format: editor-diff
+
+- name: deepseek/deepseek-reasoner
+  edit_format: diff
+  weak_model_name: deepseek/deepseek-chat
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+  use_temperature: false
+  editor_model_name: deepseek/deepseek-chat
+  editor_edit_format: editor-diff
+
+- name: deepseek/deepseek-chat
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+
+- name: deepseek/deepseek-coder
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+
+- name: deepseek-chat
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+
+- name: deepseek-coder
+  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/deepseek/deepseek-coder
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: openrouter/deepseek/deepseek-chat
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: openrouter/openai/gpt-4o
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+  editor_edit_format: editor-diff
+
+- name: openai/o1-mini
+  weak_model_name: openai/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: azure/o1-mini
+  weak_model_name: azure/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: azure/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: o1-mini
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openai/o1-preview
+  edit_format: diff
+  weak_model_name: openai/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: azure/o1-preview
+  edit_format: diff
+  weak_model_name: azure/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: azure/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: azure/o1
+  edit_format: diff
+  weak_model_name: azure/gpt-4o-mini
+  use_repo_map: true
+  use_temperature: false
+  streaming: false
+  editor_model_name: azure/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: o1-preview
+  edit_format: architect
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openrouter/openai/o1-mini
+  weak_model_name: openrouter/openai/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  streaming: false
+  editor_model_name: openrouter/openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openrouter/openai/o1-preview
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  streaming: false
+  editor_model_name: openrouter/openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openrouter/openai/o1
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-4o-mini
+  use_repo_map: true
+  use_temperature: false
+  streaming: false
+  editor_model_name: openrouter/openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openai/o1
+  edit_format: diff
+  weak_model_name: openai/gpt-4o-mini
+  use_repo_map: true
+  use_temperature: false
+  streaming: false
+  editor_model_name: openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: o1
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  use_temperature: false
+  streaming: false
+  editor_model_name: gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openrouter/qwen/qwen-2.5-coder-32b-instruct
+  edit_format: diff
+  weak_model_name: openrouter/qwen/qwen-2.5-coder-32b-instruct
+  use_repo_map: true
+  editor_model_name: openrouter/qwen/qwen-2.5-coder-32b-instruct
+  editor_edit_format: editor-diff
diff --git a/aider/website/assets/sample-analytics.jsonl b/aider/website/assets/sample-analytics.jsonl
index 55693e870..edc99a6b0 100644
--- a/aider/website/assets/sample-analytics.jsonl
+++ b/aider/website/assets/sample-analytics.jsonl
@@ -1,27 +1,3 @@
-{"event": "model warning", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737066819}
-{"event": "exit", "properties": {"reason": "Keyboard interrupt during model warnings"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737130145}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144019}
-{"event": "repo", "properties": {"num_files": 424}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144020}
-{"event": "cli session", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144020}
-{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144021}
-{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144021}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144038}
-{"event": "repo", "properties": {"num_files": 424}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144040}
-{"event": "cli session", "properties": {"main_model": "deepseek/deepseek-chat", "weak_model": "deepseek/deepseek-chat", "editor_model": "deepseek/deepseek-chat", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144040}
-{"event": "exit", "properties": {"reason": "Completed main CLI coder.run"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737144048}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149251}
-{"event": "model warning", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149253}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149269}
-{"event": "repo", "properties": {"num_files": 424}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149271}
-{"event": "cli session", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None", "edit_format": "whole"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149271}
-{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149312}
-{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149312}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149332}
-{"event": "repo", "properties": {"num_files": 424}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149333}
-{"event": "cli session", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None", "edit_format": "whole"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149333}
-{"event": "exit", "properties": {"reason": "Control-C"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149339}
-{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149344}
-{"event": "repo", "properties": {"num_files": 424}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149346}
 {"event": "cli session", "properties": {"main_model": "None", "weak_model": "None", "editor_model": "None", "edit_format": "whole"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149346}
 {"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149410}
 {"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1737149410}
@@ -998,3 +974,27 @@
 {"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 16959, "completion_tokens": 152, "total_tokens": 17111, "cost": 0.053156999999999996, "total_cost": 0.157914}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099449}
 {"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099474}
 {"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 17160, "completion_tokens": 292, "total_tokens": 17452, "cost": 0.05586, "total_cost": 0.213774}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099498}
+{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099820}
+{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099849}
+{"event": "repo", "properties": {"num_files": 432}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099852}
+{"event": "cli session", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099852}
+{"event": "ai-comments execute", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099876}
+{"event": "ai-comments file-add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099876}
+{"event": "ai-comments execute", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099876}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099876}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099876}
+{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 12221, "completion_tokens": 246, "total_tokens": 12467, "cost": 0.040353, "total_cost": 0.254127}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099884}
+{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 16521, "completion_tokens": 235, "total_tokens": 16756, "cost": 0.053088, "total_cost": 0.053088}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099888}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099901}
+{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 17244, "completion_tokens": 170, "total_tokens": 17414, "cost": 0.054282, "total_cost": 0.10737}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099907}
+{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099913}
+{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099913}
+{"event": "launched", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099917}
+{"event": "repo", "properties": {"num_files": 432}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099919}
+{"event": "cli session", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099919}
+{"event": "command_exit", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099952}
+{"event": "exit", "properties": {"reason": "/exit"}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738099952}
+{"event": "ai-comments file-add", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738100124}
+{"event": "ai-comments execute", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738100124}
+{"event": "message_send_starting", "properties": {}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738100124}
+{"event": "message_send", "properties": {"main_model": "claude-3-5-sonnet-20241022", "weak_model": "claude-3-5-haiku-20241022", "editor_model": "claude-3-5-sonnet-20241022", "edit_format": "diff", "prompt_tokens": 11609, "completion_tokens": 177, "total_tokens": 11786, "cost": 0.037482, "total_cost": 0.037482}, "user_id": "c42c4e6b-f054-44d7-ae1f-6726cc41da88", "time": 1738100131}
diff --git a/aider/website/docs/config/adv-model-settings.md b/aider/website/docs/config/adv-model-settings.md
index 600d58bb9..58fa86bf1 100644
--- a/aider/website/docs/config/adv-model-settings.md
+++ b/aider/website/docs/config/adv-model-settings.md
@@ -173,165 +173,14 @@ cog.out("```\n")
   editor_edit_format: null
   remove_reasoning: null
 
-- name: gpt-3.5-turbo
-  weak_model_name: gpt-4o-mini
-  reminder: sys
-
-- name: gpt-3.5-turbo-0125
-  weak_model_name: gpt-4o-mini
-  reminder: sys
-
-- name: gpt-3.5-turbo-1106
-  weak_model_name: gpt-4o-mini
-  reminder: sys
-
-- name: gpt-3.5-turbo-0613
-  weak_model_name: gpt-4o-mini
-  reminder: sys
-
-- name: gpt-3.5-turbo-16k-0613
-  weak_model_name: gpt-4o-mini
-  reminder: sys
-
-- name: gpt-4-turbo-2024-04-09
-  edit_format: udiff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-
-- name: gpt-4-turbo
-  edit_format: udiff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-
-- name: openai/gpt-4o
+- name: anthropic/claude-3-5-haiku-20241022
   edit_format: diff
-  weak_model_name: gpt-4o-mini
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
   use_repo_map: true
-  lazy: true
-  reminder: sys
-  examples_as_sys_msg: true
-  editor_edit_format: editor-diff
-
-- name: openai/gpt-4o-2024-08-06
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-  examples_as_sys_msg: true
-
-- name: gpt-4o-2024-08-06
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-  examples_as_sys_msg: true
-
-- name: gpt-4o-2024-11-20
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-  examples_as_sys_msg: true
-
-- name: openai/gpt-4o-2024-11-20
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-  examples_as_sys_msg: true
-
-- name: gpt-4o
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-  examples_as_sys_msg: true
-  editor_edit_format: editor-diff
-
-- name: gpt-4o-mini
-  weak_model_name: gpt-4o-mini
-  lazy: true
-  reminder: sys
-
-- name: openai/gpt-4o-mini
-  weak_model_name: openai/gpt-4o-mini
-  lazy: true
-  reminder: sys
-
-- name: gpt-4-0125-preview
-  edit_format: udiff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-  examples_as_sys_msg: true
-
-- name: gpt-4-1106-preview
-  edit_format: udiff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  lazy: true
-  reminder: sys
-
-- name: gpt-4-vision-preview
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  reminder: sys
-
-- name: gpt-4-0314
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  reminder: sys
-  examples_as_sys_msg: true
-
-- name: gpt-4-0613
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  reminder: sys
-
-- name: gpt-4-32k-0613
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  reminder: sys
-
-- name: claude-3-opus-20240229
-  edit_format: diff
-  weak_model_name: claude-3-5-haiku-20241022
-  use_repo_map: true
-
-- name: openrouter/anthropic/claude-3-opus
-  edit_format: diff
-  weak_model_name: openrouter/anthropic/claude-3-5-haiku
-  use_repo_map: true
-
-- name: claude-3-sonnet-20240229
-  weak_model_name: claude-3-5-haiku-20241022
-
-- name: claude-3-5-sonnet-20240620
-  edit_format: diff
-  weak_model_name: claude-3-5-haiku-20241022
-  use_repo_map: true
-  examples_as_sys_msg: true
   extra_params:
     extra_headers:
       anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
-    max_tokens: 8192
   cache_control: true
-  editor_model_name: claude-3-5-sonnet-20240620
-  editor_edit_format: editor-diff
 
 - name: anthropic/claude-3-5-sonnet-20240620
   edit_format: diff
@@ -359,6 +208,62 @@ cog.out("```\n")
   editor_model_name: anthropic/claude-3-5-sonnet-20241022
   editor_edit_format: editor-diff
 
+- name: anthropic/claude-3-5-sonnet-latest
+  edit_format: diff
+  weak_model_name: anthropic/claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+    max_tokens: 8192
+  cache_control: true
+  editor_model_name: anthropic/claude-3-5-sonnet-20241022
+  editor_edit_format: editor-diff
+
+- name: anthropic/claude-3-haiku-20240307
+  weak_model_name: anthropic/claude-3-haiku-20240307
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
+- name: azure/o1
+  edit_format: diff
+  weak_model_name: azure/gpt-4o-mini
+  use_repo_map: true
+  use_temperature: false
+  streaming: false
+  editor_model_name: azure/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: azure/o1-mini
+  weak_model_name: azure/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: azure/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: azure/o1-preview
+  edit_format: diff
+  weak_model_name: azure/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: azure/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+  edit_format: diff
+  weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
+  use_repo_map: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
 - name: bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0
   edit_format: diff
   weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
@@ -372,9 +277,19 @@ cog.out("```\n")
   editor_model_name: bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0
   editor_edit_format: editor-diff
 
-- name: anthropic/claude-3-5-sonnet-latest
+- name: claude-3-5-haiku-20241022
   edit_format: diff
-  weak_model_name: anthropic/claude-3-5-haiku-20241022
+  weak_model_name: claude-3-5-haiku-20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    extra_headers:
+      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
+  cache_control: true
+
+- name: claude-3-5-sonnet-20240620
+  edit_format: diff
+  weak_model_name: claude-3-5-haiku-20241022
   use_repo_map: true
   examples_as_sys_msg: true
   extra_params:
@@ -382,7 +297,7 @@ cog.out("```\n")
       anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
     max_tokens: 8192
   cache_control: true
-  editor_model_name: anthropic/claude-3-5-sonnet-20241022
+  editor_model_name: claude-3-5-sonnet-20240620
   editor_edit_format: editor-diff
 
 - name: claude-3-5-sonnet-20241022
@@ -398,49 +313,6 @@ cog.out("```\n")
   editor_model_name: claude-3-5-sonnet-20241022
   editor_edit_format: editor-diff
 
-- name: anthropic/claude-3-haiku-20240307
-  weak_model_name: anthropic/claude-3-haiku-20240307
-  examples_as_sys_msg: true
-  extra_params:
-    extra_headers:
-      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
-  cache_control: true
-
-- name: anthropic/claude-3-5-haiku-20241022
-  edit_format: diff
-  weak_model_name: anthropic/claude-3-5-haiku-20241022
-  use_repo_map: true
-  extra_params:
-    extra_headers:
-      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
-  cache_control: true
-
-- name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
-  edit_format: diff
-  weak_model_name: bedrock/anthropic.claude-3-5-haiku-20241022-v1:0
-  use_repo_map: true
-  extra_params:
-    extra_headers:
-      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
-  cache_control: true
-
-- name: claude-3-5-haiku-20241022
-  edit_format: diff
-  weak_model_name: claude-3-5-haiku-20241022
-  use_repo_map: true
-  examples_as_sys_msg: true
-  extra_params:
-    extra_headers:
-      anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
-  cache_control: true
-
-- name: vertex_ai/claude-3-5-haiku@20241022
-  edit_format: diff
-  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
-  use_repo_map: true
-  extra_params:
-    max_tokens: 4096
-
 - name: claude-3-haiku-20240307
   weak_model_name: claude-3-haiku-20240307
   examples_as_sys_msg: true
@@ -449,6 +321,305 @@ cog.out("```\n")
       anthropic-beta: prompt-caching-2024-07-31,pdfs-2024-09-25
   cache_control: true
 
+- name: claude-3-opus-20240229
+  edit_format: diff
+  weak_model_name: claude-3-5-haiku-20241022
+  use_repo_map: true
+
+- name: claude-3-sonnet-20240229
+  weak_model_name: claude-3-5-haiku-20241022
+
+- name: command-r-08-2024
+  weak_model_name: command-r-08-2024
+  use_repo_map: true
+
+- name: command-r-plus
+  weak_model_name: command-r-plus
+  use_repo_map: true
+
+- name: command-r-plus-08-2024
+  weak_model_name: command-r-plus-08-2024
+  use_repo_map: true
+
+- name: deepseek-chat
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+
+- name: deepseek-coder
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+
+- name: deepseek/deepseek-chat
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+
+- name: deepseek/deepseek-coder
+  edit_format: diff
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+
+- name: deepseek/deepseek-reasoner
+  edit_format: diff
+  weak_model_name: deepseek/deepseek-chat
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  caches_by_default: true
+  use_temperature: false
+  editor_model_name: deepseek/deepseek-chat
+  editor_edit_format: editor-diff
+
+- name: gemini/gemini-1.5-flash-002
+
+- name: gemini/gemini-1.5-flash-exp-0827
+
+- name: gemini/gemini-1.5-pro
+  edit_format: diff-fenced
+  use_repo_map: true
+
+- name: gemini/gemini-1.5-pro-002
+  edit_format: diff
+  use_repo_map: true
+
+- name: gemini/gemini-1.5-pro-exp-0827
+  edit_format: diff-fenced
+  use_repo_map: true
+
+- name: gemini/gemini-1.5-pro-latest
+  edit_format: diff-fenced
+  use_repo_map: true
+
+- name: gemini/gemini-2.0-flash-exp
+  edit_format: diff
+  use_repo_map: true
+
+- name: gemini/gemini-exp-1114
+  edit_format: diff
+  use_repo_map: true
+
+- name: gemini/gemini-exp-1121
+  edit_format: diff
+  use_repo_map: true
+
+- name: gemini/gemini-exp-1206
+  edit_format: diff
+  use_repo_map: true
+
+- name: gpt-3.5-turbo
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-0125
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-0613
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-1106
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-3.5-turbo-16k-0613
+  weak_model_name: gpt-4o-mini
+  reminder: sys
+
+- name: gpt-4-0125-preview
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4-0314
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4-0613
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+
+- name: gpt-4-1106-preview
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+
+- name: gpt-4-32k-0613
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+
+- name: gpt-4-turbo
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+
+- name: gpt-4-turbo-2024-04-09
+  edit_format: udiff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+
+- name: gpt-4-vision-preview
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  reminder: sys
+
+- name: gpt-4o
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+  editor_edit_format: editor-diff
+
+- name: gpt-4o-2024-08-06
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4o-2024-11-20
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: gpt-4o-mini
+  weak_model_name: gpt-4o-mini
+  lazy: true
+  reminder: sys
+
+- name: groq/llama3-70b-8192
+  edit_format: diff
+  weak_model_name: groq/llama3-8b-8192
+  examples_as_sys_msg: true
+
+- name: o1
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  use_temperature: false
+  streaming: false
+  editor_model_name: gpt-4o
+  editor_edit_format: editor-diff
+
+- name: o1-mini
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: gpt-4o
+  editor_edit_format: editor-diff
+
+- name: o1-preview
+  edit_format: architect
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openai/gpt-4o
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+  editor_edit_format: editor-diff
+
+- name: openai/gpt-4o-2024-08-06
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: openai/gpt-4o-2024-11-20
+  edit_format: diff
+  weak_model_name: gpt-4o-mini
+  use_repo_map: true
+  lazy: true
+  reminder: sys
+  examples_as_sys_msg: true
+
+- name: openai/gpt-4o-mini
+  weak_model_name: openai/gpt-4o-mini
+  lazy: true
+  reminder: sys
+
+- name: openai/o1
+  edit_format: diff
+  weak_model_name: openai/gpt-4o-mini
+  use_repo_map: true
+  use_temperature: false
+  streaming: false
+  editor_model_name: openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openai/o1-mini
+  weak_model_name: openai/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openai/o1-preview
+  edit_format: diff
+  weak_model_name: openai/gpt-4o-mini
+  use_repo_map: true
+  use_system_prompt: false
+  use_temperature: false
+  editor_model_name: openai/gpt-4o
+  editor_edit_format: editor-diff
+
+- name: openrouter/anthropic/claude-3-opus
+  edit_format: diff
+  weak_model_name: openrouter/anthropic/claude-3-5-haiku
+  use_repo_map: true
+
 - name: openrouter/anthropic/claude-3.5-sonnet
   edit_format: diff
   weak_model_name: openrouter/anthropic/claude-3-5-haiku
@@ -471,96 +642,18 @@ cog.out("```\n")
   editor_model_name: openrouter/anthropic/claude-3.5-sonnet:beta
   editor_edit_format: editor-diff
 
-- name: vertex_ai/claude-3-5-sonnet@20240620
+- name: openrouter/deepseek/deepseek-chat
   edit_format: diff
-  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
   use_repo_map: true
-  examples_as_sys_msg: true
-  extra_params:
-    max_tokens: 8192
-  editor_model_name: vertex_ai/claude-3-5-sonnet@20240620
-  editor_edit_format: editor-diff
-
-- name: vertex_ai/claude-3-5-sonnet-v2@20241022
-  edit_format: diff
-  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
-  use_repo_map: true
-  examples_as_sys_msg: true
-  extra_params:
-    max_tokens: 8192
-  editor_model_name: vertex_ai/claude-3-5-sonnet-v2@20241022
-  editor_edit_format: editor-diff
-
-- name: vertex_ai/claude-3-opus@20240229
-  edit_format: diff
-  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
-  use_repo_map: true
-
-- name: vertex_ai/claude-3-sonnet@20240229
-  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
-
-- name: command-r-plus
-  weak_model_name: command-r-plus
-  use_repo_map: true
-
-- name: command-r-08-2024
-  weak_model_name: command-r-08-2024
-  use_repo_map: true
-
-- name: command-r-plus-08-2024
-  weak_model_name: command-r-plus-08-2024
-  use_repo_map: true
-
-- name: groq/llama3-70b-8192
-  edit_format: diff
-  weak_model_name: groq/llama3-8b-8192
+  reminder: sys
   examples_as_sys_msg: true
 
-- name: openrouter/meta-llama/llama-3-70b-instruct
+- name: openrouter/deepseek/deepseek-coder
   edit_format: diff
-  weak_model_name: openrouter/meta-llama/llama-3-70b-instruct
+  use_repo_map: true
+  reminder: sys
   examples_as_sys_msg: true
 
-- name: gemini/gemini-1.5-pro-002
-  edit_format: diff
-  use_repo_map: true
-
-- name: gemini/gemini-1.5-flash-002
-
-- name: gemini/gemini-1.5-pro
-  edit_format: diff-fenced
-  use_repo_map: true
-
-- name: gemini/gemini-1.5-pro-latest
-  edit_format: diff-fenced
-  use_repo_map: true
-
-- name: gemini/gemini-1.5-pro-exp-0827
-  edit_format: diff-fenced
-  use_repo_map: true
-
-- name: gemini/gemini-exp-1206
-  edit_format: diff
-  use_repo_map: true
-
-- name: gemini/gemini-exp-1114
-  edit_format: diff
-  use_repo_map: true
-
-- name: gemini/gemini-exp-1121
-  edit_format: diff
-  use_repo_map: true
-
-- name: vertex_ai/gemini-pro-experimental
-  edit_format: diff-fenced
-  use_repo_map: true
-
-- name: gemini/gemini-1.5-flash-exp-0827
-
-- name: gemini/gemini-2.0-flash-exp
-  edit_format: diff
-  use_repo_map: true
-
 - name: openrouter/deepseek/deepseek-r1
   edit_format: diff
   weak_model_name: openrouter/deepseek/deepseek-chat
@@ -573,63 +666,9 @@ cog.out("```\n")
   editor_model_name: openrouter/deepseek/deepseek-chat
   editor_edit_format: editor-diff
 
-- name: deepseek/deepseek-reasoner
+- name: openrouter/meta-llama/llama-3-70b-instruct
   edit_format: diff
-  weak_model_name: deepseek/deepseek-chat
-  use_repo_map: true
-  examples_as_sys_msg: true
-  extra_params:
-    max_tokens: 8192
-  caches_by_default: true
-  use_temperature: false
-  editor_model_name: deepseek/deepseek-chat
-  editor_edit_format: editor-diff
-
-- name: deepseek/deepseek-chat
-  edit_format: diff
-  use_repo_map: true
-  reminder: sys
-  examples_as_sys_msg: true
-  extra_params:
-    max_tokens: 8192
-  caches_by_default: true
-
-- name: deepseek/deepseek-coder
-  edit_format: diff
-  use_repo_map: true
-  reminder: sys
-  examples_as_sys_msg: true
-  extra_params:
-    max_tokens: 8192
-  caches_by_default: true
-
-- name: deepseek-chat
-  edit_format: diff
-  use_repo_map: true
-  reminder: sys
-  examples_as_sys_msg: true
-  extra_params:
-    max_tokens: 8192
-
-- name: deepseek-coder
-  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/deepseek/deepseek-coder
-  edit_format: diff
-  use_repo_map: true
-  reminder: sys
-  examples_as_sys_msg: true
-
-- name: openrouter/deepseek/deepseek-chat
-  edit_format: diff
-  use_repo_map: true
-  reminder: sys
+  weak_model_name: openrouter/meta-llama/llama-3-70b-instruct
   examples_as_sys_msg: true
 
 - name: openrouter/openai/gpt-4o
@@ -641,64 +680,13 @@ cog.out("```\n")
   examples_as_sys_msg: true
   editor_edit_format: editor-diff
 
-- name: openai/o1-mini
-  weak_model_name: openai/gpt-4o-mini
-  use_repo_map: true
-  use_system_prompt: false
-  use_temperature: false
-  editor_model_name: openai/gpt-4o
-  editor_edit_format: editor-diff
-
-- name: azure/o1-mini
-  weak_model_name: azure/gpt-4o-mini
-  use_repo_map: true
-  use_system_prompt: false
-  use_temperature: false
-  editor_model_name: azure/gpt-4o
-  editor_edit_format: editor-diff
-
-- name: o1-mini
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  use_system_prompt: false
-  use_temperature: false
-  editor_model_name: gpt-4o
-  editor_edit_format: editor-diff
-
-- name: openai/o1-preview
+- name: openrouter/openai/o1
   edit_format: diff
-  weak_model_name: openai/gpt-4o-mini
-  use_repo_map: true
-  use_system_prompt: false
-  use_temperature: false
-  editor_model_name: openai/gpt-4o
-  editor_edit_format: editor-diff
-
-- name: azure/o1-preview
-  edit_format: diff
-  weak_model_name: azure/gpt-4o-mini
-  use_repo_map: true
-  use_system_prompt: false
-  use_temperature: false
-  editor_model_name: azure/gpt-4o
-  editor_edit_format: editor-diff
-
-- name: azure/o1
-  edit_format: diff
-  weak_model_name: azure/gpt-4o-mini
+  weak_model_name: openrouter/openai/gpt-4o-mini
   use_repo_map: true
   use_temperature: false
   streaming: false
-  editor_model_name: azure/gpt-4o
-  editor_edit_format: editor-diff
-
-- name: o1-preview
-  edit_format: architect
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  use_system_prompt: false
-  use_temperature: false
-  editor_model_name: gpt-4o
+  editor_model_name: openrouter/openai/gpt-4o
   editor_edit_format: editor-diff
 
 - name: openrouter/openai/o1-mini
@@ -720,39 +708,51 @@ cog.out("```\n")
   editor_model_name: openrouter/openai/gpt-4o
   editor_edit_format: editor-diff
 
-- name: openrouter/openai/o1
-  edit_format: diff
-  weak_model_name: openrouter/openai/gpt-4o-mini
-  use_repo_map: true
-  use_temperature: false
-  streaming: false
-  editor_model_name: openrouter/openai/gpt-4o
-  editor_edit_format: editor-diff
-
-- name: openai/o1
-  edit_format: diff
-  weak_model_name: openai/gpt-4o-mini
-  use_repo_map: true
-  use_temperature: false
-  streaming: false
-  editor_model_name: openai/gpt-4o
-  editor_edit_format: editor-diff
-
-- name: o1
-  edit_format: diff
-  weak_model_name: gpt-4o-mini
-  use_repo_map: true
-  use_temperature: false
-  streaming: false
-  editor_model_name: gpt-4o
-  editor_edit_format: editor-diff
-
 - name: openrouter/qwen/qwen-2.5-coder-32b-instruct
   edit_format: diff
   weak_model_name: openrouter/qwen/qwen-2.5-coder-32b-instruct
   use_repo_map: true
   editor_model_name: openrouter/qwen/qwen-2.5-coder-32b-instruct
   editor_edit_format: editor-diff
+
+- name: vertex_ai/claude-3-5-haiku@20241022
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+  extra_params:
+    max_tokens: 4096
+
+- name: vertex_ai/claude-3-5-sonnet-v2@20241022
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  editor_model_name: vertex_ai/claude-3-5-sonnet-v2@20241022
+  editor_edit_format: editor-diff
+
+- name: vertex_ai/claude-3-5-sonnet@20240620
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+  examples_as_sys_msg: true
+  extra_params:
+    max_tokens: 8192
+  editor_model_name: vertex_ai/claude-3-5-sonnet@20240620
+  editor_edit_format: editor-diff
+
+- name: vertex_ai/claude-3-opus@20240229
+  edit_format: diff
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+  use_repo_map: true
+
+- name: vertex_ai/claude-3-sonnet@20240229
+  weak_model_name: vertex_ai/claude-3-5-haiku@20241022
+
+- name: vertex_ai/gemini-pro-experimental
+  edit_format: diff-fenced
+  use_repo_map: true
 ```
 <!--[[[end]]]-->
 
diff --git a/aider/website/docs/faq.md b/aider/website/docs/faq.md
index 3580225ca..3b636fd3a 100644
--- a/aider/website/docs/faq.md
+++ b/aider/website/docs/faq.md
@@ -249,10 +249,10 @@ tr:hover { background-color: #f5f5f5; }
 </style>
 <table>
 <tr><th>Model Name</th><th class='right'>Total Tokens</th><th class='right'>Percent</th></tr>
-<tr><td>claude-3-5-sonnet-20241022</td><td class='right'>876,538</td><td class='right'>44.8%</td></tr>
-<tr><td>deepseek/deepseek-chat</td><td class='right'>704,119</td><td class='right'>36.0%</td></tr>
-<tr><td>deepseek/REDACTED</td><td class='right'>308,841</td><td class='right'>15.8%</td></tr>
-<tr><td>deepseek/deepseek-reasoner</td><td class='right'>40,597</td><td class='right'>2.1%</td></tr>
+<tr><td>claude-3-5-sonnet-20241022</td><td class='right'>934,961</td><td class='right'>46.4%</td></tr>
+<tr><td>deepseek/deepseek-chat</td><td class='right'>704,119</td><td class='right'>34.9%</td></tr>
+<tr><td>deepseek/REDACTED</td><td class='right'>308,841</td><td class='right'>15.3%</td></tr>
+<tr><td>deepseek/deepseek-reasoner</td><td class='right'>40,597</td><td class='right'>2.0%</td></tr>
 <tr><td>claude-3-5-haiku-20241022</td><td class='right'>10,083</td><td class='right'>0.5%</td></tr>
 <tr><td>openrouter/deepseek/deepseek-chat</td><td class='right'>9,995</td><td class='right'>0.5%</td></tr>
 <tr><td>o1</td><td class='right'>2,385</td><td class='right'>0.1%</td></tr>