Merge branch 'main' of github.com:Aider-AI/aider

aider/resources/model-settings.yml

@@ -315,7 +315,7 @@
   editor_edit_format: editor-diff
   accepts_settings: ["thinking_tokens"]
 
-- name: vertex_ai-anthropic_models/vertex_ai/claude-3-7-sonnet@20250219
+- name: vertex_ai/claude-3-7-sonnet@20250219
   overeager: true
   edit_format: diff
   weak_model_name: vertex_ai/claude-3-5-haiku@20241022
@@ -323,7 +323,7 @@
   examples_as_sys_msg: true
   extra_params:
     max_tokens: 64000
-  editor_model_name: vertex_ai-anthropic_models/vertex_ai/claude-3-7-sonnet@20250219
+  editor_model_name: vertex_ai/claude-3-7-sonnet@20250219
   editor_edit_format: editor-diff
   accepts_settings: ["thinking_tokens"]
 
@@ -1157,6 +1157,20 @@
   #  extra_body:
   #    reasoning_effort: high
 
+- name: o3-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: gpt-4.1-mini
+  use_repo_map: true
+  editor_model_name: gpt-4.1
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  #extra_params:
+  #  extra_body:
+  #    reasoning_effort: high
+
 - name: openai/o4-mini
   edit_format: diff
   weak_model_name: openai/gpt-4.1-mini
@@ -1213,6 +1227,20 @@
   #  extra_body:
   #    reasoning_effort: high
 
+- name: openai/o3-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openai/gpt-4.1-mini
+  use_repo_map: true
+  editor_model_name: openai/gpt-4.1
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  #extra_params:
+  #  extra_body:
+  #    reasoning_effort: high
+
 - name: openai/o4-mini
   edit_format: diff
   weak_model_name: openai/gpt-4.1-mini
@@ -1269,6 +1297,20 @@
   #  extra_body:
   #    reasoning_effort: high
 
+- name: openrouter/openai/o3-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-4.1-mini
+  use_repo_map: true
+  editor_model_name: openrouter/openai/gpt-4.1
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  #extra_params:
+  #  extra_body:
+  #    reasoning_effort: high
+
 - name: openai/o4-mini
   edit_format: diff
   weak_model_name: openai/gpt-4.1-mini
@@ -1325,6 +1367,20 @@
   #  extra_body:
   #    reasoning_effort: high
 
+- name: azure/o3-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: azure/gpt-4.1-mini
+  use_repo_map: true
+  editor_model_name: azure/gpt-4.1
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+  #extra_params:
+  #  extra_body:
+  #    reasoning_effort: high
+
 - name: openai/o4-mini
   edit_format: diff
   weak_model_name: openai/gpt-4.1-mini
@@ -1554,14 +1610,14 @@
   editor_edit_format: editor-diff
   accepts_settings: ["thinking_tokens"]
 
-- name: vertex_ai-anthropic_models/vertex_ai/claude-sonnet-4@20250514
+- name: vertex_ai/claude-sonnet-4@20250514
   edit_format: diff
   weak_model_name: vertex_ai/claude-3-5-haiku@20241022
   use_repo_map: true
   examples_as_sys_msg: false
   extra_params:
     max_tokens: 64000
-  editor_model_name: vertex_ai-anthropic_models/vertex_ai/claude-sonnet-4@20250514
+  editor_model_name: vertex_ai/claude-sonnet-4@20250514
   editor_edit_format: editor-diff
   accepts_settings: ["thinking_tokens"]
 
@@ -1758,14 +1814,14 @@
   editor_edit_format: editor-diff
   accepts_settings: ["thinking_tokens"]
 
-- name: vertex_ai-anthropic_models/vertex_ai/claude-opus-4@20250514
+- name: vertex_ai/claude-opus-4@20250514
   edit_format: diff
   weak_model_name: vertex_ai/claude-3-5-haiku@20241022
   use_repo_map: true
   examples_as_sys_msg: false
   extra_params:
     max_tokens: 32000
-  editor_model_name: vertex_ai-anthropic_models/vertex_ai/claude-sonnet-4@20250514
+  editor_model_name: vertex_ai/claude-sonnet-4@20250514
   editor_edit_format: editor-diff
   accepts_settings: ["thinking_tokens"]
 
@@ -1773,6 +1829,7 @@
   edit_format: diff
   use_repo_map: true
   accepts_settings: ["reasoning_effort", "thinking_tokens"]
+
 - name: openrouter/anthropic/claude-opus-4
   edit_format: diff
   weak_model_name: openrouter/anthropic/claude-3-5-haiku

aider/website/docs/config/adv-model-settings.md

@@ -1730,7 +1730,7 @@ cog.out("```\n")
   accepts_settings:
   - thinking_tokens
 
-- name: vertex_ai-anthropic_models/vertex_ai/claude-3-7-sonnet@20250219
+- name: vertex_ai/claude-3-7-sonnet@20250219
   edit_format: diff
   weak_model_name: vertex_ai/claude-3-5-haiku@20241022
   use_repo_map: true
@@ -1738,29 +1738,29 @@ cog.out("```\n")
   examples_as_sys_msg: true
   extra_params:
     max_tokens: 64000
-  editor_model_name: vertex_ai-anthropic_models/vertex_ai/claude-3-7-sonnet@20250219
+  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-opus-4@20250514
+- name: vertex_ai/claude-opus-4@20250514
   edit_format: diff
   weak_model_name: vertex_ai/claude-3-5-haiku@20241022
   use_repo_map: true
   extra_params:
     max_tokens: 32000
-  editor_model_name: vertex_ai-anthropic_models/vertex_ai/claude-sonnet-4@20250514
+  editor_model_name: vertex_ai/claude-sonnet-4@20250514
   editor_edit_format: editor-diff
   accepts_settings:
   - thinking_tokens
 
-- name: vertex_ai-anthropic_models/vertex_ai/claude-sonnet-4@20250514
+- name: vertex_ai/claude-sonnet-4@20250514
   edit_format: diff
   weak_model_name: vertex_ai/claude-3-5-haiku@20241022
   use_repo_map: true
   extra_params:
     max_tokens: 64000
-  editor_model_name: vertex_ai-anthropic_models/vertex_ai/claude-sonnet-4@20250514
+  editor_model_name: vertex_ai/claude-sonnet-4@20250514
   editor_edit_format: editor-diff
   accepts_settings:
   - thinking_tokens