Merge remote-tracking branch 'main/main' into v0.88.23

Author: dwash96

aider/models.py

@@ -99,7 +99,8 @@
     "quasar": "openrouter/openrouter/quasar-alpha",
     "r1": "deepseek/deepseek-reasoner",
     "gemini-2.5-pro": "gemini/gemini-2.5-pro",
-    "gemini": "gemini/gemini-2.5-pro",
+    "gemini-3-pro-preview": "gemini/gemini-3-pro-preview",
+    "gemini": "gemini/gemini-3-pro-preview",
     "gemini-exp": "gemini/gemini-2.5-pro-exp-03-25",
     "grok3": "xai/grok-3-beta",
     "optimus": "openrouter/openrouter/optimus-alpha",

aider/resources/model-settings.yml

@@ -1381,18 +1381,19 @@
   use_repo_map: true
   weak_model_name: openrouter/google/gemini-2.0-flash-001
 
-- name: gemini/gemini-2.5-pro-preview-05-06
+- name: gemini/gemini-3-pro-preview
   overeager: true
   edit_format: diff-fenced
   use_repo_map: true
-  weak_model_name: gemini/gemini-2.5-flash-preview-04-17
+  weak_model_name: gemini/gemini-2.5-flash
+  use_temperature: false
+  accepts_settings: ["reasoning_effort", "thinking_tokens"]  
 
-- name: gemini/gemini-3-pro-preview
+- name: gemini/gemini-2.5-pro-preview-05-06
   overeager: true
   edit_format: diff-fenced
   use_repo_map: true
   weak_model_name: gemini/gemini-2.5-flash-preview-04-17
-  accepts_settings: ["reasoning_effort"]
 
 - name: gemini/gemini-2.5-pro-preview-06-05
   overeager: true
@@ -1472,6 +1473,21 @@
   weak_model_name: openrouter/google/gemini-2.5-flash
   accepts_settings: ["thinking_tokens"]
 
+- name: vertex_ai/gemini-3-pro-preview
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: vertex_ai/gemini-2.5-flash
+  overeager: true
+  editor_model_name: vertex_ai/gemini-2.5-flash
+  accepts_settings: ["thinking_tokens"]
+
+- name: openrouter/google/gemini-3-pro-preview
+  overeager: true
+  edit_format: diff-fenced
+  use_repo_map: true
+  weak_model_name: openrouter/google/gemini-2.5-flash
+  accepts_settings: ["thinking_tokens"]
+
 #- name: openrouter/qwen/qwen3-235b-a22b
 #  system_prompt_prefix: "/no_think"
 #  use_temperature: 0.7
@@ -1849,6 +1865,13 @@
   accepts_settings: ["reasoning_effort"]
   overeager: true
 
+- name: gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: gpt-5
   edit_format: diff
   weak_model_name: gpt-5-nano
@@ -1857,6 +1880,17 @@
   accepts_settings: ["reasoning_effort"]
   overeager: true
 
+- name: gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: gpt-5-mini
+  use_repo_map: true
+  editor_model_name: gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: gpt-5-nano-2025-08-07
@@ -1906,27 +1940,73 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: gpt-5-codex
   edit_format: diff
   weak_model_name: gpt-5-nano
   use_repo_map: true
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: gpt-5.1-codex
+  edit_format: diff
+  weak_model_name: gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: azure/gpt-5
   edit_format: diff
   weak_model_name: azure/gpt-5-nano
   use_repo_map: true
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: azure/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: azure/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: azure/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: azure/gpt-5-nano-2025-08-07
   use_repo_map: true
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5.1
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: azure/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: azure/gpt-5-mini
   edit_format: diff
   weak_model_name: azure/gpt-5-nano
@@ -1969,20 +2049,59 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: azure/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: azure/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: azure/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openai/gpt-5
   edit_format: diff
   weak_model_name: openai/gpt-5-nano
   use_repo_map: true
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openai/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: openai/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: openai/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: openai/gpt-5-nano-2025-08-07
   use_repo_map: true
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5.1
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openai/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openai/gpt-5-mini
   edit_format: diff
   weak_model_name: openai/gpt-5-nano
@@ -2025,20 +2144,59 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openai/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openai/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openrouter/openai/gpt-5
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano
   use_repo_map: true
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5-pro
+  streaming: false
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-mini
+  use_repo_map: true
+  editor_model_name: openrouter/openai/gpt-5
+  editor_edit_format: editor-diff
+  system_prompt_prefix: "Formatting re-enabled. "
+  accepts_settings: ["reasoning_effort"]
+  examples_as_sys_msg: true
+
 - name: openrouter/openai/gpt-5-2025-08-07
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano-2025-08-07
   use_repo_map: true
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5.1
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openrouter/openai/gpt-5.1-2025-11-13
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano-2025-08-07
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
 - name: openrouter/openai/gpt-5-mini
   edit_format: diff
   weak_model_name: openrouter/openai/gpt-5-nano
@@ -2081,3 +2239,16 @@
   use_temperature: false
   accepts_settings: ["reasoning_effort"]
 
+- name: openrouter/openai/gpt-5.1-chat
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]
+
+- name: openrouter/openai/gpt-5.1-chat-latest
+  edit_format: diff
+  weak_model_name: openrouter/openai/gpt-5-nano
+  use_repo_map: true
+  use_temperature: false
+  accepts_settings: ["reasoning_effort"]